1 diff -r 1fbe1c202501 Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj |
1 diff -r 48067bfc300c Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj |
2 --- a/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj Mon Feb 07 10:40:21 2011 -0800 |
2 --- a/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj Mon Feb 14 11:50:18 2011 -0600 |
3 +++ b/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj Fri Feb 18 00:09:03 2011 +0100 |
3 +++ b/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj Sun Mar 13 18:22:16 2011 +0100 |
4 @@ -1603,11 +1603,15 @@ |
4 @@ -1695,6 +1695,7 @@ |
5 isa = XCBuildConfiguration; |
|
6 buildSettings = { |
|
7 ALWAYS_SEARCH_USER_PATHS = NO; |
|
8 + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; |
|
9 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; |
5 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; |
10 GCC_C_LANGUAGE_STANDARD = c99; |
6 GCC_C_LANGUAGE_STANDARD = c99; |
11 GCC_DEBUGGING_SYMBOLS = full; |
7 GCC_DEBUGGING_SYMBOLS = full; |
12 + GCC_THUMB_SUPPORT = NO; |
8 + GCC_THUMB_SUPPORT = NO; |
13 + GCC_VERSION = com.apple.compilers.llvmgcc42; |
|
14 GCC_WARN_ABOUT_RETURN_TYPE = YES; |
9 GCC_WARN_ABOUT_RETURN_TYPE = YES; |
15 GCC_WARN_UNUSED_VARIABLE = NO; |
10 GCC_WARN_UNUSED_VARIABLE = NO; |
16 + HEADER_SEARCH_PATHS = "\"$(SRCROOT)/../../include\""; |
|
17 IPHONEOS_DEPLOYMENT_TARGET = 3.1; |
11 IPHONEOS_DEPLOYMENT_TARGET = 3.1; |
18 ONLY_ACTIVE_ARCH = NO; |
12 @@ -1712,6 +1713,7 @@ |
19 PREBINDING = NO; |
13 ARCHS = "$(ARCHS_STANDARD_32_BIT)"; |
20 @@ -1620,12 +1624,18 @@ |
|
21 isa = XCBuildConfiguration; |
|
22 buildSettings = { |
|
23 ALWAYS_SEARCH_USER_PATHS = NO; |
|
24 - ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)"; |
|
25 + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; |
|
26 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; |
14 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; |
27 GCC_C_LANGUAGE_STANDARD = c99; |
15 GCC_C_LANGUAGE_STANDARD = c99; |
28 + GCC_OPTIMIZATION_LEVEL = s; |
|
29 + GCC_THUMB_SUPPORT = NO; |
16 + GCC_THUMB_SUPPORT = NO; |
30 + GCC_UNROLL_LOOPS = NO; |
|
31 + GCC_VERSION = com.apple.compilers.llvmgcc42; |
|
32 GCC_WARN_ABOUT_RETURN_TYPE = YES; |
17 GCC_WARN_ABOUT_RETURN_TYPE = YES; |
33 GCC_WARN_UNUSED_VARIABLE = NO; |
18 GCC_WARN_UNUSED_VARIABLE = NO; |
34 + HEADER_SEARCH_PATHS = "\"$(SRCROOT)/../../include\""; |
|
35 IPHONEOS_DEPLOYMENT_TARGET = 3.1; |
19 IPHONEOS_DEPLOYMENT_TARGET = 3.1; |
36 + OTHER_CFLAGS = ""; |
20 diff -r 48067bfc300c include/SDL_config_iphoneos.h |
37 PREBINDING = NO; |
21 --- a/include/SDL_config_iphoneos.h Mon Feb 14 11:50:18 2011 -0600 |
38 SDKROOT = iphoneos; |
22 +++ b/include/SDL_config_iphoneos.h Sun Mar 13 18:22:16 2011 +0100 |
39 TARGETED_DEVICE_FAMILY = "1,2"; |
|
40 diff -r 1fbe1c202501 include/SDL_config_iphoneos.h |
|
41 --- a/include/SDL_config_iphoneos.h Mon Feb 07 10:40:21 2011 -0800 |
|
42 +++ b/include/SDL_config_iphoneos.h Fri Feb 18 00:09:03 2011 +0100 |
|
43 @@ -119,7 +119,7 @@ |
23 @@ -119,7 +119,7 @@ |
44 /* enable iPhone version of Core Audio driver */ |
24 /* enable iPhone version of Core Audio driver */ |
45 #define SDL_AUDIO_DRIVER_COREAUDIOIPHONE 1 |
25 #define SDL_AUDIO_DRIVER_COREAUDIOIPHONE 1 |
46 /* Enable the dummy audio driver (src/audio/dummy/\*.c) */ |
26 /* Enable the dummy audio driver (src/audio/dummy/\*.c) */ |
47 -#define SDL_AUDIO_DRIVER_DUMMY 1 |
27 -#define SDL_AUDIO_DRIVER_DUMMY 1 |
77 |
57 |
78 +/* 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 */ |
79 +#define SDL_VIEW_TAG 456987 |
59 +#define SDL_VIEW_TAG 456987 |
80 + |
60 + |
81 #endif /* _SDL_config_iphoneos_h */ |
61 #endif /* _SDL_config_iphoneos_h */ |
82 diff -r 1fbe1c202501 src/video/SDL_video.c |
62 diff -r 48067bfc300c src/video/uikit/SDL_uikitappdelegate.m |
83 --- a/src/video/SDL_video.c Mon Feb 07 10:40:21 2011 -0800 |
63 --- a/src/video/uikit/SDL_uikitappdelegate.m Mon Feb 14 11:50:18 2011 -0600 |
84 +++ b/src/video/SDL_video.c Fri Feb 18 00:09:03 2011 +0100 |
64 +++ b/src/video/uikit/SDL_uikitappdelegate.m Sun Mar 13 18:22:16 2011 +0100 |
85 @@ -1657,9 +1657,11 @@ |
65 @@ -35,6 +35,7 @@ |
86 SDL_MinimizeWindow(window); |
66 static int forward_argc; |
87 } |
67 static char **forward_argv; |
88 |
68 |
89 + /* |
69 +#if 0 |
90 if (display->gamma && _this->SetDisplayGammaRamp) { |
70 int main(int argc, char **argv) { |
91 _this->SetDisplayGammaRamp(_this, display, display->saved_gamma); |
71 |
92 } |
72 int i; |
93 + */ |
73 @@ -55,6 +56,7 @@ |
94 if ((window->flags & (SDL_WINDOW_INPUT_GRABBED | SDL_WINDOW_FULLSCREEN)) |
74 [pool release]; |
95 && _this->SetWindowGrab) { |
75 |
96 _this->SetWindowGrab(_this, window); |
76 } |
97 diff -r 1fbe1c202501 src/video/uikit/SDL_uikitopengles.m |
77 +#endif |
98 --- a/src/video/uikit/SDL_uikitopengles.m Mon Feb 07 10:40:21 2011 -0800 |
78 |
99 +++ b/src/video/uikit/SDL_uikitopengles.m Fri Feb 18 00:09:03 2011 +0100 |
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 |
100 @@ -117,6 +117,7 @@ |
84 @@ -117,6 +117,7 @@ |
101 majorVersion: _this->gl_config.major_version]; |
85 majorVersion: _this->gl_config.major_version]; |
102 |
86 |
103 data->view = view; |
87 data->view = view; |
104 + view.tag = SDL_VIEW_TAG; |
88 + view.tag = SDL_VIEW_TAG; |