From 847c8bbe5b15a2de76bcf432900a0743d4986437 Mon Sep 17 00:00:00 2001 From: Eric Wing Date: Mon, 31 Jan 2011 07:36:12 -0800 Subject: [PATCH] iOS Xcode project template fixes/changes. - Embedded headers - Embedded Universal Device/Simulator libSDL.a - Changed search paths. - Removed cruft from copy resources. --- .../SDL/SDLiPhoneOS.xcodeproj/project.pbxproj | 4 +- .../project.pbxproj | 179 +++++++++++++++--- .../Template/SDL iOS Application/main.c | 5 +- 3 files changed, 160 insertions(+), 28 deletions(-) diff --git a/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj b/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj index 637a996a4..e467c3d0a 100755 --- a/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj +++ b/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj @@ -271,14 +271,14 @@ isa = PBXContainerItemProxy; containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; proxyType = 1; - remoteGlobalIDString = 00B4F47112F696830084EC00 /* BuildUniversalSimulatorDevicelibSDL */; + remoteGlobalIDString = 00B4F47112F696830084EC00; remoteInfo = BuildUniversalSimulatorDevicelibSDL; }; 00B4F4B012F6A9F00084EC00 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; proxyType = 1; - remoteGlobalIDString = 0064653F107E3D7400183915 /* Generate Header Files */; + remoteGlobalIDString = 0064653F107E3D7400183915; remoteInfo = "Generate Header Files"; }; /* End PBXContainerItemProxy section */ diff --git a/Xcode-iPhoneOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/project.pbxproj b/Xcode-iPhoneOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/project.pbxproj index 02efc75c8..f786799eb 100755 --- a/Xcode-iPhoneOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/project.pbxproj +++ b/Xcode-iPhoneOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/project.pbxproj @@ -7,12 +7,11 @@ objects = { /* Begin PBXBuildFile section */ + 0097E2D912F70C4E00724AC5 /* libSDL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0097E2D512F70C4D00724AC5 /* libSDL.a */; }; 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 */; }; - FD779ED20E26B9B000F39101 /* libSDLSimulator.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD779ED00E26B9B000F39101 /* libSDLSimulator.a */; }; - FD779ED30E26B9B000F39101 /* libSDLiPhoneOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD779ED10E26B9B000F39101 /* libSDLiPhoneOS.a */; }; FD779EDE0E26BA1200F39101 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FD779EDD0E26BA1200F39101 /* CoreAudio.framework */; }; FD77A07D0E26BD8C00F39101 /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = FD77A07C0E26BD8C00F39101 /* Icon.png */; }; FD77A07F0E26BDA900F39101 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = FD77A07E0E26BDA900F39101 /* Default.png */; }; @@ -22,14 +21,71 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 0097E29A12F70C4D00724AC5 /* begin_code.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = begin_code.h; sourceTree = ""; }; + 0097E29B12F70C4D00724AC5 /* close_code.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = close_code.h; sourceTree = ""; }; + 0097E29C12F70C4D00724AC5 /* doxyfile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = doxyfile; sourceTree = ""; }; + 0097E29D12F70C4D00724AC5 /* SDL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL.h; sourceTree = ""; }; + 0097E29E12F70C4D00724AC5 /* SDL_assert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_assert.h; sourceTree = ""; }; + 0097E29F12F70C4D00724AC5 /* SDL_atomic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_atomic.h; sourceTree = ""; }; + 0097E2A012F70C4D00724AC5 /* SDL_audio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_audio.h; sourceTree = ""; }; + 0097E2A112F70C4D00724AC5 /* SDL_blendmode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_blendmode.h; sourceTree = ""; }; + 0097E2A212F70C4D00724AC5 /* SDL_clipboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_clipboard.h; sourceTree = ""; }; + 0097E2A312F70C4D00724AC5 /* SDL_compat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_compat.h; sourceTree = ""; }; + 0097E2A412F70C4D00724AC5 /* SDL_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_config.h; sourceTree = ""; }; + 0097E2A512F70C4D00724AC5 /* SDL_config.h.default */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SDL_config.h.default; sourceTree = ""; }; + 0097E2A612F70C4D00724AC5 /* SDL_config.h.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SDL_config.h.in; sourceTree = ""; }; + 0097E2A712F70C4D00724AC5 /* SDL_config_android.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_config_android.h; sourceTree = ""; }; + 0097E2A812F70C4D00724AC5 /* SDL_config_iphoneos.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_config_iphoneos.h; sourceTree = ""; }; + 0097E2A912F70C4D00724AC5 /* SDL_config_macosx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_config_macosx.h; sourceTree = ""; }; + 0097E2AA12F70C4D00724AC5 /* SDL_config_minimal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_config_minimal.h; sourceTree = ""; }; + 0097E2AB12F70C4D00724AC5 /* SDL_config_nintendods.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_config_nintendods.h; sourceTree = ""; }; + 0097E2AC12F70C4D00724AC5 /* SDL_config_pandora.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_config_pandora.h; sourceTree = ""; }; + 0097E2AD12F70C4D00724AC5 /* SDL_config_windows.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_config_windows.h; sourceTree = ""; }; + 0097E2AE12F70C4D00724AC5 /* SDL_config_wiz.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_config_wiz.h; sourceTree = ""; }; + 0097E2AF12F70C4D00724AC5 /* SDL_copying.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_copying.h; sourceTree = ""; }; + 0097E2B012F70C4D00724AC5 /* SDL_cpuinfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_cpuinfo.h; sourceTree = ""; }; + 0097E2B112F70C4D00724AC5 /* SDL_endian.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_endian.h; sourceTree = ""; }; + 0097E2B212F70C4D00724AC5 /* SDL_error.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_error.h; sourceTree = ""; }; + 0097E2B312F70C4D00724AC5 /* SDL_events.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_events.h; sourceTree = ""; }; + 0097E2B412F70C4D00724AC5 /* SDL_gesture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_gesture.h; sourceTree = ""; }; + 0097E2B512F70C4D00724AC5 /* SDL_haptic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_haptic.h; sourceTree = ""; }; + 0097E2B612F70C4D00724AC5 /* SDL_input.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_input.h; sourceTree = ""; }; + 0097E2B712F70C4D00724AC5 /* SDL_joystick.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_joystick.h; sourceTree = ""; }; + 0097E2B812F70C4D00724AC5 /* SDL_keyboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_keyboard.h; sourceTree = ""; }; + 0097E2B912F70C4D00724AC5 /* SDL_keysym.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_keysym.h; sourceTree = ""; }; + 0097E2BA12F70C4D00724AC5 /* SDL_loadso.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_loadso.h; sourceTree = ""; }; + 0097E2BB12F70C4D00724AC5 /* SDL_main.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_main.h; sourceTree = ""; }; + 0097E2BC12F70C4D00724AC5 /* SDL_mouse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_mouse.h; sourceTree = ""; }; + 0097E2BD12F70C4D00724AC5 /* SDL_mutex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_mutex.h; sourceTree = ""; }; + 0097E2BE12F70C4D00724AC5 /* SDL_name.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_name.h; sourceTree = ""; }; + 0097E2BF12F70C4D00724AC5 /* SDL_opengl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_opengl.h; sourceTree = ""; }; + 0097E2C012F70C4D00724AC5 /* SDL_opengles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_opengles.h; sourceTree = ""; }; + 0097E2C112F70C4D00724AC5 /* SDL_pixels.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_pixels.h; sourceTree = ""; }; + 0097E2C212F70C4D00724AC5 /* SDL_platform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_platform.h; sourceTree = ""; }; + 0097E2C312F70C4D00724AC5 /* SDL_power.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_power.h; sourceTree = ""; }; + 0097E2C412F70C4D00724AC5 /* SDL_quit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_quit.h; sourceTree = ""; }; + 0097E2C512F70C4D00724AC5 /* SDL_rect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_rect.h; sourceTree = ""; }; + 0097E2C612F70C4D00724AC5 /* SDL_revision.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_revision.h; sourceTree = ""; }; + 0097E2C712F70C4D00724AC5 /* SDL_rwops.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_rwops.h; sourceTree = ""; }; + 0097E2C812F70C4D00724AC5 /* SDL_scalemode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_scalemode.h; sourceTree = ""; }; + 0097E2C912F70C4D00724AC5 /* SDL_scancode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_scancode.h; sourceTree = ""; }; + 0097E2CA12F70C4D00724AC5 /* SDL_shape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_shape.h; sourceTree = ""; }; + 0097E2CB12F70C4D00724AC5 /* SDL_stdinc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_stdinc.h; sourceTree = ""; }; + 0097E2CC12F70C4D00724AC5 /* SDL_surface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_surface.h; sourceTree = ""; }; + 0097E2CD12F70C4D00724AC5 /* SDL_syswm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_syswm.h; sourceTree = ""; }; + 0097E2CE12F70C4D00724AC5 /* SDL_thread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_thread.h; sourceTree = ""; }; + 0097E2CF12F70C4D00724AC5 /* SDL_timer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_timer.h; sourceTree = ""; }; + 0097E2D012F70C4D00724AC5 /* SDL_touch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_touch.h; sourceTree = ""; }; + 0097E2D112F70C4D00724AC5 /* SDL_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_types.h; sourceTree = ""; }; + 0097E2D212F70C4D00724AC5 /* SDL_version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_version.h; sourceTree = ""; }; + 0097E2D312F70C4D00724AC5 /* SDL_video.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_video.h; sourceTree = ""; }; + 0097E2D512F70C4D00724AC5 /* libSDL.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libSDL.a; sourceTree = ""; }; 1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 1D6058910D05DD3D006BFB54 /* ___PROJECTNAME___.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "___PROJECTNAME___.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; 28FD14FF0DC6FC520079059D /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; }; 28FD15070DC6FC5B0079059D /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; 8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - FD779ED00E26B9B000F39101 /* libSDLSimulator.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSDLSimulator.a; path = lib/libSDLSimulator.a; sourceTree = ""; }; - FD779ED10E26B9B000F39101 /* libSDLiPhoneOS.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSDLiPhoneOS.a; path = lib/libSDLiPhoneOS.a; sourceTree = ""; }; FD779EDD0E26BA1200F39101 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; }; FD77A07C0E26BD8C00F39101 /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Icon.png; sourceTree = ""; }; FD77A07E0E26BDA900F39101 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = ""; }; @@ -43,8 +99,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - FD779ED20E26B9B000F39101 /* libSDLSimulator.a in Frameworks */, - FD779ED30E26B9B000F39101 /* libSDLiPhoneOS.a in Frameworks */, 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */, 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */, 28FD15000DC6FC520079059D /* OpenGLES.framework in Frameworks */, @@ -52,12 +106,95 @@ FD779EDE0E26BA1200F39101 /* CoreAudio.framework in Frameworks */, FD77A0850E26BDB800F39101 /* AudioToolbox.framework in Frameworks */, FDB8BFC60E5A0F6A00980157 /* CoreGraphics.framework in Frameworks */, + 0097E2D912F70C4E00724AC5 /* libSDL.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 0097E29812F70C4D00724AC5 /* SDL */ = { + isa = PBXGroup; + children = ( + 0097E29912F70C4D00724AC5 /* include */, + 0097E2D412F70C4D00724AC5 /* lib */, + ); + path = SDL; + sourceTree = ""; + }; + 0097E29912F70C4D00724AC5 /* include */ = { + isa = PBXGroup; + children = ( + 0097E29A12F70C4D00724AC5 /* begin_code.h */, + 0097E29B12F70C4D00724AC5 /* close_code.h */, + 0097E29C12F70C4D00724AC5 /* doxyfile */, + 0097E29D12F70C4D00724AC5 /* SDL.h */, + 0097E29E12F70C4D00724AC5 /* SDL_assert.h */, + 0097E29F12F70C4D00724AC5 /* SDL_atomic.h */, + 0097E2A012F70C4D00724AC5 /* SDL_audio.h */, + 0097E2A112F70C4D00724AC5 /* SDL_blendmode.h */, + 0097E2A212F70C4D00724AC5 /* SDL_clipboard.h */, + 0097E2A312F70C4D00724AC5 /* SDL_compat.h */, + 0097E2A412F70C4D00724AC5 /* SDL_config.h */, + 0097E2A512F70C4D00724AC5 /* SDL_config.h.default */, + 0097E2A612F70C4D00724AC5 /* SDL_config.h.in */, + 0097E2A712F70C4D00724AC5 /* SDL_config_android.h */, + 0097E2A812F70C4D00724AC5 /* SDL_config_iphoneos.h */, + 0097E2A912F70C4D00724AC5 /* SDL_config_macosx.h */, + 0097E2AA12F70C4D00724AC5 /* SDL_config_minimal.h */, + 0097E2AB12F70C4D00724AC5 /* SDL_config_nintendods.h */, + 0097E2AC12F70C4D00724AC5 /* SDL_config_pandora.h */, + 0097E2AD12F70C4D00724AC5 /* SDL_config_windows.h */, + 0097E2AE12F70C4D00724AC5 /* SDL_config_wiz.h */, + 0097E2AF12F70C4D00724AC5 /* SDL_copying.h */, + 0097E2B012F70C4D00724AC5 /* SDL_cpuinfo.h */, + 0097E2B112F70C4D00724AC5 /* SDL_endian.h */, + 0097E2B212F70C4D00724AC5 /* SDL_error.h */, + 0097E2B312F70C4D00724AC5 /* SDL_events.h */, + 0097E2B412F70C4D00724AC5 /* SDL_gesture.h */, + 0097E2B512F70C4D00724AC5 /* SDL_haptic.h */, + 0097E2B612F70C4D00724AC5 /* SDL_input.h */, + 0097E2B712F70C4D00724AC5 /* SDL_joystick.h */, + 0097E2B812F70C4D00724AC5 /* SDL_keyboard.h */, + 0097E2B912F70C4D00724AC5 /* SDL_keysym.h */, + 0097E2BA12F70C4D00724AC5 /* SDL_loadso.h */, + 0097E2BB12F70C4D00724AC5 /* SDL_main.h */, + 0097E2BC12F70C4D00724AC5 /* SDL_mouse.h */, + 0097E2BD12F70C4D00724AC5 /* SDL_mutex.h */, + 0097E2BE12F70C4D00724AC5 /* SDL_name.h */, + 0097E2BF12F70C4D00724AC5 /* SDL_opengl.h */, + 0097E2C012F70C4D00724AC5 /* SDL_opengles.h */, + 0097E2C112F70C4D00724AC5 /* SDL_pixels.h */, + 0097E2C212F70C4D00724AC5 /* SDL_platform.h */, + 0097E2C312F70C4D00724AC5 /* SDL_power.h */, + 0097E2C412F70C4D00724AC5 /* SDL_quit.h */, + 0097E2C512F70C4D00724AC5 /* SDL_rect.h */, + 0097E2C612F70C4D00724AC5 /* SDL_revision.h */, + 0097E2C712F70C4D00724AC5 /* SDL_rwops.h */, + 0097E2C812F70C4D00724AC5 /* SDL_scalemode.h */, + 0097E2C912F70C4D00724AC5 /* SDL_scancode.h */, + 0097E2CA12F70C4D00724AC5 /* SDL_shape.h */, + 0097E2CB12F70C4D00724AC5 /* SDL_stdinc.h */, + 0097E2CC12F70C4D00724AC5 /* SDL_surface.h */, + 0097E2CD12F70C4D00724AC5 /* SDL_syswm.h */, + 0097E2CE12F70C4D00724AC5 /* SDL_thread.h */, + 0097E2CF12F70C4D00724AC5 /* SDL_timer.h */, + 0097E2D012F70C4D00724AC5 /* SDL_touch.h */, + 0097E2D112F70C4D00724AC5 /* SDL_types.h */, + 0097E2D212F70C4D00724AC5 /* SDL_version.h */, + 0097E2D312F70C4D00724AC5 /* SDL_video.h */, + ); + path = include; + sourceTree = ""; + }; + 0097E2D412F70C4D00724AC5 /* lib */ = { + isa = PBXGroup; + children = ( + 0097E2D512F70C4D00724AC5 /* libSDL.a */, + ); + path = lib; + sourceTree = ""; + }; 19C28FACFE9D520D11CA2CBB /* Products */ = { isa = PBXGroup; children = ( @@ -71,7 +208,7 @@ children = ( 29B97315FDCFA39411CA2CEA /* Sources */, 29B97317FDCFA39411CA2CEA /* Resources */, - FD779EC50E26B99E00F39101 /* Libraries */, + 0097E29812F70C4D00724AC5 /* SDL */, 29B97323FDCFA39411CA2CEA /* Frameworks */, 19C28FACFE9D520D11CA2CBB /* Products */, ); @@ -110,15 +247,6 @@ name = Frameworks; sourceTree = ""; }; - FD779EC50E26B99E00F39101 /* Libraries */ = { - isa = PBXGroup; - children = ( - FD779ED00E26B9B000F39101 /* libSDLSimulator.a */, - FD779ED10E26B9B000F39101 /* libSDLiPhoneOS.a */, - ); - name = Libraries; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -146,7 +274,14 @@ isa = PBXProject; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "___PROJECTNAME___" */; compatibilityVersion = "Xcode 3.1"; + developmentRegion = English; hasScannedForEncodings = 1; + knownRegions = ( + English, + Japanese, + French, + German, + ); mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */; projectDirPath = ""; projectRoot = ""; @@ -192,7 +327,7 @@ INFOPLIST_FILE = Info.plist; LIBRARY_SEARCH_PATHS = ( "$(inherited)", - "\"$(SRCROOT)/lib\"", + "\"$(SRCROOT)/SDL/lib\"", ); PRODUCT_NAME = "___PROJECTNAME___"; }; @@ -208,7 +343,7 @@ INFOPLIST_FILE = Info.plist; LIBRARY_SEARCH_PATHS = ( "$(inherited)", - "\"$(SRCROOT)/lib\"", + "\"$(SRCROOT)/SDL/lib\"", ); PRODUCT_NAME = "___PROJECTNAME___"; }; @@ -222,12 +357,10 @@ GCC_C_LANGUAGE_STANDARD = c99; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ./include; - LIBRARY_SEARCH_PATHS = ./lib; ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ""; PREBINDING = NO; - SDKROOT = iphoneos2.0; + SDKROOT = iphoneos; }; name = Debug; }; @@ -239,11 +372,9 @@ GCC_C_LANGUAGE_STANDARD = c99; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ./include; - LIBRARY_SEARCH_PATHS = ./lib; OTHER_CFLAGS = ""; PREBINDING = NO; - SDKROOT = iphoneos2.0; + SDKROOT = iphoneos; }; name = Release; }; diff --git a/Xcode-iPhoneOS/Template/SDL iOS Application/main.c b/Xcode-iPhoneOS/Template/SDL iOS Application/main.c index 168fb48c9..8b20954b7 100644 --- a/Xcode-iPhoneOS/Template/SDL iOS Application/main.c +++ b/Xcode-iPhoneOS/Template/SDL iOS Application/main.c @@ -32,9 +32,10 @@ render(void) r = randomInt(50, 255); g = randomInt(50, 255); b = randomInt(50, 255); + SDL_SetRenderDrawColor(r, g, b, 255); /* Fill the rectangle in the color */ - SDL_RenderFill(r, g, b, 255, &rect); + SDL_RenderFillRect(&rect); /* update screen */ SDL_RenderPresent(); @@ -69,7 +70,7 @@ main(int argc, char *argv[]) } /* Fill screen with black */ - SDL_RenderFill(0, 0, 0, 0, NULL); + SDL_RenderClear(); /* Enter render loop, waiting for user to quit */ done = 0;