Some code update. Make SDL with/without OPENGL compilation depends on ANGLE enabled/disabled

.github/workflows/macos.yml

@@ -36,75 +36,84 @@ jobs:
           echo "osver=${{matrix.osver}}" >> $GITHUB_ENV
           echo "xcodever=${{matrix.xcodever}}" >> $GITHUB_ENV
           echo "with_angle=${{matrix.with_angle}}" >> $GITHUB_ENV
+          if [ "${{matrix.with_angle}}" == "yes" ]; then
+            echo "ARM64_ARTIFACT_NAME=macos${{matrix.osver}}_arm64_angle_deps" >> $GITHUB_ENV
+            echo "ARM64_FILE_NAME=macos${{matrix.osver}}_arm64_angle_deps.tar.gz" >> $GITHUB_ENV
+          else
+            echo "ARM64_ARTIFACT_NAME=macos${{matrix.osver}}_arm64_deps" >> $GITHUB_ENV
+            echo "ARM64_FILE_NAME=macos${{matrix.osver}}_arm64_deps.tar.gz" >> $GITHUB_ENV
+          fi
+          echo "X86_64_ARTIFACT_NAME=macos${{matrix.osver}}_x86_64_deps" >> $GITHUB_ENV
+          echo "X86_64_FILE_NAME=macos${{matrix.osver}}_x86_64_deps.tar.gz" >> $GITHUB_ENV
           brew install nasm m4 autoconf automake libtool
 
       - name: Download macOS SDK
         run: |
           source sdk.sh
-          mkdir $REPDIR/sources
-          install_macos_sdk $osver "$xcodever" $REPDIR/sources
+          mkdir "$REPDIR/sources"
+          install_macos_sdk $osver "$xcodever" "$REPDIR/sources"
 
       - name: Download/clone sources
         run: |
           source deps.sh
           source angle.sh
-          cd $REPDIR/sources
+          cd "$REPDIR/sources"
           download_macos_deps
           if [ $with_angle == "yes" ]; then
-            clone_macos_angle $REPDIR/data
+            clone_macos_angle "$REPDIR/data"
           fi
 
       - name: Build deps for arm64
         run: |
           source deps.sh
-          mkdir $REPDIR/arm64_deps
-          cd $REPDIR/arm64_deps
-          untar_macos_deps $REPDIR/sources
-          build_macos_deps arm64 $osver "$xcodever" ${INSTALLDIR}/macos${osver}_arm64_deps
+          mkdir "$REPDIR/arm64_deps"
+          cd "$REPDIR/arm64_deps"
+          untar_macos_deps "$REPDIR/sources"
+          build_macos_deps arm64 $osver "$xcodever" "$INSTALLDIR/$ARM64_ARTIFACT_NAME" $with_angle
 
       - name: Build ANGLE for arm64
         run: |
           if [ $with_angle == "yes" ]; then
             source angle.sh
-            cd $REPDIR/sources
-            build_macos_angle arm64 $osver "$xcodever" ${INSTALLDIR}/macos${osver}_arm64_deps $REPDIR/data
+            cd "$REPDIR/sources"
+            build_macos_angle arm64 $osver "$xcodever" "$INSTALLDIR/$ARM64_ARTIFACT_NAME" "$REPDIR/data"
           fi
 
       - name: Build deps for x86_64
         run: |
           source deps.sh
-          mkdir $REPDIR/x86_64_deps
-          cd $REPDIR/x86_64_deps
-          untar_macos_deps $REPDIR/sources
-          build_macos_deps x86_64 $osver "$xcodever" ${INSTALLDIR}/macos${osver}_x86_64_deps
+          mkdir "$REPDIR/x86_64_deps"
+          cd "$REPDIR/x86_64_deps"
+          untar_macos_deps "$REPDIR/sources"
+          build_macos_deps x86_64 $osver "$xcodever" "$INSTALLDIR/$X86_64_ARTIFACT_NAME"
 
       - name: Create archive from arm64 and x86_64 deps
         run: |
           TARDIR=$(pwd)
           cd ${INSTALLDIR}
-          tar -czvf ${TARDIR}/macos${osver}_arm64_deps.tar.gz macos${osver}_arm64_deps
-          tar -czvf ${TARDIR}/macos${osver}_x86_64_deps.tar.gz macos${osver}_x86_64_deps
+          tar -czvf ${TARDIR}/$ARM64_FILE_NAME "$ARM64_ARTIFACT_NAME"
+          tar -czvf ${TARDIR}/$X86_64_FILE_NAME "$X86_64_ARTIFACT_NAME"
           cd ${TARDIR}
 
       - name: Upload deps for arm64
         uses: actions/upload-artifact@v4
         with:
-          name: macos${{matrix.osver}}_arm64_deps
-          path: ./macos${{matrix.osver}}_arm64_deps.tar.gz
+          name: ${{env.ARM64_ARTIFACT_NAME}}
+          path: ./${{env.ARM64_FILE_NAME}}
 
       - name: Upload deps for x86_64
         uses: actions/upload-artifact@v4
         with:
-          name: macos${{matrix.osver}}_x86_64_deps
-          path: ./macos${{matrix.osver}}_x86_64_deps.tar.gz
+          name: ${{env.X86_64_ARTIFACT_NAME}}
+          path: ./${{env.X86_64_FILE_NAME}}
 
       - name: Upload Release Asset for arm64
         if: github.event_name == 'push' && github.ref == 'refs/heads/master'
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ./macos${{matrix.osver}}_arm64_deps.tar.gz
-          asset_name: macos${{matrix.osver}}_arm64_deps.tar.gz
+          file: ./${{env.ARM64_FILE_NAME}}
+          asset_name: ${{env.ARM64_FILE_NAME}}
           overwrite: true
           tag: latest
 
@@ -113,7 +122,7 @@ jobs:
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ./macos${{matrix.osver}}_x86_64_deps.tar.gz
-          asset_name: macos${{matrix.osver}}_x86_64_deps.tar.gz
+          file: ./${{env.X86_64_FILE_NAME}}
+          asset_name: ${{env.X86_64_FILE_NAME}}
           overwrite: true
           tag: latest

build.sh

@@ -2,10 +2,11 @@
 
 echo "This is script automate Luanti deps build process for macOS."
 
-if [[ $# -ne 5 ]] ; then
-	echo "Usage: macos_build_with_deps.sh where_deps where_install arch osver step"
+if [[ $# -ne 6 ]] ; then
+	echo "Usage: build.sh where_deps where_install arch osver xcodever step"
 	echo "  arch  - x86_64 or arm64"
 	echo "  osver - 18.2 etc."
+	echo "  xcodever - 18.2 etc"
 	echo "  step  - all|download|untar|clone|build"
 	exit 1
 fi
@@ -17,7 +18,8 @@ where_deps=$1
 where_install=$2
 arch=$3
 osver=$4
-step=$5
+xcodever=$5
+step=$6
 
 if [[ "$arch" != "x86_64" ]] && [[ "$arch" != "arm64" ]]; then
 	echo "Unsuported value of arch argument: $arch"
@@ -57,8 +59,8 @@ if [[ "$step" == *"all"* ]] || [[ "$step" == *"clone"* ]]; then
 fi
 
 if [[ "$step" == *"all"* ]] || [[ "$step" == *"build"* ]]; then
-	build_macos_deps $arch $osver "" $where_install
-	#build_macos_angle $arch $osver "" $where_install "$SCRIPT_DIR/data"
+	build_macos_deps $arch $osver $xcodever $where_install
+	#build_macos_angle $arch $osver $xcodever $where_install "$SCRIPT_DIR/data"
 fi
 
 cd $RUN_DIR

deps.sh

@@ -56,6 +56,7 @@ build_macos_deps() {
 	osver=$2
 	xcodever=$3
 	installdir=$4
+	with_angle=$5
 	
 	dir=$(pwd)
 
@@ -155,7 +156,7 @@ build_macos_deps() {
 	cd libjpeg-turbo-*
 	echo "Configuring libjpeg-turbo..."
 	cmake . "-DCMAKE_INSTALL_PREFIX:PATH=$installdir" \
-					-DCMAKE_OSX_ARCHITECTURES=$arch §\
+					-DCMAKE_OSX_ARCHITECTURES=$arch \
 					-DBUILD_SHARED_LIBS=OFF \
 					-DCMAKE_INSTALL_NAME_DIR=$installdir/lib
 	echo "Building libjpeg-turbo..."
@@ -238,11 +239,15 @@ build_macos_deps() {
 	mkdir build
 	cd build
 	echo "Configuring SDL2..."
+	SDL_OPENGL=0
+	if [[ "$with_angle" == "yes" ]]; then
+		SDL_OPENGL=1
+	fi
 	cmake .. "-DCMAKE_INSTALL_PREFIX:PATH=$installdir" \
 					-DCMAKE_OSX_DEPLOYMENT_TARGET=$osver \
-					-DCMAKE_OSX_ARCHITECTURES=$arch -DCMAKE_OSX_SYSROOT=$target_sysroot \
+					-DCMAKE_OSX_ARCHITECTURES=$arch \
 					-DBUILD_SHARED_LIBS=OFF \
-					-DSDL_OPENGL=0 -DSDL_OPENGLES=0 \
+					-DSDL_OPENGL=${SDL_OPENGL} -DSDL_OPENGLES=0 \
 					-DCMAKE_INSTALL_NAME_DIR=$installdir/lib
 	echo "Building SDL2..."
 	make -j$(sysctl -n hw.logicalcpu)
@@ -258,7 +263,7 @@ build_macos_deps() {
 	echo "Configuring OpenAL-soft..."
 	cmake .. "-DCMAKE_INSTALL_PREFIX:PATH=$installdir" \
 					-DCMAKE_OSX_DEPLOYMENT_TARGET=$osver \
-					-DCMAKE_OSX_ARCHITECTURES=$arch -DCMAKE_OSX_SYSROOT=$target_sysroot \
+					-DCMAKE_OSX_ARCHITECTURES=$arch \
 					-DLIBTYPE=STATIC -DALSOFT_UTILS=OFF -DALSOFT_EXAMPLES=OFF \
 					-DCMAKE_INSTALL_NAME_DIR=$installdir/lib
 	echo "Building OpenAL-soft..."