GitHub CI: Don't duplicate macOS game libraries

Author: zturtleman

.github/workflows/build.yml

@@ -63,8 +63,8 @@ jobs:
         name: Windows-x86_64
         path: build/*.zip
   macos:
-    name: macOS
-    runs-on: macos-26
+    name: macOS (ARM64, x86_64)
+    runs-on: macos-latest
     steps:
     - uses: actions/checkout@v4
     - name: Compile

make-macosx-app.sh

@@ -443,6 +443,32 @@ function action()
 action "${BUNDLEBINDIR}/${EXECUTABLE_NAME}"				"${IOQ3_CLIENT_ARCHS}"
 action "${BUNDLEBINDIR}/${DEDICATED_NAME}"				"${IOQ3_SERVER_ARCHS}"
 
+#
+# don't create unnecessary symlinks and multi-arch libraries
+#
+# the default zip behavior is to follow symlinks, resulting is duplicating
+# the multiarch library for each file name
+#
+MERGE_LIBS=0
+
+if [ $MERGE_LIBS -eq 0 ]; then
+
+# renderers
+cp "${IOQ3_RENDERER_GL1_ARCHS}" "${BUNDLEBINDIR}/"
+cp "${IOQ3_RENDERER_GL2_ARCHS}" "${BUNDLEBINDIR}/"
+
+# game
+cp "${IOQ3_CGAME_ARCHS}" "${BUNDLEBINDIR}/${BASEDIR}/"
+cp "${IOQ3_GAME_ARCHS}" "${BUNDLEBINDIR}/${BASEDIR}/"
+cp "${IOQ3_UI_ARCHS}" "${BUNDLEBINDIR}/${BASEDIR}/"
+
+# missionpack
+cp "${IOQ3_MP_CGAME_ARCHS}" "${BUNDLEBINDIR}/${MISSIONPACKDIR}/"
+cp "${IOQ3_MP_GAME_ARCHS}" "${BUNDLEBINDIR}/${MISSIONPACKDIR}/"
+cp "${IOQ3_MP_UI_ARCHS}" "${BUNDLEBINDIR}/${MISSIONPACKDIR}/"
+
+else
+
 # renderers
 action "${BUNDLEBINDIR}/${RENDERER_OPENGL1_NAME}"		"${IOQ3_RENDERER_GL1_ARCHS}"
 action "${BUNDLEBINDIR}/${RENDERER_OPENGL2_NAME}"		"${IOQ3_RENDERER_GL2_ARCHS}"
@@ -464,3 +490,5 @@ action "${BUNDLEBINDIR}/${MISSIONPACKDIR}/${UI_NAME}"		"${IOQ3_MP_UI_ARCHS}"
 symlinkArch "${CGAME}"	"${CGAME}"	""	"${BUNDLEBINDIR}/${MISSIONPACKDIR}"
 symlinkArch "${GAME}"	"${GAME}"	""	"${BUNDLEBINDIR}/${MISSIONPACKDIR}"
 symlinkArch "${UI}"		"${UI}"		""	"${BUNDLEBINDIR}/${MISSIONPACKDIR}"
+
+fi