fix macos release packaging

Author: HeliumAnt

.github/actions/osxcross/action.yml

@@ -138,4 +138,17 @@ runs:
 
     - shell: bash
       run: |
-        patch -i ${GITHUB_ACTION_PATH}/macports.patch ${OSXCROSS_FOLDER}/target/bin/osxcross-macports
+        OUT=$(patch -N -i ${GITHUB_ACTION_PATH}/macports.patch ${OSXCROSS_FOLDER}/target/bin/osxcross-macports) || echo "${OUT}" | grep "Skipping patch" -q || (echo "$OUT" && false);
+
+    - uses: actions/checkout@v4
+      with:
+        repository: auriamg/macdylibbundler
+        path: ${{env.OSXCROSS_FOLDER}}/dylibbundler
+
+    - shell: bash
+      run: |
+        echo "::group::Install dylibbundler"
+        cd ${OSXCROSS_FOLDER}/dylibbundler
+        make
+        echo "${OSXCROSS_FOLDER}/dylibbundler" >> $GITHUB_PATH
+        echo "::endgroup::"

.github/workflows/meson.yml

@@ -210,6 +210,8 @@ jobs:
           -Dinstall_data=false -Dinstall_runner=false -Dfmod_dir=Contents/Frameworks \
           --bindir=Contents/MacOS \
           --prefix="/" \
+          -Ddylibbundler_args="-ns -s ${{env.OSXCROSS_TARGET}}/macports/pkgs/opt/local/lib/ \
+            -s ${{env.OSXCROSS_TARGET}}/macports/pkgs/opt/local/libexec/onetbb/lib/" \
           build
 
       - name: Build
@@ -221,7 +223,7 @@ jobs:
       - name: Create App Bundle
         if: ${{inputs.upload_artefacts}}
         run: |
-          DESTDIR="/tmp/Cortex Command.app" meson install -C build
+          meson install --destdir="/tmp/Cortex Command.app" -C build
 
       - name: Tar files
         if: ${{inputs.upload_artefacts}}

Resources/bundle_dylibs.sh

@@ -3,4 +3,4 @@
 dylibbundler -od -b -x "${MESON_INSTALL_DESTDIR_PREFIX}/Contents/MacOS/${1}" \
  -d "${MESON_INSTALL_DESTDIR_PREFIX}/Contents/Frameworks" \
  -p "@executable_path/../Frameworks" \
- -s "${MESON_SOURCE_ROOT}/external/lib/macos"
+ -s "${MESON_SOURCE_ROOT}/external/lib/macos" ${2}

Resources/meson.build

@@ -14,5 +14,5 @@ elif host_machine.system() == 'darwin'
     install_data('ccicon.icns', install_dir : 'Contents/Resources')
     # install_data('Info.plist', install_dir : 'Contents')
     configure_file(input: 'Info.plist', output: 'Info.plist', install: true, install_dir:'Contents', install_mode: 'rw-r--r--', configuration: conf_data)
-    meson.add_install_script('bundle_dylibs.sh', elfname)
+    meson.add_install_script('bundle_dylibs.sh', elfname, get_option('dylibbundler_args'))
 endif

meson_options.txt

@@ -1,14 +1,20 @@
 option('debug_type', type: 'combo', choices: ['full','minimal','release'], value:'minimal', description: 'Enable certain Debug features, that might slow down the game')
 option('data_install_dir', type:'string', value:'share/CortexCommand', description: 'Where to install the data files relative to prefix directory')
+
 option('install_fmod', type:'boolean', value: true, description: 'Wether to install the fmod library.')
 option('fmod_dir', type:'string', value:'lib/CortexCommand/', description: 'Where to install the fmod library relative to prefix directory.')
+
 option('install_data', type: 'boolean', value: true, description: 'Whether to install the data repo.')
 option('install_runner', type: 'boolean', value: true, description: 'Whether to install the runner script.')
+
+option('dylibbundler_args', type: 'string', value: '', description: 'Additional arguments passed to the bundle_dylibs script for macos')
+
 option('sane_warnings', type: 'boolean', value: false, description: 'Disable certain warnings, that are reasonably safe to ignore, though we should fix them at some point.')
 option('use_prebuilt_libraries', type: 'boolean', value: true, description: 'On windows use the prebuilt libraries')
 
 option('tracy_enable', type: 'boolean', value: true, description: 'Enable Tracy Profiler')
 option('tracy_callstack', type : 'integer', value : 0, description : 'Enfore callstack collection for tracy regions')
 option('tracy_on_demand', type : 'boolean', value : true, description : 'On-demand profiling')
 option('tracy_debuginfod', type : 'boolean', value : false, description : 'Enable debuginfod support')
+
 option('use_pch', type : 'feature', value : 'auto')