From 001207a014bd60e4a4728c30197306f3d914eab5 Mon Sep 17 00:00:00 2001 From: Maksim Date: Tue, 17 Nov 2020 22:34:05 +0100 Subject: [PATCH] macOS: update xcodeproj. Enable Apple silicon support --- .../MultiCraft.xcodeproj/project.pbxproj | 28 ++++++++++++------- build/macOS/MultiCraft/MultiCraft/Info.plist | 2 +- build/macOS/deps/sdk.sh | 10 +++---- 3 files changed, 24 insertions(+), 16 deletions(-) diff --git a/build/macOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj b/build/macOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj index 0f4feed0..ceaa612b 100644 --- a/build/macOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj +++ b/build/macOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj @@ -14,7 +14,6 @@ 84463B9524B258B10099DFBD /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84585C0224B134810040BA4F /* OpenAL.framework */; }; 84463B9724B258B20099DFBD /* Pods_MultiCraft.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50555C0ED3309AD5F0B15D19 /* Pods_MultiCraft.framework */; }; 84463B9924B258B50099DFBD /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84585C0424B134850040BA4F /* OpenGL.framework */; }; - 84463B9B24B258B60099DFBD /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84585C0924B134C40040BA4F /* QuartzCore.framework */; }; 8453A49E24DB22F00087ECF9 /* client in Resources */ = {isa = PBXBuildFile; fileRef = 8453A49D24DB22F00087ECF9 /* client */; }; 845856B324B1322D0040BA4F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 845856B224B1322D0040BA4F /* Assets.xcassets */; }; 84585C0724B134900040BA4F /* libcurl.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 84585C0624B1348B0040BA4F /* libcurl.tbd */; }; @@ -274,7 +273,6 @@ 84585C0224B134810040BA4F /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = System/Library/Frameworks/OpenAL.framework; sourceTree = SDKROOT; }; 84585C0424B134850040BA4F /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; }; 84585C0624B1348B0040BA4F /* libcurl.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libcurl.tbd; path = usr/lib/libcurl.tbd; sourceTree = SDKROOT; }; - 84585C0924B134C40040BA4F /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; 84585C0B24B134D90040BA4F /* libiconv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libiconv.tbd; path = usr/lib/libiconv.tbd; sourceTree = SDKROOT; }; 84585CD624B139190040BA4F /* defaultsettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = defaultsettings.h; path = ../../../../src/defaultsettings.h; sourceTree = ""; }; 84585CD724B139190040BA4F /* game.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = game.cpp; path = ../../../../src/game.cpp; sourceTree = ""; }; @@ -784,7 +782,6 @@ buildActionMask = 2147483647; files = ( 84585C0724B134900040BA4F /* libcurl.tbd in Frameworks */, - 84463B9B24B258B60099DFBD /* QuartzCore.framework in Frameworks */, 84585C0E24B134F80040BA4F /* libiconv.tbd in Frameworks */, 84463B8C24B258AA0099DFBD /* AppKit.framework in Frameworks */, 84463B9124B258AF0099DFBD /* Foundation.framework in Frameworks */, @@ -855,7 +852,6 @@ 8458616724B1B7990040BA4F /* libIrrlicht.a */, 8458616624B1B78D0040BA4F /* libfreetype.a */, 84585C0B24B134D90040BA4F /* libiconv.tbd */, - 84585C0924B134C40040BA4F /* QuartzCore.framework */, 84585C0624B1348B0040BA4F /* libcurl.tbd */, 84585C0424B134850040BA4F /* OpenGL.framework */, 84585C0224B134810040BA4F /* OpenAL.framework */, @@ -1522,7 +1518,7 @@ hasScannedForEncodings = 0; knownRegions = ( en, - Base, + ru, ); mainGroup = 845856A024B1322C0040BA4F; productRefGroup = 845856AA24B1322C0040BA4F /* Products */; @@ -1838,6 +1834,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -1847,14 +1844,13 @@ DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_INCREMENTAL_DISTILL = YES; - ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 3; GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", "$(inherited)", + "DEBUG=1", ); GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_UNROLL_LOOPS = YES; @@ -1862,7 +1858,12 @@ MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; ONLY_ACTIVE_ARCH = YES; + OTHER_CPLUSPLUSFLAGS = ( + "$(OTHER_CFLAGS)", + "-Wno-inconsistent-missing-override", + ); SDKROOT = macosx; + VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = OpenGL; }; name = Debug; }; @@ -1870,6 +1871,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -1880,7 +1882,6 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_INCREMENTAL_DISTILL = YES; ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 3; @@ -1890,8 +1891,13 @@ LLVM_LTO = YES; MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; + OTHER_CPLUSPLUSFLAGS = ( + "$(OTHER_CFLAGS)", + "-Wno-inconsistent-missing-override", + ); SDKROOT = macosx; VALIDATE_PRODUCT = YES; + VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = OpenGL; }; name = Release; }; @@ -1904,6 +1910,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; + CURRENT_PROJECT_VERSION = 3; DEVELOPMENT_TEAM = R3RLJ9TW52; ENABLE_HARDENED_RUNTIME = YES; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -1933,7 +1940,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.10; - MARKETING_VERSION = 1.13.0; + MARKETING_VERSION = 1.13.1; OTHER_LDFLAGS = ( "$(inherited)", "-L${SRCROOT}/../deps/irrlicht", @@ -1954,6 +1961,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; + CURRENT_PROJECT_VERSION = 3; DEVELOPMENT_TEAM = R3RLJ9TW52; ENABLE_HARDENED_RUNTIME = YES; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -1985,7 +1993,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.10; - MARKETING_VERSION = 1.13.0; + MARKETING_VERSION = 1.13.1; OTHER_LDFLAGS = ( "$(inherited)", "-L${SRCROOT}/../deps/irrlicht", diff --git a/build/macOS/MultiCraft/MultiCraft/Info.plist b/build/macOS/MultiCraft/MultiCraft/Info.plist index e35afcac..0065197b 100644 --- a/build/macOS/MultiCraft/MultiCraft/Info.plist +++ b/build/macOS/MultiCraft/MultiCraft/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString $(MARKETING_VERSION) CFBundleVersion - 1 + $(CURRENT_PROJECT_VERSION) LSApplicationCategoryType public.app-category.adventure-games LSMinimumSystemVersion diff --git a/build/macOS/deps/sdk.sh b/build/macOS/deps/sdk.sh index b5ee3e3a..3c8fef8a 100755 --- a/build/macOS/deps/sdk.sh +++ b/build/macOS/deps/sdk.sh @@ -4,11 +4,11 @@ sdk=macosx osver=10.10 -export OSX_ARCHES="x86_64" -arches="-arch x86_64" -#For Apple silicon -#export OSX_ARCHES="x86_64 arm64" -#arches="-arch x86_64 -arch arm64" +#export OSX_ARCHES="x86_64" +#arches="-arch x86_64" +# For Apple silicon +export OSX_ARCHES="x86_64 arm64" +arches="-arch x86_64 -arch arm64" export OSX_COMPILER=$(xcrun --sdk $sdk --find clang) export OSX_CC=$OSX_COMPILER