MultiCraftProject/MultiCraft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

macOS: use Irrlicht 1.9

Browse Source
This commit is contained in:
Maksim 2020-11-08 17:57:46 +01:00
parent c2d2f81495
commit 5fb597a63f
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build/macOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj
View File

@ -1933,7 +1933,7 @@
"@executable_path/../Frameworks", "@executable_path/../Frameworks",
); );
MACOSX_DEPLOYMENT_TARGET = 10.10; MACOSX_DEPLOYMENT_TARGET = 10.10;
MARKETING_VERSION = 1.12.0; MARKETING_VERSION = 1.13.0;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
"-L${SRCROOT}/../deps/irrlicht", "-L${SRCROOT}/../deps/irrlicht",
@ -1959,6 +1959,7 @@
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)", "$(inherited)",
"COCOAPODS=1", "COCOAPODS=1",
"NDEBUG=1",
"RUN_IN_PLACE=0", "RUN_IN_PLACE=0",
"USE_GETTEXT=1", "USE_GETTEXT=1",
"USE_CURL=1", "USE_CURL=1",
@ -1984,7 +1985,7 @@
"@executable_path/../Frameworks", "@executable_path/../Frameworks",
); );
MACOSX_DEPLOYMENT_TARGET = 10.10; MACOSX_DEPLOYMENT_TARGET = 10.10;
MARKETING_VERSION = 1.12.0; MARKETING_VERSION = 1.13.0;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
"-L${SRCROOT}/../deps/irrlicht", "-L${SRCROOT}/../deps/irrlicht",

14
build/macOS/deps/irrlicht.sh
View File

@ -3,20 +3,20 @@
. sdk.sh . sdk.sh
[ ! -d irrlicht-src ] && \ [ ! -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 \ xcodebuild build \
ARCHS="$OSX_ARCHES" \ ARCHS="$OSX_ARCHES" \
-project MacOSX.xcodeproj \ -project Irrlicht.xcodeproj \
-configuration Release \ -configuration Release \
-scheme libIrrlicht.a -scheme Irrlicht_OSX
BUILD_FOLDER=$(xcodebuild -project MacOSX.xcodeproj -scheme \ BUILD_FOLDER=$(xcodebuild -project Irrlicht.xcodeproj -scheme \
libIrrlicht.a -showBuildSettings | \ Irrlicht_OSX -showBuildSettings | \
grep TARGET_BUILD_DIR | sed -n -e 's/^.*TARGET_BUILD_DIR = //p') grep TARGET_BUILD_DIR | sed -n -e 's/^.*TARGET_BUILD_DIR = //p')
cd ../../.. cd ../..
[ -d ../irrlicht ] && rm -r ../irrlicht [ -d ../irrlicht ] && rm -r ../irrlicht
mkdir -p ../irrlicht mkdir -p ../irrlicht