project_files/HedgewarsMobile/SDL.patch
author unc0rr
Sun, 17 Apr 2011 22:16:36 +0400
branchcursor_issues
changeset 5149 9aa840fdf922
parent 5106 517bdd3865f1
permissions -rw-r--r--
Try to allow cursor to reach water when zooming out
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5106
517bdd3865f1 wow we're getting famous http://hg.libsdl.org/SDL/rev/8a04b596b472
koda
parents: 5004
diff changeset
     1
diff -r 8a04b596b472 Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj
517bdd3865f1 wow we're getting famous http://hg.libsdl.org/SDL/rev/8a04b596b472
koda
parents: 5004
diff changeset
     2
--- a/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj	Tue Apr 05 09:50:25 2011 -0700
517bdd3865f1 wow we're getting famous http://hg.libsdl.org/SDL/rev/8a04b596b472
koda
parents: 5004
diff changeset
     3
+++ b/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj	Tue Apr 05 22:19:33 2011 +0200
517bdd3865f1 wow we're getting famous http://hg.libsdl.org/SDL/rev/8a04b596b472
koda
parents: 5004
diff changeset
     4
@@ -1602,6 +1602,7 @@
3923
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
     5
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
     6
 				GCC_C_LANGUAGE_STANDARD = c99;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
     7
 				GCC_DEBUGGING_SYMBOLS = full;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
     8
+				GCC_THUMB_SUPPORT = NO;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
     9
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    10
 				GCC_WARN_UNUSED_VARIABLE = NO;
5106
517bdd3865f1 wow we're getting famous http://hg.libsdl.org/SDL/rev/8a04b596b472
koda
parents: 5004
diff changeset
    11
 				IPHONEOS_DEPLOYMENT_TARGET = 3.1.3;
517bdd3865f1 wow we're getting famous http://hg.libsdl.org/SDL/rev/8a04b596b472
koda
parents: 5004
diff changeset
    12
@@ -1619,6 +1620,7 @@
5004
2efa6a414518 update some sdl-1.3 bindings (working up to rev 5296)
koda
parents: 4945
diff changeset
    13
 				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
3923
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    14
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    15
 				GCC_C_LANGUAGE_STANDARD = c99;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    16
+				GCC_THUMB_SUPPORT = NO;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    17
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    18
 				GCC_WARN_UNUSED_VARIABLE = NO;
5106
517bdd3865f1 wow we're getting famous http://hg.libsdl.org/SDL/rev/8a04b596b472
koda
parents: 5004
diff changeset
    19
 				IPHONEOS_DEPLOYMENT_TARGET = 3.1.3;
517bdd3865f1 wow we're getting famous http://hg.libsdl.org/SDL/rev/8a04b596b472
koda
parents: 5004
diff changeset
    20
diff -r 8a04b596b472 include/SDL_config_iphoneos.h
517bdd3865f1 wow we're getting famous http://hg.libsdl.org/SDL/rev/8a04b596b472
koda
parents: 5004
diff changeset
    21
--- a/include/SDL_config_iphoneos.h	Tue Apr 05 09:50:25 2011 -0700
517bdd3865f1 wow we're getting famous http://hg.libsdl.org/SDL/rev/8a04b596b472
koda
parents: 5004
diff changeset
    22
+++ b/include/SDL_config_iphoneos.h	Tue Apr 05 22:19:33 2011 +0200
517bdd3865f1 wow we're getting famous http://hg.libsdl.org/SDL/rev/8a04b596b472
koda
parents: 5004
diff changeset
    23
@@ -107,7 +107,7 @@
3923
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    24
 /* enable iPhone version of Core Audio driver */
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    25
 #define SDL_AUDIO_DRIVER_COREAUDIOIPHONE 1
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    26
 /* Enable the dummy audio driver (src/audio/dummy/\*.c) */
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    27
-#define SDL_AUDIO_DRIVER_DUMMY	1
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    28
+#define SDL_AUDIO_DRIVER_DUMMY	0
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    29
 
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    30
 /* Enable the stub haptic driver (src/haptic/dummy/\*.c) */
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    31
 #define SDL_HAPTIC_DISABLED	1
5106
517bdd3865f1 wow we're getting famous http://hg.libsdl.org/SDL/rev/8a04b596b472
koda
parents: 5004
diff changeset
    32
@@ -128,15 +128,18 @@
3923
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    33
 
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    34
 /* Supported video drivers */
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    35
 #define SDL_VIDEO_DRIVER_UIKIT	1
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    36
-#define SDL_VIDEO_DRIVER_DUMMY	1
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    37
+#define SDL_VIDEO_DRIVER_DUMMY	0
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    38
 
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    39
 /* enable OpenGL ES */
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    40
 #define SDL_VIDEO_OPENGL_ES	1
4773
69f8431a5d20 yay, sdl resumed development and accepted some of our patches in mainstream
koda
parents: 4454
diff changeset
    41
 #define SDL_VIDEO_RENDER_OGL_ES	1
4933
86bd82d58a0b update sdl apis to use the new rendering functions
koda
parents: 4773
diff changeset
    42
-#define SDL_VIDEO_RENDER_OGL_ES2	1
86bd82d58a0b update sdl apis to use the new rendering functions
koda
parents: 4773
diff changeset
    43
+#define SDL_VIDEO_RENDER_OGL_ES2	0
4773
69f8431a5d20 yay, sdl resumed development and accepted some of our patches in mainstream
koda
parents: 4454
diff changeset
    44
 
69f8431a5d20 yay, sdl resumed development and accepted some of our patches in mainstream
koda
parents: 4454
diff changeset
    45
 /* Enable system power support */
69f8431a5d20 yay, sdl resumed development and accepted some of our patches in mainstream
koda
parents: 4454
diff changeset
    46
-#define SDL_POWER_UIKIT 1
69f8431a5d20 yay, sdl resumed development and accepted some of our patches in mainstream
koda
parents: 4454
diff changeset
    47
+#define SDL_POWER_UIKIT 0
69f8431a5d20 yay, sdl resumed development and accepted some of our patches in mainstream
koda
parents: 4454
diff changeset
    48
+
69f8431a5d20 yay, sdl resumed development and accepted some of our patches in mainstream
koda
parents: 4454
diff changeset
    49
+/* enable joystick subsystem */
69f8431a5d20 yay, sdl resumed development and accepted some of our patches in mainstream
koda
parents: 4454
diff changeset
    50
+#define SDL_JOYSTICK_DISABLED 1
69f8431a5d20 yay, sdl resumed development and accepted some of our patches in mainstream
koda
parents: 4454
diff changeset
    51
 
69f8431a5d20 yay, sdl resumed development and accepted some of our patches in mainstream
koda
parents: 4454
diff changeset
    52
 /* enable iPhone keyboard support */
69f8431a5d20 yay, sdl resumed development and accepted some of our patches in mainstream
koda
parents: 4454
diff changeset
    53
 #define SDL_IPHONE_KEYBOARD 1
5106
517bdd3865f1 wow we're getting famous http://hg.libsdl.org/SDL/rev/8a04b596b472
koda
parents: 5004
diff changeset
    54
@@ -146,4 +149,7 @@
3923
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    55
  */
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    56
 #define SDL_IPHONE_MAX_GFORCE 5.0
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    57
 
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    58
+/* Tag to grab the uikit view from external code for further modification */
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    59
+#define SDL_VIEW_TAG 456987
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    60
+
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    61
 #endif /* _SDL_config_iphoneos_h */
5106
517bdd3865f1 wow we're getting famous http://hg.libsdl.org/SDL/rev/8a04b596b472
koda
parents: 5004
diff changeset
    62
diff -r 8a04b596b472 src/video/uikit/SDL_uikitopengles.m
517bdd3865f1 wow we're getting famous http://hg.libsdl.org/SDL/rev/8a04b596b472
koda
parents: 5004
diff changeset
    63
--- a/src/video/uikit/SDL_uikitopengles.m	Tue Apr 05 09:50:25 2011 -0700
517bdd3865f1 wow we're getting famous http://hg.libsdl.org/SDL/rev/8a04b596b472
koda
parents: 5004
diff changeset
    64
+++ b/src/video/uikit/SDL_uikitopengles.m	Tue Apr 05 22:19:33 2011 +0200
4934
727da72f754a i obviously forgot one piece
koda
parents: 4933
diff changeset
    65
@@ -117,6 +117,7 @@
727da72f754a i obviously forgot one piece
koda
parents: 4933
diff changeset
    66
                                     majorVersion: _this->gl_config.major_version];
727da72f754a i obviously forgot one piece
koda
parents: 4933
diff changeset
    67
     
727da72f754a i obviously forgot one piece
koda
parents: 4933
diff changeset
    68
     data->view = view;
727da72f754a i obviously forgot one piece
koda
parents: 4933
diff changeset
    69
+    view.tag = SDL_VIEW_TAG;
5106
517bdd3865f1 wow we're getting famous http://hg.libsdl.org/SDL/rev/8a04b596b472
koda
parents: 5004
diff changeset
    70
     view->viewcontroller = data->viewcontroller;
517bdd3865f1 wow we're getting famous http://hg.libsdl.org/SDL/rev/8a04b596b472
koda
parents: 5004
diff changeset
    71
     if (view->viewcontroller != nil) {
517bdd3865f1 wow we're getting famous http://hg.libsdl.org/SDL/rev/8a04b596b472
koda
parents: 5004
diff changeset
    72
         [view->viewcontroller setView:view];