author | unc0rr |
Mon, 21 Mar 2011 21:23:39 +0300 | |
changeset 5036 | cb5fa93c7ae0 |
parent 5004 | 2efa6a414518 |
child 5106 | 517bdd3865f1 |
permissions | -rw-r--r-- |
5004
2efa6a414518
update some sdl-1.3 bindings (working up to rev 5296)
koda
parents:
4945
diff
changeset
|
1 |
diff -r 48067bfc300c Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj |
2efa6a414518
update some sdl-1.3 bindings (working up to rev 5296)
koda
parents:
4945
diff
changeset
|
2 |
--- a/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj Mon Feb 14 11:50:18 2011 -0600 |
2efa6a414518
update some sdl-1.3 bindings (working up to rev 5296)
koda
parents:
4945
diff
changeset
|
3 |
+++ b/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj Sun Mar 13 18:22:16 2011 +0100 |
2efa6a414518
update some sdl-1.3 bindings (working up to rev 5296)
koda
parents:
4945
diff
changeset
|
4 |
@@ -1695,6 +1695,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; |
3978 | 11 |
IPHONEOS_DEPLOYMENT_TARGET = 3.1; |
5004
2efa6a414518
update some sdl-1.3 bindings (working up to rev 5296)
koda
parents:
4945
diff
changeset
|
12 |
@@ -1712,6 +1713,7 @@ |
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; |
3978 | 19 |
IPHONEOS_DEPLOYMENT_TARGET = 3.1; |
5004
2efa6a414518
update some sdl-1.3 bindings (working up to rev 5296)
koda
parents:
4945
diff
changeset
|
20 |
diff -r 48067bfc300c include/SDL_config_iphoneos.h |
2efa6a414518
update some sdl-1.3 bindings (working up to rev 5296)
koda
parents:
4945
diff
changeset
|
21 |
--- a/include/SDL_config_iphoneos.h Mon Feb 14 11:50:18 2011 -0600 |
2efa6a414518
update some sdl-1.3 bindings (working up to rev 5296)
koda
parents:
4945
diff
changeset
|
22 |
+++ b/include/SDL_config_iphoneos.h Sun Mar 13 18:22:16 2011 +0100 |
4773
69f8431a5d20
yay, sdl resumed development and accepted some of our patches in mainstream
koda
parents:
4454
diff
changeset
|
23 |
@@ -119,7 +119,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 |
4933 | 32 |
@@ -140,15 +140,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 | 42 |
-#define SDL_VIDEO_RENDER_OGL_ES2 1 |
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 |
4933 | 54 |
@@ -158,4 +161,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 */ |
5004
2efa6a414518
update some sdl-1.3 bindings (working up to rev 5296)
koda
parents:
4945
diff
changeset
|
62 |
diff -r 48067bfc300c src/video/uikit/SDL_uikitappdelegate.m |
2efa6a414518
update some sdl-1.3 bindings (working up to rev 5296)
koda
parents:
4945
diff
changeset
|
63 |
--- a/src/video/uikit/SDL_uikitappdelegate.m Mon Feb 14 11:50:18 2011 -0600 |
2efa6a414518
update some sdl-1.3 bindings (working up to rev 5296)
koda
parents:
4945
diff
changeset
|
64 |
+++ b/src/video/uikit/SDL_uikitappdelegate.m Sun Mar 13 18:22:16 2011 +0100 |
2efa6a414518
update some sdl-1.3 bindings (working up to rev 5296)
koda
parents:
4945
diff
changeset
|
65 |
@@ -35,6 +35,7 @@ |
2efa6a414518
update some sdl-1.3 bindings (working up to rev 5296)
koda
parents:
4945
diff
changeset
|
66 |
static int forward_argc; |
2efa6a414518
update some sdl-1.3 bindings (working up to rev 5296)
koda
parents:
4945
diff
changeset
|
67 |
static char **forward_argv; |
2efa6a414518
update some sdl-1.3 bindings (working up to rev 5296)
koda
parents:
4945
diff
changeset
|
68 |
|
2efa6a414518
update some sdl-1.3 bindings (working up to rev 5296)
koda
parents:
4945
diff
changeset
|
69 |
+#if 0 |
2efa6a414518
update some sdl-1.3 bindings (working up to rev 5296)
koda
parents:
4945
diff
changeset
|
70 |
int main(int argc, char **argv) { |
4945
541d35d1f2e8
in the cocoa ammomenu show descriptions properly for lower weapons
koda
parents:
4934
diff
changeset
|
71 |
|
5004
2efa6a414518
update some sdl-1.3 bindings (working up to rev 5296)
koda
parents:
4945
diff
changeset
|
72 |
int i; |
2efa6a414518
update some sdl-1.3 bindings (working up to rev 5296)
koda
parents:
4945
diff
changeset
|
73 |
@@ -55,6 +56,7 @@ |
2efa6a414518
update some sdl-1.3 bindings (working up to rev 5296)
koda
parents:
4945
diff
changeset
|
74 |
[pool release]; |
2efa6a414518
update some sdl-1.3 bindings (working up to rev 5296)
koda
parents:
4945
diff
changeset
|
75 |
|
2efa6a414518
update some sdl-1.3 bindings (working up to rev 5296)
koda
parents:
4945
diff
changeset
|
76 |
} |
2efa6a414518
update some sdl-1.3 bindings (working up to rev 5296)
koda
parents:
4945
diff
changeset
|
77 |
+#endif |
2efa6a414518
update some sdl-1.3 bindings (working up to rev 5296)
koda
parents:
4945
diff
changeset
|
78 |
|
2efa6a414518
update some sdl-1.3 bindings (working up to rev 5296)
koda
parents:
4945
diff
changeset
|
79 |
@implementation SDLUIKitDelegate |
2efa6a414518
update some sdl-1.3 bindings (working up to rev 5296)
koda
parents:
4945
diff
changeset
|
80 |
|
2efa6a414518
update some sdl-1.3 bindings (working up to rev 5296)
koda
parents:
4945
diff
changeset
|
81 |
diff -r 48067bfc300c src/video/uikit/SDL_uikitopengles.m |
2efa6a414518
update some sdl-1.3 bindings (working up to rev 5296)
koda
parents:
4945
diff
changeset
|
82 |
--- a/src/video/uikit/SDL_uikitopengles.m Mon Feb 14 11:50:18 2011 -0600 |
2efa6a414518
update some sdl-1.3 bindings (working up to rev 5296)
koda
parents:
4945
diff
changeset
|
83 |
+++ b/src/video/uikit/SDL_uikitopengles.m Sun Mar 13 18:22:16 2011 +0100 |
4934 | 84 |
@@ -117,6 +117,7 @@ |
85 |
majorVersion: _this->gl_config.major_version]; |
|
86 |
||
87 |
data->view = view; |
|
88 |
+ view.tag = SDL_VIEW_TAG; |
|
89 |
||
90 |
/* add the view to our window */ |
|
91 |
[uiwindow addSubview: view ]; |