diff --git a/build/macOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj b/build/macOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj index b029a6eb..0f4feed0 100644 --- a/build/macOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj +++ b/build/macOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj @@ -1933,7 +1933,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.10; - MARKETING_VERSION = 1.12.0; + MARKETING_VERSION = 1.13.0; OTHER_LDFLAGS = ( "$(inherited)", "-L${SRCROOT}/../deps/irrlicht", @@ -1959,6 +1959,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", "COCOAPODS=1", + "NDEBUG=1", "RUN_IN_PLACE=0", "USE_GETTEXT=1", "USE_CURL=1", @@ -1984,7 +1985,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.10; - MARKETING_VERSION = 1.12.0; + MARKETING_VERSION = 1.13.0; OTHER_LDFLAGS = ( "$(inherited)", "-L${SRCROOT}/../deps/irrlicht", diff --git a/build/macOS/deps/irrlicht.sh b/build/macOS/deps/irrlicht.sh index 28f900da..ea78bdef 100755 --- a/build/macOS/deps/irrlicht.sh +++ b/build/macOS/deps/irrlicht.sh @@ -3,20 +3,20 @@ . sdk.sh [ ! -d irrlicht-src ] && \ - git clone --depth 1 https://github.com/MoNTE48/Irrlicht-1.8 irrlicht-src + git clone --depth 1 -b master https://github.com/MoNTE48/Irrlicht irrlicht-src -cd irrlicht-src/source/Irrlicht/MacOSX +cd irrlicht-src/source/Irrlicht xcodebuild build \ ARCHS="$OSX_ARCHES" \ - -project MacOSX.xcodeproj \ + -project Irrlicht.xcodeproj \ -configuration Release \ - -scheme libIrrlicht.a + -scheme Irrlicht_OSX -BUILD_FOLDER=$(xcodebuild -project MacOSX.xcodeproj -scheme \ - libIrrlicht.a -showBuildSettings | \ +BUILD_FOLDER=$(xcodebuild -project Irrlicht.xcodeproj -scheme \ + Irrlicht_OSX -showBuildSettings | \ grep TARGET_BUILD_DIR | sed -n -e 's/^.*TARGET_BUILD_DIR = //p') -cd ../../.. +cd ../.. [ -d ../irrlicht ] && rm -r ../irrlicht mkdir -p ../irrlicht