1 diff -r 48067bfc300c Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj |
1 diff -r 8a04b596b472 Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj |
2 --- a/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj Mon Feb 14 11:50:18 2011 -0600 |
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 Sun Mar 13 18:22:16 2011 +0100 |
3 +++ b/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj Tue Apr 05 22:19:33 2011 +0200 |
4 @@ -1695,6 +1695,7 @@ |
4 @@ -1602,6 +1602,7 @@ |
5 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; |
5 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; |
6 GCC_C_LANGUAGE_STANDARD = c99; |
6 GCC_C_LANGUAGE_STANDARD = c99; |
7 GCC_DEBUGGING_SYMBOLS = full; |
7 GCC_DEBUGGING_SYMBOLS = full; |
8 + GCC_THUMB_SUPPORT = NO; |
8 + GCC_THUMB_SUPPORT = NO; |
9 GCC_WARN_ABOUT_RETURN_TYPE = YES; |
9 GCC_WARN_ABOUT_RETURN_TYPE = YES; |
10 GCC_WARN_UNUSED_VARIABLE = NO; |
10 GCC_WARN_UNUSED_VARIABLE = NO; |
11 IPHONEOS_DEPLOYMENT_TARGET = 3.1; |
11 IPHONEOS_DEPLOYMENT_TARGET = 3.1.3; |
12 @@ -1712,6 +1713,7 @@ |
12 @@ -1619,6 +1620,7 @@ |
13 ARCHS = "$(ARCHS_STANDARD_32_BIT)"; |
13 ARCHS = "$(ARCHS_STANDARD_32_BIT)"; |
14 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; |
14 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; |
15 GCC_C_LANGUAGE_STANDARD = c99; |
15 GCC_C_LANGUAGE_STANDARD = c99; |
16 + GCC_THUMB_SUPPORT = NO; |
16 + GCC_THUMB_SUPPORT = NO; |
17 GCC_WARN_ABOUT_RETURN_TYPE = YES; |
17 GCC_WARN_ABOUT_RETURN_TYPE = YES; |
18 GCC_WARN_UNUSED_VARIABLE = NO; |
18 GCC_WARN_UNUSED_VARIABLE = NO; |
19 IPHONEOS_DEPLOYMENT_TARGET = 3.1; |
19 IPHONEOS_DEPLOYMENT_TARGET = 3.1.3; |
20 diff -r 48067bfc300c include/SDL_config_iphoneos.h |
20 diff -r 8a04b596b472 include/SDL_config_iphoneos.h |
21 --- a/include/SDL_config_iphoneos.h Mon Feb 14 11:50:18 2011 -0600 |
21 --- a/include/SDL_config_iphoneos.h Tue Apr 05 09:50:25 2011 -0700 |
22 +++ b/include/SDL_config_iphoneos.h Sun Mar 13 18:22:16 2011 +0100 |
22 +++ b/include/SDL_config_iphoneos.h Tue Apr 05 22:19:33 2011 +0200 |
23 @@ -119,7 +119,7 @@ |
23 @@ -107,7 +107,7 @@ |
24 /* enable iPhone version of Core Audio driver */ |
24 /* enable iPhone version of Core Audio driver */ |
25 #define SDL_AUDIO_DRIVER_COREAUDIOIPHONE 1 |
25 #define SDL_AUDIO_DRIVER_COREAUDIOIPHONE 1 |
26 /* Enable the dummy audio driver (src/audio/dummy/\*.c) */ |
26 /* Enable the dummy audio driver (src/audio/dummy/\*.c) */ |
27 -#define SDL_AUDIO_DRIVER_DUMMY 1 |
27 -#define SDL_AUDIO_DRIVER_DUMMY 1 |
28 +#define SDL_AUDIO_DRIVER_DUMMY 0 |
28 +#define SDL_AUDIO_DRIVER_DUMMY 0 |
29 |
29 |
30 /* Enable the stub haptic driver (src/haptic/dummy/\*.c) */ |
30 /* Enable the stub haptic driver (src/haptic/dummy/\*.c) */ |
31 #define SDL_HAPTIC_DISABLED 1 |
31 #define SDL_HAPTIC_DISABLED 1 |
32 @@ -140,15 +140,18 @@ |
32 @@ -128,15 +128,18 @@ |
33 |
33 |
34 /* Supported video drivers */ |
34 /* Supported video drivers */ |
35 #define SDL_VIDEO_DRIVER_UIKIT 1 |
35 #define SDL_VIDEO_DRIVER_UIKIT 1 |
36 -#define SDL_VIDEO_DRIVER_DUMMY 1 |
36 -#define SDL_VIDEO_DRIVER_DUMMY 1 |
37 +#define SDL_VIDEO_DRIVER_DUMMY 0 |
37 +#define SDL_VIDEO_DRIVER_DUMMY 0 |
49 +/* enable joystick subsystem */ |
49 +/* enable joystick subsystem */ |
50 +#define SDL_JOYSTICK_DISABLED 1 |
50 +#define SDL_JOYSTICK_DISABLED 1 |
51 |
51 |
52 /* enable iPhone keyboard support */ |
52 /* enable iPhone keyboard support */ |
53 #define SDL_IPHONE_KEYBOARD 1 |
53 #define SDL_IPHONE_KEYBOARD 1 |
54 @@ -158,4 +161,7 @@ |
54 @@ -146,4 +149,7 @@ |
55 */ |
55 */ |
56 #define SDL_IPHONE_MAX_GFORCE 5.0 |
56 #define SDL_IPHONE_MAX_GFORCE 5.0 |
57 |
57 |
58 +/* Tag to grab the uikit view from external code for further modification */ |
58 +/* Tag to grab the uikit view from external code for further modification */ |
59 +#define SDL_VIEW_TAG 456987 |
59 +#define SDL_VIEW_TAG 456987 |
60 + |
60 + |
61 #endif /* _SDL_config_iphoneos_h */ |
61 #endif /* _SDL_config_iphoneos_h */ |
62 diff -r 48067bfc300c src/video/uikit/SDL_uikitappdelegate.m |
62 diff -r 8a04b596b472 src/video/uikit/SDL_uikitopengles.m |
63 --- a/src/video/uikit/SDL_uikitappdelegate.m Mon Feb 14 11:50:18 2011 -0600 |
63 --- a/src/video/uikit/SDL_uikitopengles.m Tue Apr 05 09:50:25 2011 -0700 |
64 +++ b/src/video/uikit/SDL_uikitappdelegate.m Sun Mar 13 18:22:16 2011 +0100 |
64 +++ b/src/video/uikit/SDL_uikitopengles.m Tue Apr 05 22:19:33 2011 +0200 |
65 @@ -35,6 +35,7 @@ |
|
66 static int forward_argc; |
|
67 static char **forward_argv; |
|
68 |
|
69 +#if 0 |
|
70 int main(int argc, char **argv) { |
|
71 |
|
72 int i; |
|
73 @@ -55,6 +56,7 @@ |
|
74 [pool release]; |
|
75 |
|
76 } |
|
77 +#endif |
|
78 |
|
79 @implementation SDLUIKitDelegate |
|
80 |
|
81 diff -r 48067bfc300c src/video/uikit/SDL_uikitopengles.m |
|
82 --- a/src/video/uikit/SDL_uikitopengles.m Mon Feb 14 11:50:18 2011 -0600 |
|
83 +++ b/src/video/uikit/SDL_uikitopengles.m Sun Mar 13 18:22:16 2011 +0100 |
|
84 @@ -117,6 +117,7 @@ |
65 @@ -117,6 +117,7 @@ |
85 majorVersion: _this->gl_config.major_version]; |
66 majorVersion: _this->gl_config.major_version]; |
86 |
67 |
87 data->view = view; |
68 data->view = view; |
88 + view.tag = SDL_VIEW_TAG; |
69 + view.tag = SDL_VIEW_TAG; |
89 |
70 view->viewcontroller = data->viewcontroller; |
90 /* add the view to our window */ |
71 if (view->viewcontroller != nil) { |
91 [uiwindow addSubview: view ]; |
72 [view->viewcontroller setView:view]; |