1 diff -r 834ce48a19c2 Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj |
1 diff -r d716dff4b13e Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj |
2 --- a/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj Sun May 09 12:58:58 2010 +0800 |
2 --- a/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj Thu Dec 02 11:56:23 2010 -0800 |
3 +++ b/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj Sun Nov 28 18:14:58 2010 +0100 |
3 +++ b/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj Thu Dec 02 22:38:57 2010 +0100 |
4 @@ -1262,7 +1262,14 @@ |
4 @@ -1262,7 +1262,14 @@ |
5 isa = PBXProject; |
5 isa = PBXProject; |
6 buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "SDLiPhoneOS" */; |
6 buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "SDLiPhoneOS" */; |
7 compatibilityVersion = "Xcode 3.1"; |
7 compatibilityVersion = "Xcode 3.1"; |
8 + developmentRegion = English; |
8 + developmentRegion = English; |
57 - SDKROOT = iphoneos3.2; |
57 - SDKROOT = iphoneos3.2; |
58 + SDKROOT = iphoneos; |
58 + SDKROOT = iphoneos; |
59 TARGETED_DEVICE_FAMILY = "1,2"; |
59 TARGETED_DEVICE_FAMILY = "1,2"; |
60 }; |
60 }; |
61 name = Release; |
61 name = Release; |
62 diff -r 834ce48a19c2 Xcode-iPhoneOS/SDL/testsdl-Info.plist |
62 diff -r d716dff4b13e Xcode-iPhoneOS/SDL/testsdl-Info.plist |
63 --- a/Xcode-iPhoneOS/SDL/testsdl-Info.plist Sun May 09 12:58:58 2010 +0800 |
63 --- a/Xcode-iPhoneOS/SDL/testsdl-Info.plist Thu Dec 02 11:56:23 2010 -0800 |
64 +++ b/Xcode-iPhoneOS/SDL/testsdl-Info.plist Sun Nov 28 18:14:58 2010 +0100 |
64 +++ b/Xcode-iPhoneOS/SDL/testsdl-Info.plist Thu Dec 02 22:38:57 2010 +0100 |
65 @@ -16,7 +16,5 @@ |
65 @@ -16,7 +16,5 @@ |
66 <string>????</string> |
66 <string>????</string> |
67 <key>CFBundleVersion</key> |
67 <key>CFBundleVersion</key> |
68 <string>1.0</string> |
68 <string>1.0</string> |
69 - <key>NSMainNibFile</key> |
69 - <key>NSMainNibFile</key> |
70 - <string>MainWindow</string> |
70 - <string>MainWindow</string> |
71 </dict> |
71 </dict> |
72 </plist> |
72 </plist> |
73 diff -r 834ce48a19c2 include/SDL_config_iphoneos.h |
73 diff -r d716dff4b13e include/SDL_config_iphoneos.h |
74 --- a/include/SDL_config_iphoneos.h Sun May 09 12:58:58 2010 +0800 |
74 --- a/include/SDL_config_iphoneos.h Thu Dec 02 11:56:23 2010 -0800 |
75 +++ b/include/SDL_config_iphoneos.h Sun Nov 28 18:14:58 2010 +0100 |
75 +++ b/include/SDL_config_iphoneos.h Thu Dec 02 22:38:57 2010 +0100 |
76 @@ -98,6 +98,8 @@ |
76 @@ -98,6 +98,8 @@ |
77 #define HAVE_COS 1 |
77 #define HAVE_COS 1 |
78 #define HAVE_COSF 1 |
78 #define HAVE_COSF 1 |
79 #define HAVE_FABS 1 |
79 #define HAVE_FABS 1 |
80 +#define HAVE_ATAN 1 |
80 +#define HAVE_ATAN 1 |
106 |
106 |
107 +/* Tag to grab the uikit view from external code for further modification */ |
107 +/* Tag to grab the uikit view from external code for further modification */ |
108 +#define SDL_VIEW_TAG 456987 |
108 +#define SDL_VIEW_TAG 456987 |
109 + |
109 + |
110 #endif /* _SDL_config_iphoneos_h */ |
110 #endif /* _SDL_config_iphoneos_h */ |
111 diff -r 834ce48a19c2 src/SDL_fatal.c |
111 diff -r d716dff4b13e src/SDL_fatal.c |
112 --- a/src/SDL_fatal.c Sun May 09 12:58:58 2010 +0800 |
112 --- a/src/SDL_fatal.c Thu Dec 02 11:56:23 2010 -0800 |
113 +++ b/src/SDL_fatal.c Sun Nov 28 18:14:58 2010 +0100 |
113 +++ b/src/SDL_fatal.c Thu Dec 02 22:38:57 2010 +0100 |
114 @@ -38,9 +38,9 @@ |
114 @@ -38,9 +38,9 @@ |
115 static void |
115 static void |
116 SDL_Parachute(int sig) |
116 SDL_Parachute(int sig) |
117 { |
117 { |
118 - signal(sig, SIG_DFL); |
118 - signal(sig, SIG_DFL); |
121 - raise(sig); |
121 - raise(sig); |
122 + raise(sig);*/ |
122 + raise(sig);*/ |
123 } |
123 } |
124 |
124 |
125 static const int SDL_fatal_signals[] = { |
125 static const int SDL_fatal_signals[] = { |
126 diff -r 834ce48a19c2 src/video/SDL_renderer_gles.c |
126 diff -r d716dff4b13e src/video/SDL_renderer_gles.c |
127 --- a/src/video/SDL_renderer_gles.c Sun May 09 12:58:58 2010 +0800 |
127 --- a/src/video/SDL_renderer_gles.c Thu Dec 02 11:56:23 2010 -0800 |
128 +++ b/src/video/SDL_renderer_gles.c Sun Nov 28 18:14:58 2010 +0100 |
128 +++ b/src/video/SDL_renderer_gles.c Thu Dec 02 22:38:57 2010 +0100 |
129 @@ -324,6 +324,9 @@ |
129 @@ -324,6 +324,9 @@ |
130 data->glDisable(GL_CULL_FACE); |
130 data->glDisable(GL_CULL_FACE); |
131 data->updateSize = SDL_TRUE; |
131 data->updateSize = SDL_TRUE; |
132 |
132 |
133 + data->glEnableClientState(GL_VERTEX_ARRAY); |
133 + data->glEnableClientState(GL_VERTEX_ARRAY); |
205 - data->glDisableClientState(GL_TEXTURE_COORD_ARRAY); |
205 - data->glDisableClientState(GL_TEXTURE_COORD_ARRAY); |
206 - data->glDisableClientState(GL_VERTEX_ARRAY); |
206 - data->glDisableClientState(GL_VERTEX_ARRAY); |
207 } |
207 } |
208 |
208 |
209 data->glDisable(GL_TEXTURE_2D); |
209 data->glDisable(GL_TEXTURE_2D); |
210 diff -r 834ce48a19c2 src/video/SDL_video.c |
210 diff -r d716dff4b13e src/video/SDL_video.c |
211 --- a/src/video/SDL_video.c Sun May 09 12:58:58 2010 +0800 |
211 --- a/src/video/SDL_video.c Thu Dec 02 11:56:23 2010 -0800 |
212 +++ b/src/video/SDL_video.c Sun Nov 28 18:14:58 2010 +0100 |
212 +++ b/src/video/SDL_video.c Thu Dec 02 22:38:57 2010 +0100 |
213 @@ -1421,9 +1421,9 @@ |
213 @@ -1421,9 +1421,9 @@ |
214 SDL_MinimizeWindow(window); |
214 SDL_MinimizeWindow(window); |
215 } |
215 } |
216 |
216 |
217 - if (display->gamma && _this->SetDisplayGammaRamp) { |
217 - if (display->gamma && _this->SetDisplayGammaRamp) { |
220 - } |
220 - } |
221 + }*/ |
221 + }*/ |
222 if ((window->flags & (SDL_WINDOW_INPUT_GRABBED | SDL_WINDOW_FULLSCREEN)) |
222 if ((window->flags & (SDL_WINDOW_INPUT_GRABBED | SDL_WINDOW_FULLSCREEN)) |
223 && _this->SetWindowGrab) { |
223 && _this->SetWindowGrab) { |
224 _this->SetWindowGrab(_this, window); |
224 _this->SetWindowGrab(_this, window); |
225 diff -r 834ce48a19c2 src/video/uikit/SDL_uikitopengles.m |
225 diff -r d716dff4b13e src/video/uikit/SDL_uikitopengles.m |
226 --- a/src/video/uikit/SDL_uikitopengles.m Sun May 09 12:58:58 2010 +0800 |
226 --- a/src/video/uikit/SDL_uikitopengles.m Thu Dec 02 11:56:23 2010 -0800 |
227 +++ b/src/video/uikit/SDL_uikitopengles.m Sun Nov 28 18:14:58 2010 +0100 |
227 +++ b/src/video/uikit/SDL_uikitopengles.m Thu Dec 02 22:38:57 2010 +0100 |
228 @@ -114,8 +114,8 @@ |
228 @@ -114,8 +114,8 @@ |
229 bBits: _this->gl_config.blue_size \ |
229 bBits: _this->gl_config.blue_size \ |
230 aBits: _this->gl_config.alpha_size \ |
230 aBits: _this->gl_config.alpha_size \ |
231 depthBits: _this->gl_config.depth_size]; |
231 depthBits: _this->gl_config.depth_size]; |
232 - |
232 - |
234 + view.tag = SDL_VIEW_TAG; |
234 + view.tag = SDL_VIEW_TAG; |
235 + data->view = view; |
235 + data->view = view; |
236 |
236 |
237 /* add the view to our window */ |
237 /* add the view to our window */ |
238 [uiwindow addSubview: view ]; |
238 [uiwindow addSubview: view ]; |
239 diff -r 834ce48a19c2 src/video/uikit/SDL_uikitview.h |
239 diff -r d716dff4b13e src/video/uikit/SDL_uikitopenglview.m |
240 --- a/src/video/uikit/SDL_uikitview.h Sun May 09 12:58:58 2010 +0800 |
240 --- a/src/video/uikit/SDL_uikitopenglview.m Thu Dec 02 11:56:23 2010 -0800 |
241 +++ b/src/video/uikit/SDL_uikitview.h Sun Nov 28 18:14:58 2010 +0100 |
241 +++ b/src/video/uikit/SDL_uikitopenglview.m Thu Dec 02 22:38:57 2010 +0100 |
|
242 @@ -117,6 +117,8 @@ |
|
243 return NO; |
|
244 } |
|
245 /* end create buffers */ |
|
246 + if ([[UIScreen mainScreen] respondsToSelector:@selector(scale)]) |
|
247 + self.contentScaleFactor = [UIScreen mainScreen].scale; |
|
248 } |
|
249 return self; |
|
250 } |
|
251 diff -r d716dff4b13e src/video/uikit/SDL_uikitview.h |
|
252 --- a/src/video/uikit/SDL_uikitview.h Thu Dec 02 11:56:23 2010 -0800 |
|
253 +++ b/src/video/uikit/SDL_uikitview.h Thu Dec 02 22:38:57 2010 +0100 |
242 @@ -23,11 +23,11 @@ |
254 @@ -23,11 +23,11 @@ |
243 #include "SDL_stdinc.h" |
255 #include "SDL_stdinc.h" |
244 #include "SDL_events.h" |
256 #include "SDL_events.h" |
245 |
257 |
246 -#define IPHONE_TOUCH_EFFICIENT_DANGEROUS |
258 -#define IPHONE_TOUCH_EFFICIENT_DANGEROUS |
252 -#define MAX_SIMULTANEOUS_TOUCHES 5 |
264 -#define MAX_SIMULTANEOUS_TOUCHES 5 |
253 +#define MAX_SIMULTANEOUS_TOUCHES 0 |
265 +#define MAX_SIMULTANEOUS_TOUCHES 0 |
254 #endif |
266 #endif |
255 |
267 |
256 /* *INDENT-OFF* */ |
268 /* *INDENT-OFF* */ |
257 diff -r 834ce48a19c2 src/video/uikit/SDL_uikitview.m |
269 diff -r d716dff4b13e src/video/uikit/SDL_uikitview.m |
258 --- a/src/video/uikit/SDL_uikitview.m Sun May 09 12:58:58 2010 +0800 |
270 --- a/src/video/uikit/SDL_uikitview.m Thu Dec 02 11:56:23 2010 -0800 |
259 +++ b/src/video/uikit/SDL_uikitview.m Sun Nov 28 18:14:58 2010 +0100 |
271 +++ b/src/video/uikit/SDL_uikitview.m Thu Dec 02 22:38:57 2010 +0100 |
260 @@ -35,9 +35,6 @@ |
272 @@ -35,9 +35,6 @@ |
261 @implementation SDL_uikitview |
273 @implementation SDL_uikitview |
262 |
274 |
263 - (void)dealloc { |
275 - (void)dealloc { |
264 -#if SDL_IPHONE_KEYBOARD |
276 -#if SDL_IPHONE_KEYBOARD |
366 + if (data != NULL) |
378 + if (data != NULL) |
367 + view = data->view; |
379 + view = data->view; |
368 |
380 |
369 if (NULL == view) { |
381 if (NULL == view) { |
370 SDL_SetError("Window has no view"); |
382 SDL_SetError("Window has no view"); |
371 diff -r 834ce48a19c2 src/video/uikit/SDL_uikitwindow.m |
383 diff -r d716dff4b13e src/video/uikit/SDL_uikitwindow.m |
372 --- a/src/video/uikit/SDL_uikitwindow.m Sun May 09 12:58:58 2010 +0800 |
384 --- a/src/video/uikit/SDL_uikitwindow.m Thu Dec 02 11:56:23 2010 -0800 |
373 +++ b/src/video/uikit/SDL_uikitwindow.m Sun Nov 28 18:14:58 2010 +0100 |
385 +++ b/src/video/uikit/SDL_uikitwindow.m Thu Dec 02 22:38:57 2010 +0100 |
374 @@ -144,7 +144,10 @@ |
386 @@ -144,7 +144,10 @@ |
375 if (SDL_UIKit_supports_multiple_displays) { |
387 if (SDL_UIKit_supports_multiple_displays) { |
376 [uiwindow setScreen:uiscreen]; |
388 [uiwindow setScreen:uiscreen]; |
377 } |
389 } |
378 - |
390 - |
381 + uiwindow.screen = [[UIScreen screens] objectAtIndex:1]; |
393 + uiwindow.screen = [[UIScreen screens] objectAtIndex:1]; |
382 + |
394 + |
383 if (SetupWindowData(_this, window, uiwindow, SDL_TRUE) < 0) { |
395 if (SetupWindowData(_this, window, uiwindow, SDL_TRUE) < 0) { |
384 [uiwindow release]; |
396 [uiwindow release]; |
385 return -1; |
397 return -1; |
386 diff -r 834ce48a19c2 src/video/uikit/keyinfotable.h |
398 diff -r d716dff4b13e src/video/uikit/keyinfotable.h |
387 --- a/src/video/uikit/keyinfotable.h Sun May 09 12:58:58 2010 +0800 |
399 --- a/src/video/uikit/keyinfotable.h Thu Dec 02 11:56:23 2010 -0800 |
388 +++ b/src/video/uikit/keyinfotable.h Sun Nov 28 18:14:58 2010 +0100 |
400 +++ b/src/video/uikit/keyinfotable.h Thu Dec 02 22:38:57 2010 +0100 |
389 @@ -54,7 +54,7 @@ |
401 @@ -54,7 +54,7 @@ |
390 /* 10 */ { SDL_SCANCODE_UNKNOWN, 0 }, |
402 /* 10 */ { SDL_SCANCODE_UNKNOWN, 0 }, |
391 /* 11 */ { SDL_SCANCODE_UNKNOWN, 0 }, |
403 /* 11 */ { SDL_SCANCODE_UNKNOWN, 0 }, |
392 /* 12 */ { SDL_SCANCODE_UNKNOWN, 0 }, |
404 /* 12 */ { SDL_SCANCODE_UNKNOWN, 0 }, |
393 -/* 13 */ { SDL_SCANCODE_UNKNOWN, 0 }, |
405 -/* 13 */ { SDL_SCANCODE_UNKNOWN, 0 }, |