From 01610cb8453077a6877f7b4ac9bacf7327fe282d Mon Sep 17 00:00:00 2001 From: Maksym H Date: Tue, 27 Jun 2023 01:48:52 +0300 Subject: [PATCH] macOS: minor update --- .../MultiCraft.xcodeproj/project.pbxproj | 23 +++++++++++-------- .../MultiCraft/ar.lproj/Localizable.strings | 1 + Apple/scripts/SDL2.sh | 2 +- Apple/scripts/freetype.sh | 2 +- Apple/scripts/gettext.sh | 2 +- Apple/scripts/libpng.sh | 2 +- Apple/scripts/luajit.sh | 2 +- Apple/scripts/openal.sh | 2 +- Apple/scripts/sdk.sh | 2 +- 9 files changed, 21 insertions(+), 17 deletions(-) create mode 100644 Apple/MultiCraft/MultiCraft/ar.lproj/Localizable.strings diff --git a/Apple/MultiCraft/MultiCraft.xcodeproj/project.pbxproj b/Apple/MultiCraft/MultiCraft.xcodeproj/project.pbxproj index 4d2752dae..4943f0682 100644 --- a/Apple/MultiCraft/MultiCraft.xcodeproj/project.pbxproj +++ b/Apple/MultiCraft/MultiCraft.xcodeproj/project.pbxproj @@ -520,6 +520,7 @@ 841AD8B828D0E2E40042E335 /* libvorbisfile.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvorbisfile.a; path = ../deps/libvorbis/libvorbisfile.a; sourceTree = ""; }; 8425D3702837D89300753F0E /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/Localizable.strings; sourceTree = ""; }; 8425D3712837D89600753F0E /* id */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = id; path = id.lproj/Localizable.strings; sourceTree = ""; }; + 8425FC862A275920008569EE /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/Localizable.strings; sourceTree = ""; }; 84287CA4291ED0F000E30F96 /* locale */ = {isa = PBXFileReference; lastKnownFileType = folder; name = locale; path = ../../assets/locale; sourceTree = ""; }; 84287CA5291ED0F000E30F96 /* fonts */ = {isa = PBXFileReference; lastKnownFileType = folder; name = fonts; path = ../../assets/fonts; sourceTree = ""; }; 844436EE28DA80C100662A9D /* libfreetype.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfreetype.a; path = ../deps/freetype/libfreetype.a; sourceTree = ""; }; @@ -1779,6 +1780,7 @@ id, ja, nb, + ar, ); mainGroup = 845856A024B1322C0040BA4F; productRefGroup = 845856AA24B1322C0040BA4F /* Products */; @@ -2097,6 +2099,7 @@ 8425D3712837D89600753F0E /* id */, 8457C2C52848DB7300D69304 /* ja */, 840A686F2989C8B400ADE329 /* nb */, + 8425FC862A275920008569EE /* ar */, ); name = Localizable.strings; sourceTree = ""; @@ -2130,12 +2133,15 @@ GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; MACOSX_DEPLOYMENT_TARGET = 10.11; ONLY_ACTIVE_ARCH = YES; - OTHER_CPLUSPLUSFLAGS = ( - "$(OTHER_CFLAGS)", + OTHER_CFLAGS = ( + "$(inherited)", + "-fdata-sections", + "-ffunction-sections", "-Wno-inconsistent-missing-override", "-D__FILE__=__FILE_NAME__", "-Wno-builtin-macro-redefined", ); + OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)"; SDKROOT = macosx; }; name = Debug; @@ -2162,12 +2168,15 @@ GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; LLVM_LTO = YES; MACOSX_DEPLOYMENT_TARGET = 10.11; - OTHER_CPLUSPLUSFLAGS = ( - "$(OTHER_CFLAGS)", + OTHER_CFLAGS = ( + "$(inherited)", + "-fdata-sections", + "-ffunction-sections", "-Wno-inconsistent-missing-override", "-D__FILE__=__FILE_NAME__", "-Wno-builtin-macro-redefined", ); + OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)"; SDKROOT = macosx; VALIDATE_PRODUCT = YES; }; @@ -2193,7 +2202,6 @@ "USE_LEVELDB=1", "USE_LUAJIT=1", "USE_SYSTEM_GMP=0", - "_IRR_COMPILE_WITH_SDL_DEVICE_=1", "ENABLE_UPDATE_CHECKER=1", "VERSION_MAJOR=2", "VERSION_MINOR=0", @@ -2222,7 +2230,6 @@ INFOPLIST_FILE = MultiCraft/Info.plist; MACOSX_DEPLOYMENT_TARGET = 10.11; MARKETING_VERSION = 2.0.4; - OTHER_CFLAGS = "$(inherited)"; OTHER_LDFLAGS = ( "$(inherited)", "-L${SRCROOT}/../deps/freetype", @@ -2236,7 +2243,6 @@ "-L${SRCROOT}/../deps/libpng", "-L${SRCROOT}/../deps/SDL2", "-L${SRCROOT}/../deps/libvorbis", - "-Wl,-dead_strip", ); PRODUCT_BUNDLE_IDENTIFIER = mobi.MultiCraft; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -2265,7 +2271,6 @@ "USE_LEVELDB=1", "USE_LUAJIT=1", "USE_SYSTEM_GMP=0", - "_IRR_COMPILE_WITH_SDL_DEVICE_=1", "ENABLE_UPDATE_CHECKER=1", "VERSION_MAJOR=2", "VERSION_MINOR=0", @@ -2294,7 +2299,6 @@ INFOPLIST_FILE = MultiCraft/Info.plist; MACOSX_DEPLOYMENT_TARGET = 10.11; MARKETING_VERSION = 2.0.4; - OTHER_CFLAGS = "$(inherited)"; OTHER_LDFLAGS = ( "$(inherited)", "-L${SRCROOT}/../deps/freetype", @@ -2308,7 +2312,6 @@ "-L${SRCROOT}/../deps/libpng", "-L${SRCROOT}/../deps/SDL2", "-L${SRCROOT}/../deps/libvorbis", - "-Wl,-dead_strip", ); PRODUCT_BUNDLE_IDENTIFIER = mobi.MultiCraft; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/Apple/MultiCraft/MultiCraft/ar.lproj/Localizable.strings b/Apple/MultiCraft/MultiCraft/ar.lproj/Localizable.strings new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/Apple/MultiCraft/MultiCraft/ar.lproj/Localizable.strings @@ -0,0 +1 @@ + diff --git a/Apple/scripts/SDL2.sh b/Apple/scripts/SDL2.sh index 7561302ef..15cf0972a 100755 --- a/Apple/scripts/SDL2.sh +++ b/Apple/scripts/SDL2.sh @@ -1,6 +1,6 @@ #!/bin/bash -e -SDL2_VERSION=2.26.3 +SDL2_VERSION=2.28.0 . scripts/sdk.sh mkdir -p deps; cd deps diff --git a/Apple/scripts/freetype.sh b/Apple/scripts/freetype.sh index 55887daab..386e5a77a 100755 --- a/Apple/scripts/freetype.sh +++ b/Apple/scripts/freetype.sh @@ -1,6 +1,6 @@ #!/bin/bash -e -FREETYPE_VERSION=2.13.0 +FREETYPE_VERSION=2.13.1 . scripts/sdk.sh mkdir -p deps; cd deps diff --git a/Apple/scripts/gettext.sh b/Apple/scripts/gettext.sh index d6bafe44e..802c6b29c 100755 --- a/Apple/scripts/gettext.sh +++ b/Apple/scripts/gettext.sh @@ -1,6 +1,6 @@ #!/bin/bash -e -GETTEXT_VERSION=0.21.1 +GETTEXT_VERSION=0.22 . scripts/sdk.sh mkdir -p deps; cd deps diff --git a/Apple/scripts/libpng.sh b/Apple/scripts/libpng.sh index 65ed53cba..6c5188a62 100755 --- a/Apple/scripts/libpng.sh +++ b/Apple/scripts/libpng.sh @@ -1,6 +1,6 @@ #!/bin/bash -e -PNG_VERSION=1.6.39 +PNG_VERSION=1.6.40 . scripts/sdk.sh mkdir -p deps; cd deps diff --git a/Apple/scripts/luajit.sh b/Apple/scripts/luajit.sh index be7c3e9b2..4c7f6cdf6 100755 --- a/Apple/scripts/luajit.sh +++ b/Apple/scripts/luajit.sh @@ -18,7 +18,7 @@ for ARCH in x86_64 arm64 do echo "Building LuaJIT for $ARCH" make amalg -j \ - TARGET_FLAGS="$OSX_FLAGS -fno-fast-math -funwind-tables -fasynchronous-unwind-tables -arch $ARCH" + TARGET_FLAGS="$OSX_FLAGS -fno-fast-math -Wno-overriding-t-option -arch $ARCH" cp src/libluajit.a templib_$ARCH.a make clean done diff --git a/Apple/scripts/openal.sh b/Apple/scripts/openal.sh index 8bba10c1e..ad1fb2071 100755 --- a/Apple/scripts/openal.sh +++ b/Apple/scripts/openal.sh @@ -1,6 +1,6 @@ #!/bin/bash -e -OPENAL_VERSION=1.23.0 +OPENAL_VERSION=1.23.1 . scripts/sdk.sh mkdir -p deps; cd deps diff --git a/Apple/scripts/sdk.sh b/Apple/scripts/sdk.sh index 442eec840..19de3b018 100755 --- a/Apple/scripts/sdk.sh +++ b/Apple/scripts/sdk.sh @@ -11,4 +11,4 @@ export OSX_ARCH="-arch x86_64 -arch arm64" export OSX_COMPILER=$(xcrun --sdk $sdk --find clang) export OSX_CC=$OSX_COMPILER export OSX_CXX=$OSX_COMPILER -export OSX_FLAGS="-isysroot $(xcrun --sdk $sdk --show-sdk-path) -mmacosx-version-min=$OSX_OSVER -fdata-sections -ffunction-sections -fno-unwind-tables -fno-asynchronous-unwind-tables -Ofast" +export OSX_FLAGS="-isysroot $(xcrun --sdk $sdk --show-sdk-path) -mmacosx-version-min=$OSX_OSVER -fdata-sections -ffunction-sections -Ofast"