1 diff -r 1fbe1c202501 Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj |
1 diff -r 1fbe1c202501 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 07 10:40:21 2011 -0800 |
3 +++ b/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj Mon Feb 07 23:21:28 2011 +0100 |
3 +++ b/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj Fri Feb 18 00:09:03 2011 +0100 |
4 @@ -1603,11 +1603,15 @@ |
4 @@ -1603,11 +1603,15 @@ |
5 isa = XCBuildConfiguration; |
5 isa = XCBuildConfiguration; |
6 buildSettings = { |
6 buildSettings = { |
7 ALWAYS_SEARCH_USER_PATHS = NO; |
7 ALWAYS_SEARCH_USER_PATHS = NO; |
8 + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; |
8 + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; |
37 PREBINDING = NO; |
37 PREBINDING = NO; |
38 SDKROOT = iphoneos; |
38 SDKROOT = iphoneos; |
39 TARGETED_DEVICE_FAMILY = "1,2"; |
39 TARGETED_DEVICE_FAMILY = "1,2"; |
40 diff -r 1fbe1c202501 include/SDL_config_iphoneos.h |
40 diff -r 1fbe1c202501 include/SDL_config_iphoneos.h |
41 --- a/include/SDL_config_iphoneos.h Mon Feb 07 10:40:21 2011 -0800 |
41 --- a/include/SDL_config_iphoneos.h Mon Feb 07 10:40:21 2011 -0800 |
42 +++ b/include/SDL_config_iphoneos.h Mon Feb 07 23:21:28 2011 +0100 |
42 +++ b/include/SDL_config_iphoneos.h Fri Feb 18 00:09:03 2011 +0100 |
43 @@ -119,7 +119,7 @@ |
43 @@ -119,7 +119,7 @@ |
44 /* enable iPhone version of Core Audio driver */ |
44 /* enable iPhone version of Core Audio driver */ |
45 #define SDL_AUDIO_DRIVER_COREAUDIOIPHONE 1 |
45 #define SDL_AUDIO_DRIVER_COREAUDIOIPHONE 1 |
46 /* Enable the dummy audio driver (src/audio/dummy/\*.c) */ |
46 /* Enable the dummy audio driver (src/audio/dummy/\*.c) */ |
47 -#define SDL_AUDIO_DRIVER_DUMMY 1 |
47 -#define SDL_AUDIO_DRIVER_DUMMY 1 |
77 |
77 |
78 +/* Tag to grab the uikit view from external code for further modification */ |
78 +/* Tag to grab the uikit view from external code for further modification */ |
79 +#define SDL_VIEW_TAG 456987 |
79 +#define SDL_VIEW_TAG 456987 |
80 + |
80 + |
81 #endif /* _SDL_config_iphoneos_h */ |
81 #endif /* _SDL_config_iphoneos_h */ |
|
82 diff -r 1fbe1c202501 src/video/SDL_video.c |
|
83 --- a/src/video/SDL_video.c Mon Feb 07 10:40:21 2011 -0800 |
|
84 +++ b/src/video/SDL_video.c Fri Feb 18 00:09:03 2011 +0100 |
|
85 @@ -1657,9 +1657,11 @@ |
|
86 SDL_MinimizeWindow(window); |
|
87 } |
|
88 |
|
89 + /* |
|
90 if (display->gamma && _this->SetDisplayGammaRamp) { |
|
91 _this->SetDisplayGammaRamp(_this, display, display->saved_gamma); |
|
92 } |
|
93 + */ |
|
94 if ((window->flags & (SDL_WINDOW_INPUT_GRABBED | SDL_WINDOW_FULLSCREEN)) |
|
95 && _this->SetWindowGrab) { |
|
96 _this->SetWindowGrab(_this, window); |
82 diff -r 1fbe1c202501 src/video/uikit/SDL_uikitopengles.m |
97 diff -r 1fbe1c202501 src/video/uikit/SDL_uikitopengles.m |
83 --- a/src/video/uikit/SDL_uikitopengles.m Mon Feb 07 10:40:21 2011 -0800 |
98 --- a/src/video/uikit/SDL_uikitopengles.m Mon Feb 07 10:40:21 2011 -0800 |
84 +++ b/src/video/uikit/SDL_uikitopengles.m Mon Feb 07 23:21:28 2011 +0100 |
99 +++ b/src/video/uikit/SDL_uikitopengles.m Fri Feb 18 00:09:03 2011 +0100 |
85 @@ -117,6 +117,7 @@ |
100 @@ -117,6 +117,7 @@ |
86 majorVersion: _this->gl_config.major_version]; |
101 majorVersion: _this->gl_config.major_version]; |
87 |
102 |
88 data->view = view; |
103 data->view = view; |
89 + view.tag = SDL_VIEW_TAG; |
104 + view.tag = SDL_VIEW_TAG; |