From ea710d3fef4df70a5b7f4bcc1515e26a84a51528 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Wed, 16 Feb 2011 20:19:02 -0800 Subject: [PATCH] Updated deployment target to iPhone/iPad 3.2, and added dependencies on SDL for the demos. --- .../DemosiPhoneOS.xcodeproj/project.pbxproj | 132 +++++++++++++++--- .../SDL/SDLiPhoneOS.xcodeproj/project.pbxproj | 4 +- 2 files changed, 117 insertions(+), 19 deletions(-) diff --git a/Xcode-iPhoneOS/Demos/DemosiPhoneOS.xcodeproj/project.pbxproj b/Xcode-iPhoneOS/Demos/DemosiPhoneOS.xcodeproj/project.pbxproj index f25b71e24..0fb5095ee 100755 --- a/Xcode-iPhoneOS/Demos/DemosiPhoneOS.xcodeproj/project.pbxproj +++ b/Xcode-iPhoneOS/Demos/DemosiPhoneOS.xcodeproj/project.pbxproj @@ -15,12 +15,12 @@ FD15FD6B0E086911003BDF25 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D3623EB0D0F72F000981E51 /* CoreGraphics.framework */; }; FD15FD6C0E086911003BDF25 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDB96ED30DEFC9C700FAF19F /* OpenGLES.framework */; }; FD15FD6D0E086911003BDF25 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDB96EDF0DEFC9DC00FAF19F /* QuartzCore.framework */; }; - FD1B48DD0E313255007AB34E /* libSDLiPhoneOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B489E0E313154007AB34E /* libSDLiPhoneOS.a */; }; - FD1B49980E313261007AB34E /* libSDLiPhoneOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B489E0E313154007AB34E /* libSDLiPhoneOS.a */; }; - FD1B499C0E313269007AB34E /* libSDLiPhoneOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B489E0E313154007AB34E /* libSDLiPhoneOS.a */; }; - FD1B499E0E31326C007AB34E /* libSDLiPhoneOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B489E0E313154007AB34E /* libSDLiPhoneOS.a */; }; - FD1B49A00E313270007AB34E /* libSDLiPhoneOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B489E0E313154007AB34E /* libSDLiPhoneOS.a */; }; - FD1B49A20E313273007AB34E /* libSDLiPhoneOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B489E0E313154007AB34E /* libSDLiPhoneOS.a */; }; + FD1B48DD0E313255007AB34E /* libSDL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B489E0E313154007AB34E /* libSDL.a */; }; + FD1B49980E313261007AB34E /* libSDL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B489E0E313154007AB34E /* libSDL.a */; }; + FD1B499C0E313269007AB34E /* libSDL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B489E0E313154007AB34E /* libSDL.a */; }; + FD1B499E0E31326C007AB34E /* libSDL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B489E0E313154007AB34E /* libSDL.a */; }; + FD1B49A00E313270007AB34E /* libSDL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B489E0E313154007AB34E /* libSDL.a */; }; + FD1B49A20E313273007AB34E /* libSDL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B489E0E313154007AB34E /* libSDL.a */; }; FD5F9CE80E0E0741008E885B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; }; FD5F9CE90E0E0741008E885B /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; }; FD5F9CEA0E0E0741008E885B /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D3623EB0D0F72F000981E51 /* CoreGraphics.framework */; }; @@ -56,7 +56,7 @@ FDB651FA0E43D1F300F688B5 /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = FD925B180E0F276600E92347 /* Icon.png */; }; FDB651FB0E43D1F300F688B5 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = FD787AA00E22A5CC003E8E36 /* Default.png */; }; FDB651FD0E43D1F300F688B5 /* common.c in Sources */ = {isa = PBXBuildFile; fileRef = FD77A0060E26BC0500F39101 /* common.c */; }; - FDB652000E43D1F300F688B5 /* libSDLiPhoneOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B489E0E313154007AB34E /* libSDLiPhoneOS.a */; }; + FDB652000E43D1F300F688B5 /* libSDL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B489E0E313154007AB34E /* libSDL.a */; }; FDB652020E43D1F300F688B5 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; }; FDB652030E43D1F300F688B5 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; }; FDB652040E43D1F300F688B5 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D3623EB0D0F72F000981E51 /* CoreGraphics.framework */; }; @@ -105,6 +105,55 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ + 049F3694130CD86800FF080F /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FD1B48920E313154007AB34E /* SDLiPhoneOS.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = FD6526620DE8FCCB002AD96B /* libSDL */; + remoteInfo = libSDL; + }; + 049F3696130CD87600FF080F /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FD1B48920E313154007AB34E /* SDLiPhoneOS.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = FD6526620DE8FCCB002AD96B /* libSDL */; + remoteInfo = libSDL; + }; + 049F3698130CD87F00FF080F /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FD1B48920E313154007AB34E /* SDLiPhoneOS.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = FD6526620DE8FCCB002AD96B /* libSDL */; + remoteInfo = libSDL; + }; + 049F369A130CD88800FF080F /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FD1B48920E313154007AB34E /* SDLiPhoneOS.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = FD6526620DE8FCCB002AD96B /* libSDL */; + remoteInfo = libSDL; + }; + 049F369C130CD89000FF080F /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FD1B48920E313154007AB34E /* SDLiPhoneOS.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = FD6526620DE8FCCB002AD96B /* libSDL */; + remoteInfo = libSDL; + }; + 049F369E130CD89800FF080F /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FD1B48920E313154007AB34E /* SDLiPhoneOS.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = FD6526620DE8FCCB002AD96B /* libSDL */; + remoteInfo = libSDL; + }; + 049F36A0130CD8A000FF080F /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FD1B48920E313154007AB34E /* SDLiPhoneOS.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = FD6526620DE8FCCB002AD96B /* libSDL */; + remoteInfo = libSDL; + }; 04AB757011E563D200BE9753 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = FD1B48920E313154007AB34E /* SDLiPhoneOS.xcodeproj */; @@ -166,7 +215,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - FD1B48DD0E313255007AB34E /* libSDLiPhoneOS.a in Frameworks */, + FD1B48DD0E313255007AB34E /* libSDL.a in Frameworks */, FDF0D7AB0E12D53800247964 /* CoreAudio.framework in Frameworks */, FDF0D7AC0E12D53800247964 /* AudioToolbox.framework in Frameworks */, 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */, @@ -181,7 +230,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - FD1B49980E313261007AB34E /* libSDLiPhoneOS.a in Frameworks */, + FD1B49980E313261007AB34E /* libSDL.a in Frameworks */, FDF0D7A90E12D53500247964 /* CoreAudio.framework in Frameworks */, FDF0D7AA0E12D53500247964 /* AudioToolbox.framework in Frameworks */, FD15FD690E086911003BDF25 /* Foundation.framework in Frameworks */, @@ -196,7 +245,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - FD1B499C0E313269007AB34E /* libSDLiPhoneOS.a in Frameworks */, + FD1B499C0E313269007AB34E /* libSDL.a in Frameworks */, FDF0D7A70E12D53200247964 /* CoreAudio.framework in Frameworks */, FDF0D7A80E12D53200247964 /* AudioToolbox.framework in Frameworks */, FD5F9CEB0E0E0741008E885B /* OpenGLES.framework in Frameworks */, @@ -211,7 +260,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - FDB652000E43D1F300F688B5 /* libSDLiPhoneOS.a in Frameworks */, + FDB652000E43D1F300F688B5 /* libSDL.a in Frameworks */, FDB652020E43D1F300F688B5 /* Foundation.framework in Frameworks */, FDB652030E43D1F300F688B5 /* UIKit.framework in Frameworks */, FDB652040E43D1F300F688B5 /* CoreGraphics.framework in Frameworks */, @@ -226,7 +275,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - FD1B499E0E31326C007AB34E /* libSDLiPhoneOS.a in Frameworks */, + FD1B499E0E31326C007AB34E /* libSDL.a in Frameworks */, FDF0D7950E12D52900247964 /* CoreAudio.framework in Frameworks */, FDF0D7960E12D52900247964 /* AudioToolbox.framework in Frameworks */, FDC202E60E107B1200ABAC90 /* Foundation.framework in Frameworks */, @@ -241,7 +290,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - FD1B49A20E313273007AB34E /* libSDLiPhoneOS.a in Frameworks */, + FD1B49A20E313273007AB34E /* libSDL.a in Frameworks */, FDC52ED40E2843D6008D768C /* Foundation.framework in Frameworks */, FDC52ED50E2843D6008D768C /* UIKit.framework in Frameworks */, FDC52ED60E2843D6008D768C /* CoreGraphics.framework in Frameworks */, @@ -256,7 +305,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - FD1B49A00E313270007AB34E /* libSDLiPhoneOS.a in Frameworks */, + FD1B49A00E313270007AB34E /* libSDL.a in Frameworks */, FDF0D69C0E12D05400247964 /* Foundation.framework in Frameworks */, FDF0D69D0E12D05400247964 /* UIKit.framework in Frameworks */, FDF0D69E0E12D05400247964 /* CoreGraphics.framework in Frameworks */, @@ -324,7 +373,7 @@ FD1B48930E313154007AB34E /* Products */ = { isa = PBXGroup; children = ( - FD1B489E0E313154007AB34E /* libSDLiPhoneOS.a */, + FD1B489E0E313154007AB34E /* libSDL.a */, 04AB757111E563D200BE9753 /* testsdl.app */, ); name = Products; @@ -393,6 +442,7 @@ buildRules = ( ); dependencies = ( + 049F3695130CD86800FF080F /* PBXTargetDependency */, ); name = Rectangles; productName = SDLiPodTest; @@ -410,6 +460,7 @@ buildRules = ( ); dependencies = ( + 049F3697130CD87600FF080F /* PBXTargetDependency */, ); name = Happy; productName = BMPTest; @@ -427,6 +478,7 @@ buildRules = ( ); dependencies = ( + 049F3699130CD87F00FF080F /* PBXTargetDependency */, ); name = Accel; productName = Accelerometer; @@ -444,6 +496,7 @@ buildRules = ( ); dependencies = ( + 049F36A1130CD8A000FF080F /* PBXTargetDependency */, ); name = Keyboard; productName = Accelerometer; @@ -461,6 +514,7 @@ buildRules = ( ); dependencies = ( + 049F369B130CD88800FF080F /* PBXTargetDependency */, ); name = Touch; productName = Accelerometer; @@ -478,6 +532,7 @@ buildRules = ( ); dependencies = ( + 049F369F130CD89800FF080F /* PBXTargetDependency */, ); name = Fireworks; productName = Accelerometer; @@ -495,6 +550,7 @@ buildRules = ( ); dependencies = ( + 049F369D130CD89000FF080F /* PBXTargetDependency */, ); name = Mixer; productName = Accelerometer; @@ -545,10 +601,10 @@ remoteRef = 04AB757011E563D200BE9753 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - FD1B489E0E313154007AB34E /* libSDLiPhoneOS.a */ = { + FD1B489E0E313154007AB34E /* libSDL.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = libSDLiPhoneOS.a; + path = libSDL.a; remoteRef = FD1B489D0E313154007AB34E /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -697,6 +753,44 @@ }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + 049F3695130CD86800FF080F /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = libSDL; + targetProxy = 049F3694130CD86800FF080F /* PBXContainerItemProxy */; + }; + 049F3697130CD87600FF080F /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = libSDL; + targetProxy = 049F3696130CD87600FF080F /* PBXContainerItemProxy */; + }; + 049F3699130CD87F00FF080F /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = libSDL; + targetProxy = 049F3698130CD87F00FF080F /* PBXContainerItemProxy */; + }; + 049F369B130CD88800FF080F /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = libSDL; + targetProxy = 049F369A130CD88800FF080F /* PBXContainerItemProxy */; + }; + 049F369D130CD89000FF080F /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = libSDL; + targetProxy = 049F369C130CD89000FF080F /* PBXContainerItemProxy */; + }; + 049F369F130CD89800FF080F /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = libSDL; + targetProxy = 049F369E130CD89800FF080F /* PBXContainerItemProxy */; + }; + 049F36A1130CD8A000FF080F /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = libSDL; + targetProxy = 049F36A0130CD8A000FF080F /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin XCBuildConfiguration section */ 1D6058940D05DD3E006BFB54 /* Debug */ = { isa = XCBuildConfiguration; @@ -748,12 +842,14 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ../../include; + IPHONEOS_DEPLOYMENT_TARGET = 3.2; LIBRARY_SEARCH_PATHS = ""; ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ""; PREBINDING = NO; PRELINK_LIBS = ""; SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; }; @@ -767,11 +863,13 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ../../include; + IPHONEOS_DEPLOYMENT_TARGET = 3.2; LIBRARY_SEARCH_PATHS = ""; OTHER_CFLAGS = ""; PREBINDING = NO; PRELINK_LIBS = ""; SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; }; diff --git a/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj b/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj index a3253cb77..28317b68b 100755 --- a/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj +++ b/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj @@ -1604,7 +1604,7 @@ GCC_DEBUGGING_SYMBOLS = full; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = NO; - IPHONEOS_DEPLOYMENT_TARGET = 3.1; + IPHONEOS_DEPLOYMENT_TARGET = 3.2; ONLY_ACTIVE_ARCH = NO; PREBINDING = NO; SDKROOT = iphoneos; @@ -1621,7 +1621,7 @@ GCC_C_LANGUAGE_STANDARD = c99; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = NO; - IPHONEOS_DEPLOYMENT_TARGET = 3.1; + IPHONEOS_DEPLOYMENT_TARGET = 3.2; PREBINDING = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2";