1 diff -r 8a04b596b472 Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj |
|
2 --- a/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj Tue Apr 05 09:50:25 2011 -0700 |
|
3 +++ b/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj Tue Apr 05 22:19:33 2011 +0200 |
|
4 @@ -1602,6 +1602,7 @@ |
|
5 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; |
|
6 GCC_C_LANGUAGE_STANDARD = c99; |
|
7 GCC_DEBUGGING_SYMBOLS = full; |
|
8 + GCC_THUMB_SUPPORT = NO; |
|
9 GCC_WARN_ABOUT_RETURN_TYPE = YES; |
|
10 GCC_WARN_UNUSED_VARIABLE = NO; |
|
11 IPHONEOS_DEPLOYMENT_TARGET = 3.1.3; |
|
12 @@ -1619,6 +1620,7 @@ |
|
13 ARCHS = "$(ARCHS_STANDARD_32_BIT)"; |
|
14 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; |
|
15 GCC_C_LANGUAGE_STANDARD = c99; |
|
16 + GCC_THUMB_SUPPORT = NO; |
|
17 GCC_WARN_ABOUT_RETURN_TYPE = YES; |
|
18 GCC_WARN_UNUSED_VARIABLE = NO; |
|
19 IPHONEOS_DEPLOYMENT_TARGET = 3.1.3; |
|
20 diff -r 8a04b596b472 include/SDL_config_iphoneos.h |
|
21 --- a/include/SDL_config_iphoneos.h Tue Apr 05 09:50:25 2011 -0700 |
|
22 +++ b/include/SDL_config_iphoneos.h Tue Apr 05 22:19:33 2011 +0200 |
|
23 @@ -107,7 +107,7 @@ |
|
24 /* enable iPhone version of Core Audio driver */ |
|
25 #define SDL_AUDIO_DRIVER_COREAUDIOIPHONE 1 |
|
26 /* Enable the dummy audio driver (src/audio/dummy/\*.c) */ |
|
27 -#define SDL_AUDIO_DRIVER_DUMMY 1 |
|
28 +#define SDL_AUDIO_DRIVER_DUMMY 0 |
|
29 |
|
30 /* Enable the stub haptic driver (src/haptic/dummy/\*.c) */ |
|
31 #define SDL_HAPTIC_DISABLED 1 |
|
32 @@ -128,15 +128,18 @@ |
|
33 |
|
34 /* Supported video drivers */ |
|
35 #define SDL_VIDEO_DRIVER_UIKIT 1 |
|
36 -#define SDL_VIDEO_DRIVER_DUMMY 1 |
|
37 +#define SDL_VIDEO_DRIVER_DUMMY 0 |
|
38 |
|
39 /* enable OpenGL ES */ |
|
40 #define SDL_VIDEO_OPENGL_ES 1 |
|
41 #define SDL_VIDEO_RENDER_OGL_ES 1 |
|
42 -#define SDL_VIDEO_RENDER_OGL_ES2 1 |
|
43 +#define SDL_VIDEO_RENDER_OGL_ES2 0 |
|
44 |
|
45 /* Enable system power support */ |
|
46 -#define SDL_POWER_UIKIT 1 |
|
47 +#define SDL_POWER_UIKIT 0 |
|
48 + |
|
49 +/* enable joystick subsystem */ |
|
50 +#define SDL_JOYSTICK_DISABLED 1 |
|
51 |
|
52 /* enable iPhone keyboard support */ |
|
53 #define SDL_IPHONE_KEYBOARD 1 |
|
54 @@ -146,4 +149,7 @@ |
|
55 */ |
|
56 #define SDL_IPHONE_MAX_GFORCE 5.0 |
|
57 |
|
58 +/* Tag to grab the uikit view from external code for further modification */ |
|
59 +#define SDL_VIEW_TAG 456987 |
|
60 + |
|
61 #endif /* _SDL_config_iphoneos_h */ |
|
62 diff -r 8a04b596b472 src/video/uikit/SDL_uikitopengles.m |
|
63 --- a/src/video/uikit/SDL_uikitopengles.m Tue Apr 05 09:50:25 2011 -0700 |
|
64 +++ b/src/video/uikit/SDL_uikitopengles.m Tue Apr 05 22:19:33 2011 +0200 |
|
65 @@ -117,6 +117,7 @@ |
|
66 majorVersion: _this->gl_config.major_version]; |
|
67 |
|
68 data->view = view; |
|
69 + view.tag = SDL_VIEW_TAG; |
|
70 view->viewcontroller = data->viewcontroller; |
|
71 if (view->viewcontroller != nil) { |
|
72 [view->viewcontroller setView:view]; |
|