1 files changed, 14 insertions, 2 deletions

@@ -1419,7 +1419,7 @@
                 29B97313FDCFA39411CA2CEA /* Project object */ = {
                         isa = PBXProject;
                         attributes = {
-                                LastUpgradeCheck = 0420;
+                                LastUpgradeCheck = 0450;
                         };
                         buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Cartographic" */;
                         compatibilityVersion = "Xcode 3.2";
@@ -1515,7 +1515,7 @@
                         );
                         runOnlyForDeploymentPostprocessing = 0;
                         shellPath = /bin/sh;
-                        shellScript = "hg=\"/opt/local/bin/hg\"\ntouch Resources/Info.plist\nversion=`$hg tip --template {rev}`\ndirty=`$hg status`\nif [ -n \"${dirty}\" ]; then\n    rev=`cat Versioning.h | sed -e \"s/.define BUILD_NUMBER ${version}\\.\\([0-9]*\\)/\\1/g\"`\n    if [ -z \"${rev}\" ]; then\n        rev=\"1\"\n    else\n        rev=`expr ${rev} + 1`\n    fi\n    version=\"${version}.${rev}\"\nfi\necho \"#define BUILD_NUMBER ${version}\" > Versioning.h";
+                        shellScript = "git=\"/usr/bin/git\"\ntouch Resources/Info.plist\nversion=`$git describe`\ndirty=`$git status -s`\nif [ -n \"${dirty}\" ]; then\n    rev=`cat Versioning.h | sed -e \"s/.define BUILD_NUMBER ${version}\\.\\([0-9]*\\)/\\1/g\"`\n    if [ -z \"${rev}\" ]; then\n        rev=\"1\"\n    else\n        rev=`expr ${rev} + 1`\n    fi\n    version=\"${version}.${rev}\"\nfi\necho \"#define BUILD_NUMBER ${version}\" > Versioning.h";
                 };
 /* End PBXShellScriptBuildPhase section */
 
@@ -1684,6 +1684,7 @@
                                 GCC_OPTIMIZATION_LEVEL = 0;
                                 GCC_PRECOMPILE_PREFIX_HEADER = YES;
                                 GCC_PREFIX_HEADER = Cart_Collect_Prefix.pch;
+                                GCC_THUMB_SUPPORT = NO;
                                 GCC_TREAT_WARNINGS_AS_ERRORS = NO;
                                 GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
                                 HEADER_SEARCH_PATHS = libs;
@@ -1718,6 +1719,7 @@
                                 GCC_C_LANGUAGE_STANDARD = c99;
                                 GCC_PRECOMPILE_PREFIX_HEADER = YES;
                                 GCC_PREFIX_HEADER = Cart_Collect_Prefix.pch;
+                                GCC_THUMB_SUPPORT = NO;
                                 GCC_TREAT_WARNINGS_AS_ERRORS = NO;
                                 GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
                                 HEADER_SEARCH_PATHS = libs;
@@ -1748,6 +1750,7 @@
                                 COPY_PHASE_STRIP = NO;
                                 GCC_DYNAMIC_NO_PIC = NO;
                                 GCC_OPTIMIZATION_LEVEL = 0;
+                                GCC_THUMB_SUPPORT = NO;
                                 GCC_TREAT_WARNINGS_AS_ERRORS = NO;
                                 GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
                                 HEADER_SEARCH_PATHS = (
@@ -1767,6 +1770,7 @@
                                 COPY_PHASE_STRIP = YES;
                                 DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
                                 GCC_PREPROCESSOR_DEFINITIONS = "";
+                                GCC_THUMB_SUPPORT = NO;
                                 GCC_TREAT_WARNINGS_AS_ERRORS = NO;
                                 GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
                                 HEADER_SEARCH_PATHS = (
@@ -1794,6 +1798,7 @@
                                         NS_BLOCK_ASSERTIONS,
                                         NDEBUG,
                                 );
+                                GCC_THUMB_SUPPORT = NO;
                                 "GCC_THUMB_SUPPORT[arch=armv6]" = NO;
                                 "GCC_THUMB_SUPPORT[arch=armv7]" = YES;
                                 GCC_UNROLL_LOOPS = YES;
@@ -1823,6 +1828,7 @@
                                         NS_BLOCK_ASSERTIONS,
                                         NDEBUG,
                                 );
+                                GCC_THUMB_SUPPORT = NO;
                                 GCC_TREAT_WARNINGS_AS_ERRORS = NO;
                                 GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
                                 HEADER_SEARCH_PATHS = libs;
@@ -1853,6 +1859,7 @@
                                 COPY_PHASE_STRIP = YES;
                                 DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
                                 GCC_PREPROCESSOR_DEFINITIONS = "";
+                                GCC_THUMB_SUPPORT = NO;
                                 GCC_TREAT_WARNINGS_AS_ERRORS = NO;
                                 GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
                                 HEADER_SEARCH_PATHS = (
@@ -1868,6 +1875,7 @@
                 6C19F16F1401944500F9CCD3 /* Ad-Hoc */ = {
                         isa = XCBuildConfiguration;
                         buildSettings = {
+                                GCC_THUMB_SUPPORT = NO;
                                 GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
                                 PRODUCT_NAME = "$(TARGET_NAME)";
                         };
@@ -1876,6 +1884,7 @@
                 6C263DDD13F6F4A000116746 /* Debug */ = {
                         isa = XCBuildConfiguration;
                         buildSettings = {
+                                GCC_THUMB_SUPPORT = NO;
                                 GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
                                 PRODUCT_NAME = "$(TARGET_NAME)";
                         };
@@ -1884,6 +1893,7 @@
                 6C263DDE13F6F4A000116746 /* Release */ = {
                         isa = XCBuildConfiguration;
                         buildSettings = {
+                                GCC_THUMB_SUPPORT = NO;
                                 GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
                                 PRODUCT_NAME = "$(TARGET_NAME)";
                         };
@@ -1905,6 +1915,7 @@
                                         "COCOS2D_DEBUG=1",
                                         "CD_DEBUG=1",
                                 );
+                                GCC_THUMB_SUPPORT = NO;
                                 "GCC_THUMB_SUPPORT[arch=armv6]" = NO;
                                 "GCC_THUMB_SUPPORT[arch=armv7]" = YES;
                                 GCC_VERSION = "";
@@ -1932,6 +1943,7 @@
                                         NS_BLOCK_ASSERTIONS,
                                         NDEBUG,
                                 );
+                                GCC_THUMB_SUPPORT = NO;
                                 "GCC_THUMB_SUPPORT[arch=armv6]" = NO;
                                 "GCC_THUMB_SUPPORT[arch=armv7]" = YES;
                                 GCC_UNROLL_LOOPS = YES;