From f77a682eb3c338155f88806a7cbe26ba1614f669 Mon Sep 17 00:00:00 2001 From: George Tokmaji Date: Sun, 9 Jun 2024 13:33:23 +0200 Subject: [PATCH] Test --- platforms/Mac.sh | 3 ++- scripts/libpng.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/platforms/Mac.sh b/platforms/Mac.sh index d81f708..9ee768c 100755 --- a/platforms/Mac.sh +++ b/platforms/Mac.sh @@ -4,7 +4,8 @@ export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew update brew install llvm@18 ninja -echo "CMAKE_CONFIGURE_ARGS=$CMAKE_CONFIGURE_ARGS -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 -DCMAKE_TOOLCHAIN_FILE=$PWD/platforms/clang16_mac.cmake" >> $GITHUB_ENV +echo "CMAKE_CONFIGURE_ARGS=$CMAKE_CONFIGURE_ARGS -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 -DCMAKE_OSX_SYSROOT=/Applications/Xcode_14.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX13.1.sdk -DCMAKE_TOOLCHAIN_FILE=$PWD/platforms/clang16_mac.cmake" >> $GITHUB_ENV +echo "MACOSX_DEPLOYMENT_TARGET=10.9" >> $GITHUB_ENV echo "MAKE_CMD=make -j$(sysctl -n hw.logicalcpu)" >> $GITHUB_ENV echo "LINK_FLAGS=-mmacosx-version-min=10.9" >> $GITHUB_ENV echo "C_XX_FLAGS=-mmacosx-version-min=10.9" >> $GITHUB_ENV diff --git a/scripts/libpng.sh b/scripts/libpng.sh index 454cbac..905adb2 100755 --- a/scripts/libpng.sh +++ b/scripts/libpng.sh @@ -9,7 +9,7 @@ until curl -L https://downloads.sourceforge.net/sourceforge/libpng/libpng-"$VERS mkdir build pushd build -cmake ../libpng-"$VERSION" -DPNG_SHARED=Off -DPNG_TESTS=Off -DSKIP_INSTALL_PROGRAMS=On $CMAKE_CONFIGURE_ARGS +cmake ../libpng-"$VERSION" -DPNG_SHARED=Off -DPNG_TESTS=Off -DSKIP_INSTALL_PROGRAMS=On --trace-expand --trace-source=CMakeLists.txt $CMAKE_CONFIGURE_ARGS cmake --build . --target png_static $CMAKE_BUILD_ARGS cmake --install . $CMAKE_BUILD_ARGS