Fix MacOS build and integrate into matrix

- add ld flags to avoid compilation error
- adding MacOS section to general package build
- added arm support to macos packaging script
- improve download-paks to add assets into Mac package
- remove redundant single workflow file for Mac

Author: cengique

.github/workflows/build-macos.yml

@@ -38,21 +38,33 @@ jobs:
     
   build:
 
-    runs-on: ubuntu-latest
     needs: set-version
-    container: debian:oldstable-slim
+
     strategy:
       fail-fast: false
       matrix:
         release:
           - file: release-linux-x86_64
-            name: Linux64
+            name: Linux-x64
+            runs-on: ubuntu-latest
+            container: debian:oldstable-slim
           - file: release-mingw32-x86_64
-            name: Windows32
+            name: Windows-x32
+            runs-on: ubuntu-latest
+            container: debian:oldstable-slim
             platform: mingw32
+          - file: release-darwin-arm
+            name: Mac-arm
+            runs-on: macos-15
+            ldflags: -ld64
 
+    runs-on: ${{ matrix.release.runs-on }}
+    container:
+      image: ${{ matrix.release.container }}
+    
     env:
       VERSION: ${{ needs.set-version.outputs.version }}
+      LDFLAGS: ${{ matrix.release.ldflags }}
 
     steps:
     - name: dependencies
@@ -71,6 +83,7 @@ jobs:
           curl \
           rsync \
           git
+      if: ${{ ! contains(matrix.release.runs-on, 'macos') }}
     - uses: actions/checkout@v6
     ## attempts for setting version via tag, but doesn't work for shallow copy:
     #  with:

.github/workflows/build-packages.yml

@@ -13,6 +13,7 @@ if [ $# == 0 ] || [ $# -gt 2 ]; then
 	echo "Optional architectures are:"
 	echo " x86"
 	echo " x86_64"
+	echo " arm"
 	echo
 	exit 1
 fi
@@ -38,11 +39,14 @@ if [ "$2" != "" ]; then
 		CURRENT_ARCH="x86"
 	elif [ "$2" == "x86_64" ]; then
 		CURRENT_ARCH="x86_64"
+	elif [ "$2" == "arm" ]; then
+		CURRENT_ARCH="arm"
 	else
 		echo "Invalid architecture: $2"
 		echo "Valid architectures are:"
 		echo " x86"
 		echo " x86_64"
+		echo " arm"
 		echo
 		exit 1
 	fi

make-macosx-app.sh

@@ -29,13 +29,14 @@ DATA_GRHUB="data-grhub-1.3.1.pk3"
 download "https://github.com/GrangerHub/tremulous-assets/releases/download/data-1.3.1/tremulous-grhub-1.3.1.pk3" \
 	 $DATA_GRHUB
 
-if [[ $dir == "./build/release-darwin-x86_64" ]]; then
+if [[ $dir == *darwin* ]]; then
     subdir=./Tremulous.app/Contents/MacOS/gpp/ 
 else
     subdir=./gpp
 fi
 
 echo "Extracting 1.1.0 data"
+mkdir -p $subdir
 unzip -jo -d $subdir ../$DATA_110 "*.pk3"
 
 echo "Adding Grangerhub assets"