# HG changeset patch # User Sam Lantinga # Date 1255765094 0 # Node ID 244ca085c026b80ec62ada24bb8e4183e5db7be0 # Parent 4ec48602f1db653de2f59a121e5212954a5a7d97 iPhone/Xcode for 1.3 Eric Wing to Sam Here's another patch for Xcode-iPhone for 1.3. This has been sitting for awhile too, so you may want to test. Contains mostly small changes, but tries to unify how I do some of the script stages with the Mac version. diff -r 4ec48602f1db -r 244ca085c026 Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj --- a/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj Sat Oct 17 07:36:45 2009 +0000 +++ b/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj Sat Oct 17 07:38:14 2009 +0000 @@ -7,6 +7,18 @@ objects = { /* Begin PBXAggregateTarget section */ + 0064653F107E3D7400183915 /* Generate Header Files */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 0064655A107E3E0400183915 /* Build configuration list for PBXAggregateTarget "Generate Header Files" */; + buildPhases = ( + 00646544107E3D8300183915 /* Run Script to Create SDL_config.h */, + 00646546107E3DB200183915 /* Run Script to Create SDL_revision.h */, + ); + dependencies = ( + ); + name = "Generate Header Files"; + productName = "Generate Header Files"; + }; FDB043B30E2689CC00F5B3F9 /* Template */ = { isa = PBXAggregateTarget; buildConfigurationList = FDB043C20E268A0D00F5B3F9 /* Build configuration list for PBXAggregateTarget "Template" */; @@ -344,6 +356,13 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ + 00646547107E3DE800183915 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; + proxyType = 1; + remoteGlobalIDString = 0064653F107E3D7400183915 /* Generate Header Files */; + remoteInfo = "Generate Header Files"; + }; FDB043B70E2689DD00F5B3F9 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; @@ -1173,13 +1192,13 @@ isa = PBXNativeTarget; buildConfigurationList = FD6526990DE8FD14002AD96B /* Build configuration list for PBXNativeTarget "StaticLibiPhoneOS" */; buildPhases = ( - FDB0439F0E26877100F5B3F9 /* Run Script to Create SDL_config.h */, FD65265F0DE8FCCB002AD96B /* Headers */, FD6526600DE8FCCB002AD96B /* Sources */, ); buildRules = ( ); dependencies = ( + 00646548107E3DE800183915 /* PBXTargetDependency */, ); name = StaticLibiPhoneOS; productName = iPhoneSDLStaticLib; @@ -1217,26 +1236,46 @@ targets = ( FD6526620DE8FCCB002AD96B /* StaticLibiPhoneOS */, FDBB64820E159B23003B3114 /* StaticLibSimulator */, + 0064653F107E3D7400183915 /* Generate Header Files */, FDB043B30E2689CC00F5B3F9 /* Template */, ); }; /* End PBXProject section */ /* Begin PBXShellScriptBuildPhase section */ - FDB0439F0E26877100F5B3F9 /* Run Script to Create SDL_config.h */ = { + 00646544107E3D8300183915 /* Run Script to Create SDL_config.h */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( + "$(SRCROOT)/../../include/SDL_config.h.default", ); name = "Run Script to Create SDL_config.h"; outputPaths = ( + "$(SRCROOT)/../../include/SDL_config.h", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "# Make sure that include/SDL_config.h is a symlink to SDL_config.h.default.\n# If it exists and is not a symlink, it was probably generated by configure and\n# we move it aside.\nif [ ! -L ../../include/SDL_config.h ]; then\n if [ -e ../../include/SDL_config.h ]; then\n mv ../../include/SDL_config.h ../../include/SDL_config.h.generated\n fi\n ln -s SDL_config.h.default ../../include/SDL_config.h\nfi\n"; }; + 00646546107E3DB200183915 /* Run Script to Create SDL_revision.h */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "$(SRCROOT)/../../build-scripts/showrev.sh", + "$(SRCROOT)/../../build-scripts/updaterev.sh", + ); + name = "Run Script to Create SDL_revision.h"; + outputPaths = ( + "$(SRCROOT)/../../include/SDL_revision.h", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "sh ../../build-scripts/updaterev.sh"; + }; FDB043A10E2687A100F5B3F9 /* Run Script to Create SDL_config.h */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -1452,6 +1491,11 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ + 00646548107E3DE800183915 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 0064653F107E3D7400183915 /* Generate Header Files */; + targetProxy = 00646547107E3DE800183915 /* PBXContainerItemProxy */; + }; FDB043B80E2689DD00F5B3F9 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = FDBB64820E159B23003B3114 /* StaticLibSimulator */; @@ -1465,6 +1509,27 @@ /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ + 00646540107E3D7500183915 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_OPTIMIZATION_LEVEL = 0; + PRODUCT_NAME = "Generate Header Files"; + }; + name = Debug; + }; + 00646541107E3D7500183915 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + PRODUCT_NAME = "Generate Header Files"; + ZERO_LINK = NO; + }; + name = Release; + }; C01FCF4F08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -1579,6 +1644,15 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ + 0064655A107E3E0400183915 /* Build configuration list for PBXAggregateTarget "Generate Header Files" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 00646540107E3D7500183915 /* Debug */, + 00646541107E3D7500183915 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; C01FCF4E08A954540054247B /* Build configuration list for PBXProject "SDLiPhoneOS" */ = { isa = XCConfigurationList; buildConfigurations = ( diff -r 4ec48602f1db -r 244ca085c026 Xcode-iPhoneOS/Test/TestiPhoneOS.xcodeproj/project.pbxproj --- a/Xcode-iPhoneOS/Test/TestiPhoneOS.xcodeproj/project.pbxproj Sat Oct 17 07:36:45 2009 +0000 +++ b/Xcode-iPhoneOS/Test/TestiPhoneOS.xcodeproj/project.pbxproj Sat Oct 17 07:38:14 2009 +0000 @@ -118,15 +118,12 @@ FDAAC6390E2D59BE001DB1D8 /* icon.bmp in Resources */ = {isa = PBXBuildFile; fileRef = FDA8AAD90E2D33B000EA573E /* icon.bmp */; }; FDAAC7780E2D7024001DB1D8 /* common.c in Sources */ = {isa = PBXBuildFile; fileRef = FDA8A7840E2D0F1F00EA573E /* common.c */; }; FDBDE54B0E31338A006BAC0B /* libSDLiPhoneOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDLiPhoneOS.a */; }; - FDBDE54C0E31338A006BAC0B /* libSDLSimulator.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48BA0E3131CA007AB34E /* libSDLSimulator.a */; }; FDBDE56B0E3133F5006BAC0B /* libSDLiPhoneOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDLiPhoneOS.a */; }; FDBDE56C0E3133F5006BAC0B /* libSDLSimulator.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48BA0E3131CA007AB34E /* libSDLSimulator.a */; }; FDBDE5780E313425006BAC0B /* libSDLiPhoneOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDLiPhoneOS.a */; }; FDBDE5790E313425006BAC0B /* libSDLSimulator.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48BA0E3131CA007AB34E /* libSDLSimulator.a */; }; FDBDE57C0E313445006BAC0B /* libSDLiPhoneOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDLiPhoneOS.a */; }; - FDBDE57D0E313445006BAC0B /* libSDLSimulator.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48BA0E3131CA007AB34E /* libSDLSimulator.a */; }; FDBDE5810E313465006BAC0B /* libSDLiPhoneOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDLiPhoneOS.a */; }; - FDBDE5820E313465006BAC0B /* libSDLSimulator.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48BA0E3131CA007AB34E /* libSDLSimulator.a */; }; FDBDE5850E313495006BAC0B /* libSDLiPhoneOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDLiPhoneOS.a */; }; FDBDE5860E313495006BAC0B /* libSDLSimulator.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48BA0E3131CA007AB34E /* libSDLSimulator.a */; }; FDBDE5890E3134B8006BAC0B /* libSDLiPhoneOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDLiPhoneOS.a */; }; @@ -160,7 +157,6 @@ FDBDE5C80E313702006BAC0B /* libSDLiPhoneOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDLiPhoneOS.a */; }; FDBDE5C90E313702006BAC0B /* libSDLSimulator.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48BA0E3131CA007AB34E /* libSDLSimulator.a */; }; FDBDE5CA0E313712006BAC0B /* libSDLiPhoneOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDLiPhoneOS.a */; }; - FDBDE5CB0E313712006BAC0B /* libSDLSimulator.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48BA0E3131CA007AB34E /* libSDLSimulator.a */; }; FDBDE5CC0E31372B006BAC0B /* libSDLiPhoneOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDLiPhoneOS.a */; }; FDBDE5CD0E31372B006BAC0B /* libSDLSimulator.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48BA0E3131CA007AB34E /* libSDLSimulator.a */; }; FDBDE5CE0E31373E006BAC0B /* libSDLiPhoneOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDLiPhoneOS.a */; }; @@ -168,7 +164,6 @@ FDBDE5D00E31375B006BAC0B /* libSDLiPhoneOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDLiPhoneOS.a */; }; FDBDE5D10E31375B006BAC0B /* libSDLSimulator.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48BA0E3131CA007AB34E /* libSDLSimulator.a */; }; FDBDE5D20E31376B006BAC0B /* libSDLiPhoneOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDLiPhoneOS.a */; }; - FDBDE5D30E31376B006BAC0B /* libSDLSimulator.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48BA0E3131CA007AB34E /* libSDLSimulator.a */; }; FDBDE5D40E313789006BAC0B /* libSDLiPhoneOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDLiPhoneOS.a */; }; FDBDE5D50E313789006BAC0B /* libSDLSimulator.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48BA0E3131CA007AB34E /* libSDLSimulator.a */; }; FDC42FF40F0D866D009C87E1 /* libSDLiPhoneOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDLiPhoneOS.a */; }; @@ -423,7 +418,6 @@ buildActionMask = 2147483647; files = ( FDBDE5810E313465006BAC0B /* libSDLiPhoneOS.a in Frameworks */, - FDBDE5820E313465006BAC0B /* libSDLSimulator.a in Frameworks */, FDA8A89F0E2D111A00EA573E /* AudioToolbox.framework in Frameworks */, FDA8A8A00E2D111A00EA573E /* QuartzCore.framework in Frameworks */, FDA8A8A10E2D111A00EA573E /* OpenGLES.framework in Frameworks */, @@ -439,7 +433,6 @@ buildActionMask = 2147483647; files = ( FDBDE54B0E31338A006BAC0B /* libSDLiPhoneOS.a in Frameworks */, - FDBDE54C0E31338A006BAC0B /* libSDLSimulator.a in Frameworks */, FDA8A9250E2D1C0B00EA573E /* AudioToolbox.framework in Frameworks */, FDA8A9260E2D1C0B00EA573E /* QuartzCore.framework in Frameworks */, FDA8A9270E2D1C0B00EA573E /* OpenGLES.framework in Frameworks */, @@ -615,7 +608,6 @@ buildActionMask = 2147483647; files = ( FDBDE57C0E313445006BAC0B /* libSDLiPhoneOS.a in Frameworks */, - FDBDE57D0E313445006BAC0B /* libSDLSimulator.a in Frameworks */, FDAAC61C0E2D5914001DB1D8 /* AudioToolbox.framework in Frameworks */, FDAAC61D0E2D5914001DB1D8 /* QuartzCore.framework in Frameworks */, FDAAC61E0E2D5914001DB1D8 /* OpenGLES.framework in Frameworks */, @@ -775,7 +767,6 @@ buildActionMask = 2147483647; files = ( FDBDE5CA0E313712006BAC0B /* libSDLiPhoneOS.a in Frameworks */, - FDBDE5CB0E313712006BAC0B /* libSDLSimulator.a in Frameworks */, FDD2C5440E2E80E400B7A85F /* AudioToolbox.framework in Frameworks */, FDD2C5450E2E80E400B7A85F /* QuartzCore.framework in Frameworks */, FDD2C5460E2E80E400B7A85F /* OpenGLES.framework in Frameworks */, @@ -839,7 +830,6 @@ buildActionMask = 2147483647; files = ( FDBDE5D20E31376B006BAC0B /* libSDLiPhoneOS.a in Frameworks */, - FDBDE5D30E31376B006BAC0B /* libSDLSimulator.a in Frameworks */, FDD2C61D0E2E8F0600B7A85F /* AudioToolbox.framework in Frameworks */, FDD2C61E0E2E8F0600B7A85F /* QuartzCore.framework in Frameworks */, FDD2C61F0E2E8F0600B7A85F /* OpenGLES.framework in Frameworks */,