From 0f989e37ee7065d3bc22bef9eac3fc94a258bca8 Mon Sep 17 00:00:00 2001 From: Maksym H Date: Thu, 21 Sep 2023 01:50:55 +0300 Subject: [PATCH] Apple: Xcode 15 support --- Apple/MultiCraft/MultiCraft.xcodeproj/project.pbxproj | 3 ++- Apple/scripts/SDL2.sh | 2 +- Apple/scripts/freetype.sh | 2 +- Apple/scripts/luajit.sh | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Apple/MultiCraft/MultiCraft.xcodeproj/project.pbxproj b/Apple/MultiCraft/MultiCraft.xcodeproj/project.pbxproj index 026216d41..f13ec878d 100644 --- a/Apple/MultiCraft/MultiCraft.xcodeproj/project.pbxproj +++ b/Apple/MultiCraft/MultiCraft.xcodeproj/project.pbxproj @@ -2215,6 +2215,7 @@ ENABLE_HARDENED_RUNTIME = YES; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", + _LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION, "RUN_IN_PLACE=0", "USE_GETTEXT=1", "USE_CURL=1", @@ -2283,8 +2284,8 @@ ENABLE_HARDENED_RUNTIME = YES; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", - "COCOAPODS=1", "NDEBUG=1", + _LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION, "RUN_IN_PLACE=0", "USE_GETTEXT=1", "USE_CURL=1", diff --git a/Apple/scripts/SDL2.sh b/Apple/scripts/SDL2.sh index 9c47bebf2..c1401a7e4 100755 --- a/Apple/scripts/SDL2.sh +++ b/Apple/scripts/SDL2.sh @@ -1,6 +1,6 @@ #!/bin/bash -e -SDL2_VERSION=release-2.28.2 +SDL2_VERSION=release-2.28.3 . scripts/sdk.sh mkdir -p deps; cd deps diff --git a/Apple/scripts/freetype.sh b/Apple/scripts/freetype.sh index a3e7e60bd..7976e48a8 100755 --- a/Apple/scripts/freetype.sh +++ b/Apple/scripts/freetype.sh @@ -1,6 +1,6 @@ #!/bin/bash -e -FREETYPE_VERSION=2.13.1 +FREETYPE_VERSION=2.13.2 . scripts/sdk.sh mkdir -p deps; cd deps diff --git a/Apple/scripts/luajit.sh b/Apple/scripts/luajit.sh index 4c7f6cdf6..33f866184 100755 --- a/Apple/scripts/luajit.sh +++ b/Apple/scripts/luajit.sh @@ -29,6 +29,7 @@ rm templib_*.a mkdir -p ../luajit/include cp -v src/*.h ../luajit/include +cp -v ../luajit/include/luajit_rolling.h ../luajit/include/luajit.h cp -v libluajit.a ../luajit echo "LuaJIT build successful"