aboutsummaryrefslogtreecommitdiff
path: root/XcodeConfig
diff options
context:
space:
mode:
Diffstat (limited to 'XcodeConfig')
-rw-r--r--XcodeConfig/subconfig/Debug.xcconfig6
-rw-r--r--XcodeConfig/subconfig/General.xcconfig6
-rw-r--r--XcodeConfig/subconfig/iPhone20.xcconfig5
-rw-r--r--XcodeConfig/subconfig/iPhone21.xcconfig5
4 files changed, 17 insertions, 5 deletions
diff --git a/XcodeConfig/subconfig/Debug.xcconfig b/XcodeConfig/subconfig/Debug.xcconfig
index d8fbd1c..7d54d61 100644
--- a/XcodeConfig/subconfig/Debug.xcconfig
+++ b/XcodeConfig/subconfig/Debug.xcconfig
@@ -40,4 +40,8 @@ GTM_CONFIGURATION_GCC_PREPROCESSOR_DEFINITIONS = _GLIBCXX_DEBUG_PEDANTIC _GLIBCX
// Turns on stack protection on debug builds for Leopard and above
GTM_CONFIGURATION_OTHER_CFLAGS = -fstack-protector -fstack-protector-all
// Stack protection doesn't exist on Tiger
-GTM_CONFIGURATION_OTHER_CFLAGS[sdk=macosx10.4*] =
+GTM_CONFIGURATION_OTHER_CFLAGS[sdk=macosx10.4*] =
+
+// And is really broken on the iPhone Device. Works on simulator though.
+// rdar://639430 Xcode generates bad Arm code if -fstack-protector -fstack-protector-all
+GTM_CONFIGURATION_OTHER_CFLAGS[sdk=iphoneos*] =
diff --git a/XcodeConfig/subconfig/General.xcconfig b/XcodeConfig/subconfig/General.xcconfig
index 2aea15f..dc3e64f 100644
--- a/XcodeConfig/subconfig/General.xcconfig
+++ b/XcodeConfig/subconfig/General.xcconfig
@@ -46,6 +46,12 @@ ARCHS[sdk=iphonesimulator*] = i386
// Build only the active architecture on iphone device targets
ONLY_ACTIVE_ARCH[sdk=iphoneos*] = YES
+// iPhone currently deploys on 10.5 only
+MACOSX_DEPLOYMENT_TARGET[sdk=iphone*] = 10.5
+
+// We want our pngs compressed when they are copied
+COMPRESS_PNG_FILES = YES
+
// Zerolink prevents link warnings so turn it off
ZERO_LINK = NO
diff --git a/XcodeConfig/subconfig/iPhone20.xcconfig b/XcodeConfig/subconfig/iPhone20.xcconfig
index 2509ba8..0f92c95 100644
--- a/XcodeConfig/subconfig/iPhone20.xcconfig
+++ b/XcodeConfig/subconfig/iPhone20.xcconfig
@@ -17,7 +17,8 @@
// License for the specific language governing permissions and limitations under
// the License.
-// Default SDK and minimum OS version is the iphone SDK.
+// Set default SDK.
SDKROOT = iphoneos2.0
+
+// iPhone currently deploys on 10.5 only
MACOSX_DEPLOYMENT_TARGET = 10.5
-GCC_VERSION = 4.0
diff --git a/XcodeConfig/subconfig/iPhone21.xcconfig b/XcodeConfig/subconfig/iPhone21.xcconfig
index e543ce5..61c59ed 100644
--- a/XcodeConfig/subconfig/iPhone21.xcconfig
+++ b/XcodeConfig/subconfig/iPhone21.xcconfig
@@ -17,7 +17,8 @@
// License for the specific language governing permissions and limitations under
// the License.
-// Default SDK and minimum OS version is the iphone SDK.
+// Set default SDK.
SDKROOT = iphoneos2.1
+
+// iPhone currently deploys on 10.5 only
MACOSX_DEPLOYMENT_TARGET = 10.5
-GCC_VERSION = 4.0