Commit 527a8eb058f829663dd27b0ba3128db0a4214a9e
2017-12-12T12:14:55
Renamed Xcode build targets so it's easier to copy files out of build directories on the command line Also enabled bitcode, which is needed for App Store builds
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162
diff --git a/Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj b/Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj
index 6662d3b..c32bf34 100755
--- a/Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj
+++ b/Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj
@@ -18,26 +18,26 @@
name = PrepareXcodeProjectTemplate;
productName = PrepareXcodeProjectTemplate;
};
- C143576D1F4C4DAA000B792B /* All (iOS) */ = {
+ C143576D1F4C4DAA000B792B /* All-iOS */ = {
isa = PBXAggregateTarget;
- buildConfigurationList = C143576E1F4C4DAB000B792B /* Build configuration list for PBXAggregateTarget "All (iOS)" */;
+ buildConfigurationList = C143576E1F4C4DAB000B792B /* Build configuration list for PBXAggregateTarget "All-iOS" */;
buildPhases = (
C14357711F4C4DB2000B792B /* ShellScript */,
);
dependencies = (
);
- name = "All (iOS)";
+ name = "All-iOS";
productName = "All (iOS)";
};
- C14357721F4C4F2A000B792B /* All (tvOS) */ = {
+ C14357721F4C4F2A000B792B /* All-tvOS */ = {
isa = PBXAggregateTarget;
- buildConfigurationList = C14357741F4C4F2A000B792B /* Build configuration list for PBXAggregateTarget "All (tvOS)" */;
+ buildConfigurationList = C14357741F4C4F2A000B792B /* Build configuration list for PBXAggregateTarget "All-tvOS" */;
buildPhases = (
C14357731F4C4F2A000B792B /* ShellScript */,
);
dependencies = (
);
- name = "All (tvOS)";
+ name = "All-tvOS";
productName = "All (iOS)";
};
/* End PBXAggregateTarget section */
@@ -1297,9 +1297,9 @@
/* End PBXHeadersBuildPhase section */
/* Begin PBXNativeTarget section */
- FAB598131BB5C1B100BE72C5 /* libSDL (tvOS) */ = {
+ FAB598131BB5C1B100BE72C5 /* libSDL-tvOS */ = {
isa = PBXNativeTarget;
- buildConfigurationList = FAB5981A1BB5C1B100BE72C5 /* Build configuration list for PBXNativeTarget "libSDL (tvOS)" */;
+ buildConfigurationList = FAB5981A1BB5C1B100BE72C5 /* Build configuration list for PBXNativeTarget "libSDL-tvOS" */;
buildPhases = (
FAB598101BB5C1B100BE72C5 /* Sources */,
);
@@ -1307,14 +1307,14 @@
);
dependencies = (
);
- name = "libSDL (tvOS)";
+ name = "libSDL-tvOS";
productName = "libSDL-tv";
productReference = FAB598141BB5C1B100BE72C5 /* libSDL2.a */;
productType = "com.apple.product-type.library.static";
};
- FD6526620DE8FCCB002AD96B /* libSDL (iOS) */ = {
+ FD6526620DE8FCCB002AD96B /* libSDL-iOS */ = {
isa = PBXNativeTarget;
- buildConfigurationList = FD6526990DE8FD14002AD96B /* Build configuration list for PBXNativeTarget "libSDL (iOS)" */;
+ buildConfigurationList = FD6526990DE8FD14002AD96B /* Build configuration list for PBXNativeTarget "libSDL-iOS" */;
buildPhases = (
FD65265F0DE8FCCB002AD96B /* Headers */,
FD6526600DE8FCCB002AD96B /* Sources */,
@@ -1323,7 +1323,7 @@
);
dependencies = (
);
- name = "libSDL (iOS)";
+ name = "libSDL-iOS";
productName = iPhoneSDLStaticLib;
productReference = FD6526630DE8FCCB002AD96B /* libSDL2.a */;
productType = "com.apple.product-type.library.static";
@@ -1362,11 +1362,11 @@
projectDirPath = "";
projectRoot = ../..;
targets = (
- FD6526620DE8FCCB002AD96B /* libSDL (iOS) */,
- FAB598131BB5C1B100BE72C5 /* libSDL (tvOS) */,
+ FD6526620DE8FCCB002AD96B /* libSDL-iOS */,
+ FAB598131BB5C1B100BE72C5 /* libSDL-tvOS */,
00B4F48B12F6A69C0084EC00 /* PrepareXcodeProjectTemplate */,
- C143576D1F4C4DAA000B792B /* All (iOS) */,
- C14357721F4C4F2A000B792B /* All (tvOS) */,
+ C143576D1F4C4DAA000B792B /* All-iOS */,
+ C14357721F4C4F2A000B792B /* All-tvOS */,
);
};
/* End PBXProject section */
@@ -1399,7 +1399,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "xcodebuild -target \"libSDL (iOS)\" ONLY_ACTIVE_ARCH=NO -configuration Release -sdk iphoneos BUILD_DIR=\"${BUILD_DIR}\" BUILD_ROOT=\"${BUILD_ROOT}\" clean build\nxcodebuild -target \"libSDL (iOS)\" ONLY_ACTIVE_ARCH=NO -configuration Debug -sdk iphoneos BUILD_DIR=\"${BUILD_DIR}\" BUILD_ROOT=\"${BUILD_ROOT}\" clean build\nxcodebuild -target \"libSDL (iOS)\" -configuration Release -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO BUILD_DIR=\"${BUILD_DIR}\" BUILD_ROOT=\"${BUILD_ROOT}\" clean build\nxcodebuild -target \"libSDL (iOS)\" -configuration Debug -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO BUILD_DIR=\"${BUILD_DIR}\" BUILD_ROOT=\"${BUILD_ROOT}\" clean build\n\n# make output folders\nmkdir -p ${TARGET_BUILD_DIR}/../ios/release\nmkdir -p ${TARGET_BUILD_DIR}/../ios/debug\n\n# combine lib files for various platforms into one\nlipo -create \"${TARGET_BUILD_DIR}/../Release-iphoneos/libSDL2.a\" \"${TARGET_BUILD_DIR}/../Release-iphonesimulator/libSDL2.a\" -output \"${TARGET_BUILD_DIR}/../ios/release/libSDL2.a\"\nlipo -create \"${TARGET_BUILD_DIR}/../Debug-iphoneos/libSDL2.a\" \"${TARGET_BUILD_DIR}/../Debug-iphonesimulator/libSDL2.a\" -output \"${TARGET_BUILD_DIR}/../ios/debug/libSDL2.a\"\n";
+ shellScript = "xcodebuild -target \"libSDL-iOS\" ONLY_ACTIVE_ARCH=NO -configuration Release -sdk iphoneos BUILD_DIR=\"${BUILD_DIR}\" BUILD_ROOT=\"${BUILD_ROOT}\" clean build\nxcodebuild -target \"libSDL-iOS\" ONLY_ACTIVE_ARCH=NO -configuration Debug -sdk iphoneos BUILD_DIR=\"${BUILD_DIR}\" BUILD_ROOT=\"${BUILD_ROOT}\" clean build\nxcodebuild -target \"libSDL-iOS\" -configuration Release -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO BUILD_DIR=\"${BUILD_DIR}\" BUILD_ROOT=\"${BUILD_ROOT}\" clean build\nxcodebuild -target \"libSDL-iOS\" -configuration Debug -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO BUILD_DIR=\"${BUILD_DIR}\" BUILD_ROOT=\"${BUILD_ROOT}\" clean build\n\n# make output folders\nmkdir -p ${TARGET_BUILD_DIR}/../ios/release\nmkdir -p ${TARGET_BUILD_DIR}/../ios/debug\n\n# combine lib files for various platforms into one\nlipo -create \"${TARGET_BUILD_DIR}/../Release-iphoneos/libSDL2.a\" \"${TARGET_BUILD_DIR}/../Release-iphonesimulator/libSDL2.a\" -output \"${TARGET_BUILD_DIR}/../ios/release/libSDL2.a\"\nlipo -create \"${TARGET_BUILD_DIR}/../Debug-iphoneos/libSDL2.a\" \"${TARGET_BUILD_DIR}/../Debug-iphonesimulator/libSDL2.a\" -output \"${TARGET_BUILD_DIR}/../ios/debug/libSDL2.a\"\n";
};
C14357731F4C4F2A000B792B /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
@@ -1414,7 +1414,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "xcodebuild -target \"libSDL (tvOS)\" ONLY_ACTIVE_ARCH=NO -configuration Release -sdk appletvos BUILD_DIR=\"${BUILD_DIR}\" BUILD_ROOT=\"${BUILD_ROOT}\" clean build\nxcodebuild -target \"libSDL (tvOS)\" ONLY_ACTIVE_ARCH=NO -configuration Debug -sdk appletvos BUILD_DIR=\"${BUILD_DIR}\" BUILD_ROOT=\"${BUILD_ROOT}\" clean build\nxcodebuild -target \"libSDL (tvOS)\" -configuration Release -sdk appletvsimulator ONLY_ACTIVE_ARCH=NO BUILD_DIR=\"${BUILD_DIR}\" BUILD_ROOT=\"${BUILD_ROOT}\" clean build\nxcodebuild -target \"libSDL (tvOS)\" -configuration Debug -sdk appletvsimulator ONLY_ACTIVE_ARCH=NO BUILD_DIR=\"${BUILD_DIR}\" BUILD_ROOT=\"${BUILD_ROOT}\" clean build\n\n# make output folders\nmkdir -p ${TARGET_BUILD_DIR}/../tvos/release\nmkdir -p ${TARGET_BUILD_DIR}/../tvos/debug\n\n# combine lib files for various platforms into one\nlipo -create \"${TARGET_BUILD_DIR}/../Release-appletvos/libSDL2.a\" \"${TARGET_BUILD_DIR}/../Release-appletvsimulator/libSDL2.a\" -output \"${TARGET_BUILD_DIR}/../tvos/release/libSDL2.a\"\nlipo -create \"${TARGET_BUILD_DIR}/../Debug-appletvos/libSDL2.a\" \"${TARGET_BUILD_DIR}/../Debug-appletvsimulator/libSDL2.a\" -output \"${TARGET_BUILD_DIR}/../tvos/debug/libSDL2.a\"\n";
+ shellScript = "xcodebuild -target \"libSDL-tvOS\" ONLY_ACTIVE_ARCH=NO -configuration Release -sdk appletvos BUILD_DIR=\"${BUILD_DIR}\" BUILD_ROOT=\"${BUILD_ROOT}\" clean build\nxcodebuild -target \"libSDL-tvOS\" ONLY_ACTIVE_ARCH=NO -configuration Debug -sdk appletvos BUILD_DIR=\"${BUILD_DIR}\" BUILD_ROOT=\"${BUILD_ROOT}\" clean build\nxcodebuild -target \"libSDL-tvOS\" -configuration Release -sdk appletvsimulator ONLY_ACTIVE_ARCH=NO BUILD_DIR=\"${BUILD_DIR}\" BUILD_ROOT=\"${BUILD_ROOT}\" clean build\nxcodebuild -target \"libSDL-tvOS\" -configuration Debug -sdk appletvsimulator ONLY_ACTIVE_ARCH=NO BUILD_DIR=\"${BUILD_DIR}\" BUILD_ROOT=\"${BUILD_ROOT}\" clean build\n\n# make output folders\nmkdir -p ${TARGET_BUILD_DIR}/../tvos/release\nmkdir -p ${TARGET_BUILD_DIR}/../tvos/debug\n\n# combine lib files for various platforms into one\nlipo -create \"${TARGET_BUILD_DIR}/../Release-appletvos/libSDL2.a\" \"${TARGET_BUILD_DIR}/../Release-appletvsimulator/libSDL2.a\" -output \"${TARGET_BUILD_DIR}/../tvos/release/libSDL2.a\"\nlipo -create \"${TARGET_BUILD_DIR}/../Debug-appletvos/libSDL2.a\" \"${TARGET_BUILD_DIR}/../Debug-appletvsimulator/libSDL2.a\" -output \"${TARGET_BUILD_DIR}/../tvos/debug/libSDL2.a\"\n";
};
/* End PBXShellScriptBuildPhase section */
@@ -1859,7 +1859,6 @@
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES;
COPY_PHASE_STRIP = NO;
- ENABLE_BITCODE = NO;
GCC_WARN_MULTIPLE_DEFINITION_TYPES_FOR_SELECTOR = YES;
GCC_WARN_STRICT_SELECTOR_MATCH = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -1877,7 +1876,6 @@
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES;
COPY_PHASE_STRIP = YES;
- ENABLE_BITCODE = NO;
GCC_WARN_MULTIPLE_DEFINITION_TYPES_FOR_SELECTOR = YES;
GCC_WARN_STRICT_SELECTOR_MATCH = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -1909,7 +1907,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
- C143576E1F4C4DAB000B792B /* Build configuration list for PBXAggregateTarget "All (iOS)" */ = {
+ C143576E1F4C4DAB000B792B /* Build configuration list for PBXAggregateTarget "All-iOS" */ = {
isa = XCConfigurationList;
buildConfigurations = (
C143576F1F4C4DAB000B792B /* Debug */,
@@ -1918,7 +1916,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
- C14357741F4C4F2A000B792B /* Build configuration list for PBXAggregateTarget "All (tvOS)" */ = {
+ C14357741F4C4F2A000B792B /* Build configuration list for PBXAggregateTarget "All-tvOS" */ = {
isa = XCConfigurationList;
buildConfigurations = (
C14357751F4C4F2A000B792B /* Debug */,
@@ -1927,7 +1925,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
- FAB5981A1BB5C1B100BE72C5 /* Build configuration list for PBXNativeTarget "libSDL (tvOS)" */ = {
+ FAB5981A1BB5C1B100BE72C5 /* Build configuration list for PBXNativeTarget "libSDL-tvOS" */ = {
isa = XCConfigurationList;
buildConfigurations = (
FAB5981B1BB5C1B100BE72C5 /* Debug */,
@@ -1936,7 +1934,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
- FD6526990DE8FD14002AD96B /* Build configuration list for PBXNativeTarget "libSDL (iOS)" */ = {
+ FD6526990DE8FD14002AD96B /* Build configuration list for PBXNativeTarget "libSDL-iOS" */ = {
isa = XCConfigurationList;
buildConfigurations = (
FD6526640DE8FCCB002AD96B /* Debug */,