From 1f2156adcc4460586d605c1cb513c5265c541a79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lancelot=20de=20Ferri=C3=A8re?= Date: Sun, 27 Apr 2025 10:48:39 +0200 Subject: [PATCH] Fix library build on MacOS Sonoma --- libraries/build-macos-libs.sh | 7 ++++--- libraries/source/premake-core/build.sh | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/libraries/build-macos-libs.sh b/libraries/build-macos-libs.sh index 81940dfc01..81f7e0f8c5 100755 --- a/libraries/build-macos-libs.sh +++ b/libraries/build-macos-libs.sh @@ -28,7 +28,7 @@ SDL2_VERSION="SDL2-2.24.0" # NOTE: remember to also update LIB_URL below when changing version BOOST_VERSION="boost_1_81_0" # NOTE: remember to also update LIB_URL below when changing version -WXWIDGETS_VERSION="wxWidgets-3.1.4" +WXWIDGETS_VERSION="wxWidgets-3.2.8" # libpng was included as part of X11 but that's removed from Mountain Lion # (also the Snow Leopard version was ancient 1.2) PNG_VERSION="libpng-1.6.44" @@ -476,7 +476,7 @@ echo "Building wxWidgets..." LIB_VERSION="${WXWIDGETS_VERSION}" LIB_ARCHIVE="$LIB_VERSION.tar.bz2" LIB_DIRECTORY="$LIB_VERSION" - LIB_URL="http://github.com/wxWidgets/wxWidgets/releases/download/v3.1.4/" + LIB_URL="http://github.com/wxWidgets/wxWidgets/releases/download/v3.2.8/" mkdir -p wxwidgets cd wxwidgets @@ -509,7 +509,6 @@ echo "Building wxWidgets..." --without-x --disable-stc --disable-webview - --disable-webkit --disable-webviewwebkit --disable-webviewie --without-libjpeg" @@ -645,6 +644,7 @@ OGG_DIR="$(pwd)/libogg" -S $LIB_DIRECTORY \ -G "Unix Makefiles" \ -DCMAKE_INSTALL_PREFIX="$OGG_DIR" \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DBUILD_SHARED_LIBS=OFF \ -DINSTALL_DOCS=OFF \ -DCMAKE_C_FLAGS="$CFLAGS" \ @@ -685,6 +685,7 @@ echo "Building libvorbis..." -G "Unix Makefiles" \ -DCMAKE_INSTALL_PREFIX="$INSTALL_DIR" \ -DCMAKE_PREFIX_PATH="$OGG_DIR" \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DBUILD_SHARED_LIBS=OFF \ -DINSTALL_DOCS=OFF \ -DCMAKE_C_FLAGS="$CFLAGS" \ diff --git a/libraries/source/premake-core/build.sh b/libraries/source/premake-core/build.sh index d779c91783..580ac0d270 100755 --- a/libraries/source/premake-core/build.sh +++ b/libraries/source/premake-core/build.sh @@ -9,7 +9,7 @@ set -e cd "$(dirname "$0")" PV=5.0.0-beta4 -LIB_VERSION=${PV}+wfg0 +LIB_VERSION=${PV}+wfg1 fetch() { @@ -59,7 +59,7 @@ patch -d "premake-core-${PV}" -p1