# HG changeset patch # User koda # Date 1319573695 -7200 # Node ID cbc80c22691c27eaf7a3df23b2ad3505b98d6f4c # Parent 75e0d8169ba210063ea6b790aff9353a86efda9d updated sdl and lowered minimum ios to 3.0 diff -r 75e0d8169ba2 -r cbc80c22691c misc/libfreetype/Xcode-iPhoneOS/Freetype.xcodeproj/project.pbxproj --- a/misc/libfreetype/Xcode-iPhoneOS/Freetype.xcodeproj/project.pbxproj Tue Oct 25 19:01:56 2011 -0400 +++ b/misc/libfreetype/Xcode-iPhoneOS/Freetype.xcodeproj/project.pbxproj Tue Oct 25 22:14:55 2011 +0200 @@ -1102,7 +1102,7 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = "\"$(SRCROOT)/../include\""; - IPHONEOS_DEPLOYMENT_TARGET = 4.0; + IPHONEOS_DEPLOYMENT_TARGET = 3.0; OTHER_LDFLAGS = "-ObjC"; PREBINDING = NO; SDKROOT = iphoneos; @@ -1126,7 +1126,7 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = "\"$(SRCROOT)/../include\""; - IPHONEOS_DEPLOYMENT_TARGET = 4.0; + IPHONEOS_DEPLOYMENT_TARGET = 3.0; OTHER_LDFLAGS = "-ObjC"; PREBINDING = NO; SDKROOT = iphoneos; diff -r 75e0d8169ba2 -r cbc80c22691c misc/liblua/Xcode/Lua.xcodeproj/project.pbxproj --- a/misc/liblua/Xcode/Lua.xcodeproj/project.pbxproj Tue Oct 25 19:01:56 2011 -0400 +++ b/misc/liblua/Xcode/Lua.xcodeproj/project.pbxproj Tue Oct 25 22:14:55 2011 +0200 @@ -392,7 +392,7 @@ GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 4.0; + IPHONEOS_DEPLOYMENT_TARGET = 3.0; OTHER_LDFLAGS = "-ObjC"; PREBINDING = NO; SDKROOT = iphoneos; @@ -410,7 +410,7 @@ GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 4.0; + IPHONEOS_DEPLOYMENT_TARGET = 3.0; OTHER_LDFLAGS = "-ObjC"; PREBINDING = NO; SDKROOT = iphoneos; diff -r 75e0d8169ba2 -r cbc80c22691c misc/libtremor/Xcode/Tremor.xcodeproj/project.pbxproj --- a/misc/libtremor/Xcode/Tremor.xcodeproj/project.pbxproj Tue Oct 25 19:01:56 2011 -0400 +++ b/misc/libtremor/Xcode/Tremor.xcodeproj/project.pbxproj Tue Oct 25 22:14:55 2011 +0200 @@ -312,7 +312,7 @@ GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 4.0; + IPHONEOS_DEPLOYMENT_TARGET = 3.0; OTHER_LDFLAGS = "-ObjC"; PREBINDING = NO; SDKROOT = iphoneos; @@ -330,7 +330,7 @@ GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 4.0; + IPHONEOS_DEPLOYMENT_TARGET = 3.0; OTHER_LDFLAGS = "-ObjC"; PREBINDING = NO; SDKROOT = iphoneos; diff -r 75e0d8169ba2 -r cbc80c22691c project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj --- a/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Tue Oct 25 19:01:56 2011 -0400 +++ b/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Tue Oct 25 22:14:55 2011 +0200 @@ -395,6 +395,7 @@ 61399012125D19C0003C2DC0 /* uMobile.pas */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = uMobile.pas; path = ../../hedgewars/uMobile.pas; sourceTree = SOURCE_ROOT; }; 6147DAD21253DCDE0010357E /* savesButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = savesButton.png; path = Resources/Frontend/savesButton.png; sourceTree = ""; }; 614E333D11DE9A93009DBA4E /* VGSHandlers.inc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = VGSHandlers.inc; path = ../../hedgewars/VGSHandlers.inc; sourceTree = SOURCE_ROOT; }; + 61589C5A144B4322007BFAA4 /* config.inc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; path = config.inc; sourceTree = ""; }; 615AD96112073B4D00F2FF04 /* startGameButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = startGameButton.png; path = Resources/Frontend/startGameButton.png; sourceTree = ""; }; 615AD9E8120764CA00F2FF04 /* backButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = backButton.png; path = Resources/Frontend/backButton.png; sourceTree = ""; }; 615AD9EA1207654E00F2FF04 /* helpButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = helpButton.png; path = Resources/Frontend/helpButton.png; sourceTree = ""; }; @@ -539,7 +540,6 @@ 6179880C114AA34C00BA94A9 /* uTeams.pas */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = uTeams.pas; path = ../../hedgewars/uTeams.pas; sourceTree = SOURCE_ROOT; }; 6179880E114AA34C00BA94A9 /* uVisualGears.pas */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = uVisualGears.pas; path = ../../hedgewars/uVisualGears.pas; sourceTree = SOURCE_ROOT; }; 6179880F114AA34C00BA94A9 /* uWorld.pas */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = uWorld.pas; path = ../../hedgewars/uWorld.pas; sourceTree = SOURCE_ROOT; }; - 61589C5A144B4322007BFAA4 /* config.inc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; path = config.inc; sourceTree = ""; }; 617988D3114AAA3900BA94A9 /* SDLiPhoneOS.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDLiPhoneOS.xcodeproj; path = "../../../Library/SDL/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj"; sourceTree = SOURCE_ROOT; }; 61798934114AB25F00BA94A9 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; 6179898B114AB3FA00BA94A9 /* SDL_mixer.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL_mixer.xcodeproj; path = "../../../Library/SDL_mixer/Xcode-iPhoneOS/SDL_mixer.xcodeproj"; sourceTree = SOURCE_ROOT; }; @@ -1703,7 +1703,7 @@ "\"$(SRCROOT)/../../../Library/SDL_net/\"", "\"$(SRCROOT)/../../../Library/SDL_mixer/\"", ); - IPHONEOS_DEPLOYMENT_TARGET = 4.0; + IPHONEOS_DEPLOYMENT_TARGET = 3.0; LLVM_LTO = NO; ONLY_ACTIVE_ARCH = NO; OTHER_CODE_SIGN_FLAGS = ""; @@ -1786,7 +1786,7 @@ "\"$(SRCROOT)/../../../Library/SDL_net/\"", "\"$(SRCROOT)/../../../Library/SDL_mixer/\"", ); - IPHONEOS_DEPLOYMENT_TARGET = 4.0; + IPHONEOS_DEPLOYMENT_TARGET = 3.0; ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = ( "-lz", @@ -1911,7 +1911,7 @@ "\"$(SRCROOT)/../../../Library/SDL_net/\"", "\"$(SRCROOT)/../../../Library/SDL_mixer/\"", ); - IPHONEOS_DEPLOYMENT_TARGET = 4.0; + IPHONEOS_DEPLOYMENT_TARGET = 3.0; ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = ( "-lz", @@ -1958,7 +1958,7 @@ "\"$(SRCROOT)/../../../Library/SDL_net/\"", "\"$(SRCROOT)/../../../Library/SDL_mixer/\"", ); - IPHONEOS_DEPLOYMENT_TARGET = 4.0; + IPHONEOS_DEPLOYMENT_TARGET = 3.0; LLVM_LTO = NO; ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = ( diff -r 75e0d8169ba2 -r cbc80c22691c project_files/HedgewarsMobile/SDL-50560ca58f80.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/project_files/HedgewarsMobile/SDL-50560ca58f80.patch Tue Oct 25 22:14:55 2011 +0200 @@ -0,0 +1,100 @@ +diff -r 50560ca58f80 Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj +--- a/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj Mon Oct 24 23:18:53 2011 -0400 ++++ b/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj Tue Oct 25 22:13:19 2011 +0200 +@@ -1596,9 +1596,12 @@ + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + GCC_C_LANGUAGE_STANDARD = c99; + GCC_DEBUGGING_SYMBOLS = full; ++ GCC_OPTIMIZATION_LEVEL = 0; ++ GCC_THUMB_SUPPORT = NO; ++ GCC_VERSION = com.apple.compilers.llvm.clang.1_0; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNUSED_VARIABLE = NO; +- IPHONEOS_DEPLOYMENT_TARGET = 3.1.3; ++ IPHONEOS_DEPLOYMENT_TARGET = 3.0; + ONLY_ACTIVE_ARCH = NO; + PREBINDING = NO; + SDKROOT = iphoneos; +@@ -1613,9 +1616,12 @@ + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + GCC_C_LANGUAGE_STANDARD = c99; ++ GCC_FAST_MATH = YES; ++ GCC_THUMB_SUPPORT = NO; ++ GCC_VERSION = com.apple.compilers.llvm.clang.1_0; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNUSED_VARIABLE = NO; +- IPHONEOS_DEPLOYMENT_TARGET = 3.1.3; ++ IPHONEOS_DEPLOYMENT_TARGET = 3.0; + PREBINDING = NO; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; +diff -r 50560ca58f80 include/SDL_config_iphoneos.h +--- a/include/SDL_config_iphoneos.h Mon Oct 24 23:18:53 2011 -0400 ++++ b/include/SDL_config_iphoneos.h Tue Oct 25 22:13:19 2011 +0200 +@@ -106,7 +106,7 @@ + /* enable iPhone version of Core Audio driver */ + #define SDL_AUDIO_DRIVER_COREAUDIO 1 + /* Enable the dummy audio driver (src/audio/dummy/\*.c) */ +-#define SDL_AUDIO_DRIVER_DUMMY 1 ++#define SDL_AUDIO_DRIVER_DUMMY 0 + + /* Enable the stub haptic driver (src/haptic/dummy/\*.c) */ + #define SDL_HAPTIC_DISABLED 1 +@@ -132,16 +132,16 @@ + /* enable OpenGL ES */ + #define SDL_VIDEO_OPENGL_ES 1 + #define SDL_VIDEO_RENDER_OGL_ES 1 +-#define SDL_VIDEO_RENDER_OGL_ES2 1 ++#define SDL_VIDEO_RENDER_OGL_ES2 0 + + /* Enable system power support */ +-#define SDL_POWER_UIKIT 1 ++#define SDL_POWER_UIKIT 0 + + /* enable iPhone keyboard support */ + #define SDL_IPHONE_KEYBOARD 1 + + /* enable joystick subsystem */ +-#define SDL_JOYSTICK_DISABLED 0 ++#define SDL_JOYSTICK_DISABLED 1 + + /* Set max recognized G-force from accelerometer + See src/joystick/uikit/SDLUIAccelerationDelegate.m for notes on why this is needed +diff -r 50560ca58f80 src/video/uikit/SDL_uikitopenglview.m +--- a/src/video/uikit/SDL_uikitopenglview.m Mon Oct 24 23:18:53 2011 -0400 ++++ b/src/video/uikit/SDL_uikitopenglview.m Tue Oct 25 22:13:19 2011 +0200 +@@ -114,8 +114,8 @@ + + // !!! FIXME: use the screen this is on! + /* Use the main screen scale (for retina display support) */ +- if ([[UIScreen mainScreen] respondsToSelector:@selector(scale)]) +- self.contentScaleFactor = [UIScreen mainScreen].scale; ++ if ([self respondsToSelector:@selector(contentScaleFactor)]) ++ self.contentScaleFactor = [[UIScreen mainScreen] scale]; + + self.autoresizingMask = 0; // don't allow autoresize, since we need to do some magic in -(void)updateFrame. + } +@@ -144,8 +144,8 @@ + + // !!! FIXME: use the screen this is on! + /* Use the main screen scale (for retina display support) */ +- if ([[UIScreen mainScreen] respondsToSelector:@selector(scale)]) +- self.contentScaleFactor = [UIScreen mainScreen].scale; ++ if ([self respondsToSelector:@selector(contentScaleFactor)]) ++ self.contentScaleFactor = [[UIScreen mainScreen] scale]; + } + + - (void)setCurrentContext +diff -r 50560ca58f80 src/video/uikit/SDL_uikitviewcontroller.m +--- a/src/video/uikit/SDL_uikitviewcontroller.m Mon Oct 24 23:18:53 2011 -0400 ++++ b/src/video/uikit/SDL_uikitviewcontroller.m Tue Oct 25 22:13:19 2011 +0200 +@@ -145,7 +145,7 @@ + frame.origin.x = 0; + frame.origin.y = 0; + +- [uiwindow setFrame:frame]; ++ [uiwindow setFrame:[[UIScreen mainScreen] bounds]]; + [data->view updateFrame]; + SDL_SendWindowEvent(self->window, SDL_WINDOWEVENT_RESIZED, w, h); + } diff -r 75e0d8169ba2 -r cbc80c22691c project_files/HedgewarsMobile/SDL-91c9a69dd2ad.patch --- a/project_files/HedgewarsMobile/SDL-91c9a69dd2ad.patch Tue Oct 25 19:01:56 2011 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,127 +0,0 @@ -diff -r 91c9a69dd2ad Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj ---- a/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj Mon Aug 29 00:27:43 2011 -0400 -+++ b/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj Mon Aug 29 23:56:04 2011 +0200 -@@ -1596,9 +1596,12 @@ - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - GCC_C_LANGUAGE_STANDARD = c99; - GCC_DEBUGGING_SYMBOLS = full; -+ GCC_OPTIMIZATION_LEVEL = 0; -+ GCC_THUMB_SUPPORT = NO; -+ GCC_VERSION = com.apple.compilers.llvmgcc42; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = NO; -- IPHONEOS_DEPLOYMENT_TARGET = 3.1.3; -+ IPHONEOS_DEPLOYMENT_TARGET = 4.0; - ONLY_ACTIVE_ARCH = NO; - PREBINDING = NO; - SDKROOT = iphoneos; -@@ -1613,9 +1616,12 @@ - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - GCC_C_LANGUAGE_STANDARD = c99; -+ GCC_FAST_MATH = YES; -+ GCC_THUMB_SUPPORT = NO; -+ GCC_VERSION = com.apple.compilers.llvmgcc42; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = NO; -- IPHONEOS_DEPLOYMENT_TARGET = 3.1.3; -+ IPHONEOS_DEPLOYMENT_TARGET = 4.0; - PREBINDING = NO; - SDKROOT = iphoneos; - TARGETED_DEVICE_FAMILY = "1,2"; -diff -r 91c9a69dd2ad include/SDL_config_iphoneos.h ---- a/include/SDL_config_iphoneos.h Mon Aug 29 00:27:43 2011 -0400 -+++ b/include/SDL_config_iphoneos.h Mon Aug 29 23:56:04 2011 +0200 -@@ -106,7 +106,7 @@ - /* enable iPhone version of Core Audio driver */ - #define SDL_AUDIO_DRIVER_COREAUDIO 1 - /* Enable the dummy audio driver (src/audio/dummy/\*.c) */ --#define SDL_AUDIO_DRIVER_DUMMY 1 -+#define SDL_AUDIO_DRIVER_DUMMY 0 - - /* Enable the stub haptic driver (src/haptic/dummy/\*.c) */ - #define SDL_HAPTIC_DISABLED 1 -@@ -132,14 +132,17 @@ - /* enable OpenGL ES */ - #define SDL_VIDEO_OPENGL_ES 1 - #define SDL_VIDEO_RENDER_OGL_ES 1 --#define SDL_VIDEO_RENDER_OGL_ES2 1 -+#define SDL_VIDEO_RENDER_OGL_ES2 0 - - /* Enable system power support */ --#define SDL_POWER_UIKIT 1 -+#define SDL_POWER_UIKIT 0 - - /* enable iPhone keyboard support */ - #define SDL_IPHONE_KEYBOARD 1 - -+/* enable joystick subsystem */ -+#define SDL_JOYSTICK_DISABLED 1 -+ - /* Set max recognized G-force from accelerometer - See src/joystick/uikit/SDLUIAccelerationDelegate.m for notes on why this is needed - */ -diff -r 91c9a69dd2ad src/video/uikit/SDL_uikitopenglview.m ---- a/src/video/uikit/SDL_uikitopenglview.m Mon Aug 29 00:27:43 2011 -0400 -+++ b/src/video/uikit/SDL_uikitopenglview.m Mon Aug 29 23:56:04 2011 +0200 -@@ -123,8 +123,8 @@ - - // !!! FIXME: use the screen this is on! - /* Use the main screen scale (for retina display support) */ -- if ([[UIScreen mainScreen] respondsToSelector:@selector(scale)]) -- self.contentScaleFactor = [UIScreen mainScreen].scale; -+ if ([self respondsToSelector:@selector(contentScaleFactor)]) -+ self.contentScaleFactor = [[UIScreen mainScreen] scale]; - - self.autoresizingMask = 0; // don't allow autoresize, since we need to do some magic in -(void)updateFrame. - } -@@ -152,8 +152,8 @@ - - // !!! FIXME: use the screen this is on! - /* Use the main screen scale (for retina display support) */ -- if ([[UIScreen mainScreen] respondsToSelector:@selector(scale)]) -- self.contentScaleFactor = [UIScreen mainScreen].scale; -+ if ([self respondsToSelector:@selector(contentScaleFactor)]) -+ self.contentScaleFactor = [[UIScreen mainScreen] scale]; - } - - - (void)setCurrentContext { -diff -r 91c9a69dd2ad src/video/uikit/SDL_uikitvideo.m ---- a/src/video/uikit/SDL_uikitvideo.m Mon Aug 29 00:27:43 2011 -0400 -+++ b/src/video/uikit/SDL_uikitvideo.m Mon Aug 29 23:56:04 2011 +0200 -@@ -245,12 +245,8 @@ - const CGRect rect = [uiscreen bounds]; - UIKit_AddDisplay(uiscreen, uiscreenmode, (int)rect.size.width, (int)rect.size.height); - } else { -- const NSArray *screens = [UIScreen screens]; -- const NSUInteger screen_count = [screens count]; -- NSUInteger i; -- for (i = 0; i < screen_count; i++) { -+ for (UIScreen *uiscreen in [UIScreen screens]) { - // the main screen is the first element in the array. -- UIScreen *uiscreen = (UIScreen *) [screens objectAtIndex:i]; - UIScreenMode *uiscreenmode = [uiscreen currentMode]; - const CGSize size = [[uiscreen currentMode] size]; - UIKit_AddDisplay(uiscreen, uiscreenmode, (int)size.width, (int)size.height); -@@ -286,6 +282,9 @@ - UIScreen *uiscreen = (UIScreen *) display->driverdata; - [uiscreen release]; - display->driverdata = NULL; -+ UIScreenMode *desktopmode = (UIScreenMode *) display->desktop_mode.driverdata; -+ [desktopmode release]; -+ display->desktop_mode.driverdata = NULL; - for (j = 0; j < display->num_display_modes; j++) { - SDL_DisplayMode *mode = &display->display_modes[j]; - UIScreenMode *uimode = (UIScreenMode *) mode->driverdata; -diff -r 91c9a69dd2ad src/video/uikit/SDL_uikitviewcontroller.m ---- a/src/video/uikit/SDL_uikitviewcontroller.m Mon Aug 29 00:27:43 2011 -0400 -+++ b/src/video/uikit/SDL_uikitviewcontroller.m Mon Aug 29 23:56:04 2011 +0200 -@@ -138,7 +138,7 @@ - frame.origin.x = 0; - frame.origin.y = 0; - -- [uiwindow setFrame:frame]; -+ [uiwindow setFrame:[[UIScreen mainScreen] bounds]]; - [data->view updateFrame]; - SDL_SendWindowEvent(self->window, SDL_WINDOWEVENT_RESIZED, w, h); - }