diff options
Diffstat (limited to 'XcodeConfig')
-rw-r--r-- | XcodeConfig/subconfig/GTMMerge.xcconfig | 2 | ||||
-rw-r--r-- | XcodeConfig/subconfig/SnowLeopardOrLater.xcconfig | 6 | ||||
-rw-r--r-- | XcodeConfig/subconfig/iPhone20.xcconfig | 2 | ||||
-rw-r--r-- | XcodeConfig/subconfig/iPhone21.xcconfig | 2 | ||||
-rw-r--r-- | XcodeConfig/subconfig/iPhone22.xcconfig | 2 | ||||
-rw-r--r-- | XcodeConfig/subconfig/iPhone221.xcconfig | 2 | ||||
-rw-r--r-- | XcodeConfig/subconfig/iPhone30.xcconfig | 3 | ||||
-rw-r--r-- | XcodeConfig/subconfig/iPhone31.xcconfig | 2 | ||||
-rw-r--r-- | XcodeConfig/subconfig/iPhone312.xcconfig | 2 | ||||
-rw-r--r-- | XcodeConfig/subconfig/iPhone313.xcconfig | 3 | ||||
-rw-r--r-- | XcodeConfig/subconfig/iPhone32.xcconfig | 3 |
11 files changed, 6 insertions, 23 deletions
diff --git a/XcodeConfig/subconfig/GTMMerge.xcconfig b/XcodeConfig/subconfig/GTMMerge.xcconfig index 5ab141e..f7a3aa7 100644 --- a/XcodeConfig/subconfig/GTMMerge.xcconfig +++ b/XcodeConfig/subconfig/GTMMerge.xcconfig @@ -33,7 +33,7 @@ // for the host app to fill in. For example if you wanted to have stack // protection turned on for both debug and release builds you could set // GTM_HOST_OTHER_CFLAGS = -fstack-protector -fstack-protector-all -// in your own settings files, and then include the QSB ones. +// in your own settings files, and then include the GTM ones. WARNING_CFLAGS = $(inherited) $(GTM_GENERAL_WARNING_CFLAGS) $(GTM_PLATFORM_WARNING_CFLAGS) $(GTM_CONFIGURATION_WARNING_CFLAGS) $(GTM_HOST_WARNING_CFLAGS) OTHER_CFLAGS = $(inherited) $(GTM_GENERAL_OTHER_CFLAGS) $(GTM_PLATFORM_OTHER_CFLAGS) $(GTM_CONFIGURATION_OTHER_CFLAGS) $(GTM_HOST_OTHER_CFLAGS) diff --git a/XcodeConfig/subconfig/SnowLeopardOrLater.xcconfig b/XcodeConfig/subconfig/SnowLeopardOrLater.xcconfig index 0a7475e..666dbdc 100644 --- a/XcodeConfig/subconfig/SnowLeopardOrLater.xcconfig +++ b/XcodeConfig/subconfig/SnowLeopardOrLater.xcconfig @@ -23,4 +23,8 @@ // Default SDK and minimum OS version is 10.6 SDKROOT = ${DEVELOPER_SDK_DIR}/MacOSX10.6.sdk MACOSX_DEPLOYMENT_TARGET = 10.6 -GCC_VERSION = 4.0 +GCC_VERSION = 4.2 + +// Works around issues with the missing format attribute with gcc 4.2 +// on Snow Leopard. +GTM_PLATFORM_WARNING_CFLAGS=-Wno-missing-format-attribute diff --git a/XcodeConfig/subconfig/iPhone20.xcconfig b/XcodeConfig/subconfig/iPhone20.xcconfig index 0f92c95..0b742b0 100644 --- a/XcodeConfig/subconfig/iPhone20.xcconfig +++ b/XcodeConfig/subconfig/iPhone20.xcconfig @@ -20,5 +20,3 @@ // Set default SDK. SDKROOT = iphoneos2.0 -// iPhone currently deploys on 10.5 only -MACOSX_DEPLOYMENT_TARGET = 10.5 diff --git a/XcodeConfig/subconfig/iPhone21.xcconfig b/XcodeConfig/subconfig/iPhone21.xcconfig index 61c59ed..44619d3 100644 --- a/XcodeConfig/subconfig/iPhone21.xcconfig +++ b/XcodeConfig/subconfig/iPhone21.xcconfig @@ -20,5 +20,3 @@ // Set default SDK. SDKROOT = iphoneos2.1 -// iPhone currently deploys on 10.5 only -MACOSX_DEPLOYMENT_TARGET = 10.5 diff --git a/XcodeConfig/subconfig/iPhone22.xcconfig b/XcodeConfig/subconfig/iPhone22.xcconfig index 0b63278..ee8b707 100644 --- a/XcodeConfig/subconfig/iPhone22.xcconfig +++ b/XcodeConfig/subconfig/iPhone22.xcconfig @@ -20,5 +20,3 @@ // Set default SDK. SDKROOT = iphoneos2.2 -// iPhone currently deploys on 10.5 only -MACOSX_DEPLOYMENT_TARGET = 10.5 diff --git a/XcodeConfig/subconfig/iPhone221.xcconfig b/XcodeConfig/subconfig/iPhone221.xcconfig index 1ce6e24..5f6f53b 100644 --- a/XcodeConfig/subconfig/iPhone221.xcconfig +++ b/XcodeConfig/subconfig/iPhone221.xcconfig @@ -20,5 +20,3 @@ // Set default SDK. SDKROOT = iphoneos2.2.1 -// iPhone currently deploys on 10.5 only -MACOSX_DEPLOYMENT_TARGET = 10.5 diff --git a/XcodeConfig/subconfig/iPhone30.xcconfig b/XcodeConfig/subconfig/iPhone30.xcconfig index df60b05..c50daca 100644 --- a/XcodeConfig/subconfig/iPhone30.xcconfig +++ b/XcodeConfig/subconfig/iPhone30.xcconfig @@ -19,6 +19,3 @@ // Set default SDK. SDKROOT = iphoneos3.0 - -// iPhone currently deploys on 10.5 only -MACOSX_DEPLOYMENT_TARGET = 10.5 diff --git a/XcodeConfig/subconfig/iPhone31.xcconfig b/XcodeConfig/subconfig/iPhone31.xcconfig index af7cee7..6b3781b 100644 --- a/XcodeConfig/subconfig/iPhone31.xcconfig +++ b/XcodeConfig/subconfig/iPhone31.xcconfig @@ -20,5 +20,3 @@ // Set default SDK. SDKROOT = iphoneos3.1 -// iPhone currently deploys on 10.5 only -MACOSX_DEPLOYMENT_TARGET = 10.5 diff --git a/XcodeConfig/subconfig/iPhone312.xcconfig b/XcodeConfig/subconfig/iPhone312.xcconfig index 5480e0a..ff778f3 100644 --- a/XcodeConfig/subconfig/iPhone312.xcconfig +++ b/XcodeConfig/subconfig/iPhone312.xcconfig @@ -20,5 +20,3 @@ // Set default SDK. SDKROOT = iphoneos3.1.2 -// iPhone currently deploys on 10.5 only -MACOSX_DEPLOYMENT_TARGET = 10.5 diff --git a/XcodeConfig/subconfig/iPhone313.xcconfig b/XcodeConfig/subconfig/iPhone313.xcconfig index 8cac36a..5b34dce 100644 --- a/XcodeConfig/subconfig/iPhone313.xcconfig +++ b/XcodeConfig/subconfig/iPhone313.xcconfig @@ -19,6 +19,3 @@ // Set default SDK. SDKROOT = iphoneos3.1.3 - -// iPhone currently deploys on 10.5 only -MACOSX_DEPLOYMENT_TARGET = 10.5 diff --git a/XcodeConfig/subconfig/iPhone32.xcconfig b/XcodeConfig/subconfig/iPhone32.xcconfig index bee82ef..d50c2d0 100644 --- a/XcodeConfig/subconfig/iPhone32.xcconfig +++ b/XcodeConfig/subconfig/iPhone32.xcconfig @@ -19,6 +19,3 @@ // Set default SDK. SDKROOT = iphoneos3.2 - -// iPhone currently deploys on 10.5 only -MACOSX_DEPLOYMENT_TARGET = 10.5 |