Skip to content

Commit

Permalink
Update Xcode projects (iOS, macOS) for Xcode 10
Browse files Browse the repository at this point in the history
  • Loading branch information
@schellingb
schellingb committed Nov 28, 2018
1 parent 5622ece commit 4b84f81
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 17 deletions.
2 changes: 1 addition & 1 deletion ZillaLibSamples-OSX.xcodeproj/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<key>CFBundleVersion</key><string>1.0.0</string>
<key>CFBundleShortVersionString</key><string>1.0.0</string>
<key>CFBundleDisplayName</key><string>${PRODUCT_NAME}</string>
<key>CFBundleIdentifier</key><string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
<key>CFBundleIdentifier</key><string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key><string>6.0</string>
<key>CFBundlePackageType</key><string>APPL</string>
<key>CFBundleDevelopmentRegion</key><string>en</string>
Expand Down
17 changes: 11 additions & 6 deletions ZillaLibSamples-OSX.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,11 @@
if [ \"$CONFIGURATION\" != \"Release\" ]; then exit; fi #only perform in Release builds
$TOOLCHAIN_DIR/usr/bin/strip $TARGET_BUILD_DIR/$EXECUTABLE_PATH #manual strip because regular strip can't run after appending zip
cd $TARGET_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH
zip -0 -m -r - * -x AppIcon.icns | cat >> $TARGET_BUILD_DIR/$EXECUTABLE_PATH
zip -0 -m -r - * -x AppIcon.icns -x Assets.car | cat >> $TARGET_BUILD_DIR/$EXECUTABLE_PATH
"; };

D01001 = { isa = XCBuildConfiguration; buildSettings = {}; name = Debug; };
D01002 = { isa = XCBuildConfiguration; buildSettings = {}; name = Release; };
D01001 = { isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_BUNDLE_IDENTIFIER = "${PRODUCT_BUNDLE_IDENTIFIER}"; }; name = Debug; };
D01002 = { isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_BUNDLE_IDENTIFIER = "${PRODUCT_BUNDLE_IDENTIFIER}"; }; name = Release; };

D02001 = { isa = XCBuildConfiguration; buildSettings = {
PRODUCT_NAME = ZillaLibSamples;
Expand All @@ -90,21 +90,24 @@
HEADER_SEARCH_PATHS = ../ZillaLib/Include;
OTHER_CFLAGS = ( "-DDEBUG", "-D_DEBUG", "-DZILLALOG" );
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_CXX_LIBRARY = "libc++";
GCC_PREPROCESSOR_DEFINITIONS = $CmdLinePreprocessorDefinitions;
GCC_ENABLE_CPP_EXCEPTIONS = NO;
GCC_ENABLE_CPP_RTTI = NO;
GCC_OPTIMIZATION_LEVEL = 0;
COPY_PHASE_STRIP = NO;
ONLY_ACTIVE_ARCH = YES;
STRIP_INSTALLED_PRODUCT = NO;
MACOSX_DEPLOYMENT_TARGET = 10.5;
MACOSX_DEPLOYMENT_TARGET = 10.7;
SDKROOT = macosx;
OBJROOT = "ZillaLibSamples-OSX.xcodeproj/Debug";
SYMROOT = "ZillaLibSamples-OSX.xcodeproj/Debug";
BUILD_DIR = "ZillaLibSamples-OSX.xcodeproj/Debug";
CONFIGURATION_BUILD_DIR = "ZillaLibSamples-OSX.xcodeproj/Debug";
CONFIGURATION_TEMP_DIR = "ZillaLibSamples-OSX.xcodeproj/Debug";
SHARED_PRECOMPS_DIR = "ZillaLibSamples-OSX.xcodeproj/Debug";
ALWAYS_SEARCH_USER_PATHS = NO;
ENABLE_TESTABILITY = YES;
}; name = Debug; };

D02002 = { isa = XCBuildConfiguration; buildSettings = {
Expand All @@ -115,20 +118,22 @@
HEADER_SEARCH_PATHS = ../ZillaLib/Include;
OTHER_CFLAGS = ( "-DNDEBUG", "-fvisibility=hidden", "-ffunction-sections", "-fdata-sections" );
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_CXX_LIBRARY = "libc++";
GCC_PREPROCESSOR_DEFINITIONS = $CmdLinePreprocessorDefinitions;
GCC_ENABLE_CPP_EXCEPTIONS = NO;
GCC_ENABLE_CPP_RTTI = NO;
DEAD_CODE_STRIPPING = YES;
DEPLOYMENT_POSTPROCESSING = YES;
STRIP_INSTALLED_PRODUCT = NO;
MACOSX_DEPLOYMENT_TARGET = 10.5;
MACOSX_DEPLOYMENT_TARGET = 10.7;
SDKROOT = macosx;
OBJROOT = "ZillaLibSamples-OSX.xcodeproj/Release";
SYMROOT = "ZillaLibSamples-OSX.xcodeproj/Release";
BUILD_DIR = "ZillaLibSamples-OSX.xcodeproj/Release";
CONFIGURATION_BUILD_DIR = "ZillaLibSamples-OSX.xcodeproj/Release";
CONFIGURATION_TEMP_DIR = "ZillaLibSamples-OSX.xcodeproj/Release";
SHARED_PRECOMPS_DIR = "ZillaLibSamples-OSX.xcodeproj/Release";
ALWAYS_SEARCH_USER_PATHS = NO;
}; name = Release; };

E01000 = { isa = XCConfigurationList; buildConfigurations = (D01001,D01002); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; };
Expand All @@ -148,7 +153,7 @@

F02000 = {
isa = PBXProject;
attributes = { LastUpgradeCheck = 0700; };
attributes = { LastUpgradeCheck = 1010; };
buildConfigurationList = E02000;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
Expand Down
2 changes: 1 addition & 1 deletion ZillaLibSamples-iOS.xcodeproj/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<key>CFBundleVersion</key><string>1.0.0</string>
<key>CFBundleShortVersionString</key><string>1.0.0</string>
<key>CFBundleDisplayName</key><string>${PRODUCT_NAME}</string>
<key>CFBundleIdentifier</key><string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
<key>CFBundleIdentifier</key><string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key><string>6.0</string>
<key>CFBundlePackageType</key><string>APPL</string>
<key>CFBundleDevelopmentRegion</key><string>en</string>
Expand Down
17 changes: 8 additions & 9 deletions ZillaLibSamples-iOS.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@
C00002 = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = (202001); runOnlyForDeploymentPostprocessing = 0; };
C00003 = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = (502001,502002,502003,502004,502005,502006,502007,502008,502009,502010,502011,600003); runOnlyForDeploymentPostprocessing = 0; };

D01001 = { isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; PROVISIONING_PROFILE = ""; }; name = Debug; };
D01002 = { isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_IDENTITY = "iPhone Distribution"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; PROVISIONING_PROFILE = ""; }; name = Release; };
D01001 = { isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; PROVISIONING_PROFILE = ""; PRODUCT_BUNDLE_IDENTIFIER = "${PRODUCT_BUNDLE_IDENTIFIER}"; CLANG_ENABLE_OBJC_WEAK = YES; }; name = Debug; };
D01002 = { isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_IDENTITY = "iPhone Distribution"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; PROVISIONING_PROFILE = ""; PRODUCT_BUNDLE_IDENTIFIER = "${PRODUCT_BUNDLE_IDENTIFIER}"; CLANG_ENABLE_OBJC_WEAK = YES; }; name = Release; };

D02001 = { isa = XCBuildConfiguration; buildSettings = {
PRODUCT_NAME = ZillaLibSamples;
Expand All @@ -103,9 +103,7 @@
ONLY_ACTIVE_ARCH = YES;
STRIP_INSTALLED_PRODUCT = NO;
CODE_SIGN_IDENTITY = "iPhone Developer";
ARCHS = armv7;
VALID_ARCHS = "armv7 i386";
IPHONEOS_DEPLOYMENT_TARGET = 4.3;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
TARGETED_DEVICE_FAMILY = "1,2";
IPHONE_OPTIMIZE_OPTIONS = "-skip-PNGs";
ENABLE_BITCODE = NO;
Expand All @@ -116,6 +114,8 @@
CONFIGURATION_BUILD_DIR = "ZillaLibSamples-iOS.xcodeproj/Debug";
CONFIGURATION_TEMP_DIR = "ZillaLibSamples-iOS.xcodeproj/Debug";
SHARED_PRECOMPS_DIR = "ZillaLibSamples-iOS.xcodeproj/Debug";
ALWAYS_SEARCH_USER_PATHS = NO;
ENABLE_TESTABILITY = YES;
}; name = Debug; };

D02002 = { isa = XCBuildConfiguration; buildSettings = {
Expand All @@ -131,9 +131,7 @@
DEAD_CODE_STRIPPING = YES;
DEPLOYMENT_POSTPROCESSING = YES;
CODE_SIGN_IDENTITY = "iPhone Distribution";
ARCHS = armv7;
VALID_ARCHS = "armv7 i386";
IPHONEOS_DEPLOYMENT_TARGET = 4.3;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
TARGETED_DEVICE_FAMILY = "1,2";
IPHONE_OPTIMIZE_OPTIONS = "-skip-PNGs";
ENABLE_BITCODE = NO;
Expand All @@ -145,6 +143,7 @@
CONFIGURATION_BUILD_DIR = "ZillaLibSamples-iOS.xcodeproj/Release";
CONFIGURATION_TEMP_DIR = "ZillaLibSamples-iOS.xcodeproj/Release";
SHARED_PRECOMPS_DIR = "ZillaLibSamples-iOS.xcodeproj/Release";
ALWAYS_SEARCH_USER_PATHS = NO;
}; name = Release; };

E01000 = { isa = XCConfigurationList; buildConfigurations = (D01001,D01002); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; };
Expand All @@ -164,7 +163,7 @@

F02000 = {
isa = PBXProject;
attributes = { LastUpgradeCheck = 0700; };
attributes = { LastUpgradeCheck = 1010; };
buildConfigurationList = E02000;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
Expand Down

0 comments on commit 4b84f81

Please sign in to comment.