From a33d862d4b894de0954f91f0fb2b162795c8c121 Mon Sep 17 00:00:00 2001 From: "techdragon.nguyen@gmail.com" Date: Sun, 9 Oct 2011 07:06:32 +0000 Subject: [PATCH] updated XCode project to be on latest SDK fixed a few minor warnings. --- projects/mtg/src/AllAbilities.cpp | 2 +- projects/mtg/src/MTGAbility.cpp | 2 +- projects/mtg/wagic.xcodeproj/project.pbxproj | 46 ++++++++------------ 3 files changed, 21 insertions(+), 29 deletions(-) diff --git a/projects/mtg/src/AllAbilities.cpp b/projects/mtg/src/AllAbilities.cpp index 363095558..0594dfce1 100644 --- a/projects/mtg/src/AllAbilities.cpp +++ b/projects/mtg/src/AllAbilities.cpp @@ -3164,7 +3164,7 @@ int ALoseAbilities::destroy() } //Avoid inifinite loop of removing/putting back abilities - if (ALoseAbilities * la = dynamic_cast (a)) + if (dynamic_cast (a)) { DebugTrace("ALLABILITIES: loseability won't be put in the loseability list"); continue; diff --git a/projects/mtg/src/MTGAbility.cpp b/projects/mtg/src/MTGAbility.cpp index 7a32f3e60..44579432d 100644 --- a/projects/mtg/src/MTGAbility.cpp +++ b/projects/mtg/src/MTGAbility.cpp @@ -2574,7 +2574,7 @@ int AbilityFactory::abilityEfficiency(MTGAbility * a, Player * p, int mode, Targ return BAKA_EFFECT_GOOD; // For now, ACounterTracker is only used for Creatures that "belong" to one of our domains, need to target one of our own lands, so we return a "positive" value - if (ACounterTracker * act = dynamic_cast(a)) + if (dynamic_cast(a)) return BAKA_EFFECT_GOOD; if (AACounter * ac = dynamic_cast(a)) diff --git a/projects/mtg/wagic.xcodeproj/project.pbxproj b/projects/mtg/wagic.xcodeproj/project.pbxproj index 36822de2e..d60547e13 100755 --- a/projects/mtg/wagic.xcodeproj/project.pbxproj +++ b/projects/mtg/wagic.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 45; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ @@ -24,11 +24,11 @@ 12B8123F1404B9E20092E303 /* zstream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 12B812311404B9E10092E303 /* zstream.cpp */; }; 12B8124D1404BD0D0092E303 /* IconButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 12B8124A1404BD0D0092E303 /* IconButton.cpp */; }; 12B8124F1404BD0D0092E303 /* ObjectAnalytics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 12B8124C1404BD0D0092E303 /* ObjectAnalytics.cpp */; }; + 12D095E114417D0500F69056 /* libstdc++.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 12D095E014417D0500F69056 /* libstdc++.dylib */; settings = {ATTRIBUTES = (Required, ); }; }; 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; }; 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; }; 28FD15000DC6FC520079059D /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28FD14FF0DC6FC520079059D /* OpenGLES.framework */; }; 28FD15080DC6FC5B0079059D /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28FD15070DC6FC5B0079059D /* QuartzCore.framework */; }; - CE885AF012861E7600CF4FC8 /* libstdc++.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = CE885AEF12861E7600CF4FC8 /* libstdc++.dylib */; }; CE97CD1E1295AB4300FDFD3B /* SimplePopup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE97CD1D1295AB4300FDFD3B /* SimplePopup.cpp */; }; CE9A478512B514BA00C9F38A /* EAGLView.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9A477612B514BA00C9F38A /* EAGLView.m */; }; CE9A478612B514BA00C9F38A /* EAGLViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9A477812B514BA00C9F38A /* EAGLViewController.m */; }; @@ -219,6 +219,7 @@ 12B8124A1404BD0D0092E303 /* IconButton.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IconButton.cpp; sourceTree = ""; }; 12B8124C1404BD0D0092E303 /* ObjectAnalytics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ObjectAnalytics.cpp; sourceTree = ""; }; 12B812501404BDB50092E303 /* Threading.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Threading.h; sourceTree = ""; }; + 12D095E014417D0500F69056 /* libstdc++.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libstdc++.dylib"; path = "usr/lib/libstdc++.dylib"; sourceTree = SDKROOT; }; 1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 1D6058910D05DD3D006BFB54 /* wagic.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = wagic.app; sourceTree = BUILT_PRODUCTS_DIR; }; 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; @@ -532,11 +533,11 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 12D095E114417D0500F69056 /* libstdc++.dylib in Frameworks */, 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */, 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */, 28FD15000DC6FC520079059D /* OpenGLES.framework in Frameworks */, 28FD15080DC6FC5B0079059D /* QuartzCore.framework in Frameworks */, - CE885AF012861E7600CF4FC8 /* libstdc++.dylib in Frameworks */, CED2152C128DFAFF0050149E /* CoreGraphics.framework in Frameworks */, F2494ADC12A1BD4100D6284A /* libz.dylib in Frameworks */, ); @@ -605,6 +606,7 @@ 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { isa = PBXGroup; children = ( + 12D095E014417D0500F69056 /* libstdc++.dylib */, 125C5CF213B09AA200DF2F2C /* Tools */, CE9E71DB1375A53600759DDC /* Boost */, CE9A477512B514BA00C9F38A /* EAGLView.h */, @@ -1065,8 +1067,11 @@ /* Begin PBXProject section */ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; + attributes = { + LastUpgradeCheck = 0420; + }; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "wagic" */; - compatibilityVersion = "Xcode 3.1"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( @@ -1297,15 +1302,7 @@ ); INFOPLIST_FILE = "wagic-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 4.2; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SDKROOT)/usr/lib/gcc/arm-apple-darwin10/4.2.1\"", - "\"$(SDKROOT)/usr/lib/gcc/arm-apple-darwin9/4.0.1\"", - "\"$(SDKROOT)/usr/lib/gcc/i686-apple-darwin10/4.2.1\"", - "\"$(SDKROOT)/usr/lib/gcc/i686-apple-darwin9/4.0.1\"", - "\"$(SDKROOT)/usr/lib/gcc/powerpc-apple-darwin10/4.2.1\"", - "\"$(SDKROOT)/usr/lib/gcc/powerpc-apple-darwin9/4.0.1\"", - ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; "New Setting" = ""; PRODUCT_NAME = wagic; SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = NO; @@ -1324,15 +1321,7 @@ "GCC_THUMB_SUPPORT[arch=armv6]" = ""; INFOPLIST_FILE = "wagic-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 4.2; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SDKROOT)/usr/lib/gcc/arm-apple-darwin10/4.2.1\"", - "\"$(SDKROOT)/usr/lib/gcc/arm-apple-darwin9/4.0.1\"", - "\"$(SDKROOT)/usr/lib/gcc/i686-apple-darwin10/4.2.1\"", - "\"$(SDKROOT)/usr/lib/gcc/i686-apple-darwin9/4.0.1\"", - "\"$(SDKROOT)/usr/lib/gcc/powerpc-apple-darwin10/4.2.1\"", - "\"$(SDKROOT)/usr/lib/gcc/powerpc-apple-darwin9/4.0.1\"", - ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; PRODUCT_NAME = testproject; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; @@ -1343,6 +1332,7 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)"; + CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DEPLOYMENT_LOCATION = NO; DEPLOYMENT_POSTPROCESSING = NO; @@ -1351,8 +1341,8 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ../../Boost/boost; - PREBINDING = NO; - SDKROOT = iphoneos3.2; + PROVISIONING_PROFILE = ""; + SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -1361,14 +1351,16 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CODE_SIGN_IDENTITY = "iPhone Distribution"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; GCC_C_LANGUAGE_STANDARD = c99; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ../../Boost/boost; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; - PREBINDING = NO; - SDKROOT = iphoneos4.2; + PROVISIONING_PROFILE = ""; + "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; + SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release;