From 5deec23e0a6dbe26a3aac9b7326ccf7b55b1edbb Mon Sep 17 00:00:00 2001 From: esi <41133734+vapidinfinity@users.noreply.github.com> Date: Sat, 20 Dec 2025 22:55:52 +0100 Subject: [PATCH 1/4] feat(build): use macOS 12.3 SDK and Xcode 13 toolchain for workflow --- .github/workflows/build.yml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1a7bf08b65b2..b452d81bad8e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,6 +19,8 @@ env: LDFLAGS: -Wl,-ld_classic -Wl,-headerpad_max_install_names -Wl,-rpath,@loader_path/../../ -Wl,-rpath,@loader_path/../../external -Wl,-rpath,/usr/local/lib ac_cv_lib_soname_MoltenVK: libMoltenVK.dylib ac_cv_lib_soname_vulkan: "" + TOOLCHAINS: com.applex.dt.toolchain.Xcode13 + SDKROOT: /Library/Developer/CommandLineTools/SDKs/MacOSX12.3.sdk concurrency: group: ${{ github.workflow }}-${{ github.ref_name }} @@ -29,11 +31,22 @@ jobs: runs-on: macos-15-intel steps: - - name: checkout repository - uses: actions/checkout@v5 + - uses: actions/checkout@v5 with: path: src + - name: add Xcode 13 toolchain + run: | + sudo mkdir -p /Library/Developer/Toolchains + curl -fL https://dl.getmythic.app/engine/toolchains/Xcode13.xctoolchain.tar.xz \ + | sudo tar -xJ -C /Library/Developer/Toolchains + + - name: add macOS 12.3 SDK + run: | + sudo mkdir -p /Library/Developer/CommandLineTools/SDKs + curl -fL https://github.com/Gcenx/macos-sdk/releases/download/12.3/MacOSX12.3.tar.bz2 \ + | sudo tar -xj -C /Library/Developer/CommandLineTools/SDKs + - name: install build & runtime dependencies run: | brew install bison \ From 85131595ab22d7fa992be49488425130afaf2b9f Mon Sep 17 00:00:00 2001 From: esi <41133734+vapidinfinity@users.noreply.github.com> Date: Sun, 21 Dec 2025 20:50:49 +0100 Subject: [PATCH 2/4] fix(build): add missing `libpcap` dependency --- .github/workflows/build.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b452d81bad8e..d8eb74247c85 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,9 @@ env: CFLAGS: -O2 -Wno-deprecated-declarations -Wno-unguarded-availability CXXFLAGS: -O2 -Wno-deprecated-declarations -Wno-unguarded-availability CROSSCFLAGS: -O2 -Wno-error=incompatible-pointer-types -Wno-error=int-conversion -Wno-deprecated-declarations - LDFLAGS: -Wl,-ld_classic -Wl,-headerpad_max_install_names -Wl,-rpath,@loader_path/../../ -Wl,-rpath,@loader_path/../../external -Wl,-rpath,/usr/local/lib + LDFLAGS: -Wl,-ld_classic -Wl,-headerpad_max_install_names -Wl,-rpath,@loader_path/../../ -Wl,-rpath,@loader_path/../../external -Wl,-rpath,/usr/local/lib -L/usr/local/opt/libpcap/lib + CPPFLAGS: -I/usr/local/opt/libpcap/include + PKG_CONFIG_PATH: /usr/local/opt/libpcap/lib/pkgconfig ac_cv_lib_soname_MoltenVK: libMoltenVK.dylib ac_cv_lib_soname_vulkan: "" TOOLCHAINS: com.applex.dt.toolchain.Xcode13 @@ -50,17 +52,18 @@ jobs: - name: install build & runtime dependencies run: | brew install bison \ + freetype \ pkg-config \ gettext \ - freetype \ gnutls \ gstreamer \ gst-plugins-base \ gst-plugins-good \ - libpng \ jpeg \ + libpng \ libtiff \ libffi \ + libpcap \ sdl2 \ molten-vk \ winetricks From 02f996e5597c963378f438dd03f15dfea99902c1 Mon Sep 17 00:00:00 2001 From: esi <41133734+vapidinfinity@users.noreply.github.com> Date: Tue, 23 Dec 2025 08:42:24 +0100 Subject: [PATCH 3/4] fix(build): remove `-ld_classic` from `LDFLAGS` --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d8eb74247c85..42e7e3fa5efa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ env: CFLAGS: -O2 -Wno-deprecated-declarations -Wno-unguarded-availability CXXFLAGS: -O2 -Wno-deprecated-declarations -Wno-unguarded-availability CROSSCFLAGS: -O2 -Wno-error=incompatible-pointer-types -Wno-error=int-conversion -Wno-deprecated-declarations - LDFLAGS: -Wl,-ld_classic -Wl,-headerpad_max_install_names -Wl,-rpath,@loader_path/../../ -Wl,-rpath,@loader_path/../../external -Wl,-rpath,/usr/local/lib -L/usr/local/opt/libpcap/lib + LDFLAGS: -Wl,-headerpad_max_install_names -Wl,-rpath,@loader_path/../../ -Wl,-rpath,@loader_path/../../external -Wl,-rpath,/usr/local/lib -L/usr/local/opt/libpcap/lib CPPFLAGS: -I/usr/local/opt/libpcap/include PKG_CONFIG_PATH: /usr/local/opt/libpcap/lib/pkgconfig ac_cv_lib_soname_MoltenVK: libMoltenVK.dylib From 794f71a291b3dcae925516a8ac09af0db25d2da5 Mon Sep 17 00:00:00 2001 From: esi <41133734+vapidinfinity@users.noreply.github.com> Date: Tue, 23 Dec 2025 11:23:29 +0100 Subject: [PATCH 4/4] refactor(build): tidy up environment variables --- .github/workflows/build.yml | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 42e7e3fa5efa..4758a7ce2c3d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,23 +6,32 @@ on: env: MACOSX_DEPLOYMENT_TARGET: 10.15 + SDKROOT: /Library/Developer/CommandLineTools/SDKs/MacOSX12.3.sdk + TOOLCHAINS: com.applex.dt.toolchain.Xcode13 + PATH: /usr/local/bin:/usr/local/opt/bison/bin:/usr/bin:/bin:/usr/sbin:/sbin + + CPATH: /usr/local/include + LIBRARY_PATH: /usr/local/lib + + # mingw-w64 cross-compilers i386_CC: i686-w64-mingw32-gcc x86_64_CC: x86_64-w64-mingw32-gcc i386_LD: i686-w64-mingw32-ld x86_64_LD: x86_64-w64-mingw32-ld - CPATH: /usr/local/include - LIBRARY_PATH: /usr/local/lib + + # compiler and linker flags CFLAGS: -O2 -Wno-deprecated-declarations -Wno-unguarded-availability CXXFLAGS: -O2 -Wno-deprecated-declarations -Wno-unguarded-availability CROSSCFLAGS: -O2 -Wno-error=incompatible-pointer-types -Wno-error=int-conversion -Wno-deprecated-declarations - LDFLAGS: -Wl,-headerpad_max_install_names -Wl,-rpath,@loader_path/../../ -Wl,-rpath,@loader_path/../../external -Wl,-rpath,/usr/local/lib -L/usr/local/opt/libpcap/lib CPPFLAGS: -I/usr/local/opt/libpcap/include + LDFLAGS: -Wl,-headerpad_max_install_names -Wl,-rpath,@loader_path/../../ -Wl,-rpath,@loader_path/../../external -Wl,-rpath,/usr/local/lib -L/usr/local/opt/libpcap/lib + PKG_CONFIG_PATH: /usr/local/opt/libpcap/lib/pkgconfig + + # wine configure overrides ac_cv_lib_soname_MoltenVK: libMoltenVK.dylib ac_cv_lib_soname_vulkan: "" - TOOLCHAINS: com.applex.dt.toolchain.Xcode13 - SDKROOT: /Library/Developer/CommandLineTools/SDKs/MacOSX12.3.sdk concurrency: group: ${{ github.workflow }}-${{ github.ref_name }} @@ -37,13 +46,13 @@ jobs: with: path: src - - name: add Xcode 13 toolchain + - name: download & add Xcode 13 toolchain run: | sudo mkdir -p /Library/Developer/Toolchains curl -fL https://dl.getmythic.app/engine/toolchains/Xcode13.xctoolchain.tar.xz \ | sudo tar -xJ -C /Library/Developer/Toolchains - - name: add macOS 12.3 SDK + - name: download & add macOS 12.3 SDK run: | sudo mkdir -p /Library/Developer/CommandLineTools/SDKs curl -fL https://github.com/Gcenx/macos-sdk/releases/download/12.3/MacOSX12.3.tar.bz2 \