1 diff -r c0021a587dc7 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 Oct 10 15:45:58 2010 -0700 |
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 Sat Oct 16 18:35:03 2010 +0200 |
3 +++ b/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj Thu Dec 02 22:38:57 2010 +0100 |
4 @@ -1549,15 +1549,19 @@ |
4 @@ -1262,7 +1262,14 @@ |
|
5 isa = PBXProject; |
|
6 buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "SDLiPhoneOS" */; |
|
7 compatibilityVersion = "Xcode 3.1"; |
|
8 + developmentRegion = English; |
|
9 hasScannedForEncodings = 1; |
|
10 + knownRegions = ( |
|
11 + English, |
|
12 + Japanese, |
|
13 + French, |
|
14 + German, |
|
15 + ); |
|
16 mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */; |
|
17 projectDirPath = ""; |
|
18 projectRoot = ../..; |
|
19 @@ -1549,15 +1556,19 @@ |
5 isa = XCBuildConfiguration; |
20 isa = XCBuildConfiguration; |
6 buildSettings = { |
21 buildSettings = { |
7 ALWAYS_SEARCH_USER_PATHS = NO; |
22 ALWAYS_SEARCH_USER_PATHS = NO; |
8 + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; |
23 + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; |
9 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; |
24 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; |
16 + HEADER_SEARCH_PATHS = "\"$(SRCROOT)/../../include\""; |
31 + HEADER_SEARCH_PATHS = "\"$(SRCROOT)/../../include\""; |
17 IPHONEOS_DEPLOYMENT_TARGET = 3.1; |
32 IPHONEOS_DEPLOYMENT_TARGET = 3.1; |
18 ONLY_ACTIVE_ARCH = NO; |
33 ONLY_ACTIVE_ARCH = NO; |
19 PREBINDING = NO; |
34 PREBINDING = NO; |
20 - SDKROOT = iphoneos3.2; |
35 - SDKROOT = iphoneos3.2; |
21 + SDKROOT = iphoneos4.0; |
36 + SDKROOT = iphoneos; |
22 TARGETED_DEVICE_FAMILY = "1,2"; |
37 TARGETED_DEVICE_FAMILY = "1,2"; |
23 }; |
38 }; |
24 name = Debug; |
39 name = Debug; |
25 @@ -1566,14 +1570,19 @@ |
40 @@ -1566,14 +1577,19 @@ |
26 isa = XCBuildConfiguration; |
41 isa = XCBuildConfiguration; |
27 buildSettings = { |
42 buildSettings = { |
28 ALWAYS_SEARCH_USER_PATHS = NO; |
43 ALWAYS_SEARCH_USER_PATHS = NO; |
29 - ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)"; |
44 - ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)"; |
30 + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; |
45 + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; |
38 GCC_WARN_UNUSED_VARIABLE = NO; |
53 GCC_WARN_UNUSED_VARIABLE = NO; |
39 + HEADER_SEARCH_PATHS = "\"$(SRCROOT)/../../include\""; |
54 + HEADER_SEARCH_PATHS = "\"$(SRCROOT)/../../include\""; |
40 IPHONEOS_DEPLOYMENT_TARGET = 3.1; |
55 IPHONEOS_DEPLOYMENT_TARGET = 3.1; |
41 PREBINDING = NO; |
56 PREBINDING = NO; |
42 - SDKROOT = iphoneos3.2; |
57 - SDKROOT = iphoneos3.2; |
43 + SDKROOT = iphoneos4.0; |
58 + SDKROOT = iphoneos; |
44 TARGETED_DEVICE_FAMILY = "1,2"; |
59 TARGETED_DEVICE_FAMILY = "1,2"; |
45 }; |
60 }; |
46 name = Release; |
61 name = Release; |
47 diff -r c0021a587dc7 Xcode-iPhoneOS/SDL/testsdl-Info.plist |
62 diff -r d716dff4b13e Xcode-iPhoneOS/SDL/testsdl-Info.plist |
48 --- a/Xcode-iPhoneOS/SDL/testsdl-Info.plist Sun Oct 10 15:45:58 2010 -0700 |
63 --- a/Xcode-iPhoneOS/SDL/testsdl-Info.plist Thu Dec 02 11:56:23 2010 -0800 |
49 +++ b/Xcode-iPhoneOS/SDL/testsdl-Info.plist Sat Oct 16 18:35:03 2010 +0200 |
64 +++ b/Xcode-iPhoneOS/SDL/testsdl-Info.plist Thu Dec 02 22:38:57 2010 +0100 |
50 @@ -16,7 +16,5 @@ |
65 @@ -16,7 +16,5 @@ |
51 <string>????</string> |
66 <string>????</string> |
52 <key>CFBundleVersion</key> |
67 <key>CFBundleVersion</key> |
53 <string>1.0</string> |
68 <string>1.0</string> |
54 - <key>NSMainNibFile</key> |
69 - <key>NSMainNibFile</key> |
55 - <string>MainWindow</string> |
70 - <string>MainWindow</string> |
56 </dict> |
71 </dict> |
57 </plist> |
72 </plist> |
58 diff -r c0021a587dc7 include/SDL_config_iphoneos.h |
73 diff -r d716dff4b13e include/SDL_config_iphoneos.h |
59 --- a/include/SDL_config_iphoneos.h Sun Oct 10 15:45:58 2010 -0700 |
74 --- a/include/SDL_config_iphoneos.h Thu Dec 02 11:56:23 2010 -0800 |
60 +++ b/include/SDL_config_iphoneos.h Sat Oct 16 18:35:03 2010 +0200 |
75 +++ b/include/SDL_config_iphoneos.h Thu Dec 02 22:38:57 2010 +0100 |
61 @@ -98,6 +98,8 @@ |
76 @@ -98,6 +98,8 @@ |
62 #define HAVE_COS 1 |
77 #define HAVE_COS 1 |
63 #define HAVE_COSF 1 |
78 #define HAVE_COSF 1 |
64 #define HAVE_FABS 1 |
79 #define HAVE_FABS 1 |
65 +#define HAVE_ATAN 1 |
80 +#define HAVE_ATAN 1 |
91 |
106 |
92 +/* 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 */ |
93 +#define SDL_VIEW_TAG 456987 |
108 +#define SDL_VIEW_TAG 456987 |
94 + |
109 + |
95 #endif /* _SDL_config_iphoneos_h */ |
110 #endif /* _SDL_config_iphoneos_h */ |
96 diff -r c0021a587dc7 src/SDL_fatal.c |
111 diff -r d716dff4b13e src/SDL_fatal.c |
97 --- a/src/SDL_fatal.c Sun Oct 10 15:45:58 2010 -0700 |
112 --- a/src/SDL_fatal.c Thu Dec 02 11:56:23 2010 -0800 |
98 +++ b/src/SDL_fatal.c Sat Oct 16 18:35:03 2010 +0200 |
113 +++ b/src/SDL_fatal.c Thu Dec 02 22:38:57 2010 +0100 |
99 @@ -38,9 +38,9 @@ |
114 @@ -38,9 +38,9 @@ |
100 static void |
115 static void |
101 SDL_Parachute(int sig) |
116 SDL_Parachute(int sig) |
102 { |
117 { |
103 - signal(sig, SIG_DFL); |
118 - signal(sig, SIG_DFL); |
106 - raise(sig); |
121 - raise(sig); |
107 + raise(sig);*/ |
122 + raise(sig);*/ |
108 } |
123 } |
109 |
124 |
110 static const int SDL_fatal_signals[] = { |
125 static const int SDL_fatal_signals[] = { |
111 diff -r c0021a587dc7 src/video/SDL_renderer_gles.c |
126 diff -r d716dff4b13e src/video/SDL_renderer_gles.c |
112 --- a/src/video/SDL_renderer_gles.c Sun Oct 10 15:45:58 2010 -0700 |
127 --- a/src/video/SDL_renderer_gles.c Thu Dec 02 11:56:23 2010 -0800 |
113 +++ b/src/video/SDL_renderer_gles.c Sat Oct 16 18:35:03 2010 +0200 |
128 +++ b/src/video/SDL_renderer_gles.c Thu Dec 02 22:38:57 2010 +0100 |
114 @@ -324,6 +324,9 @@ |
129 @@ -324,6 +324,9 @@ |
115 data->glDisable(GL_CULL_FACE); |
130 data->glDisable(GL_CULL_FACE); |
116 data->updateSize = SDL_TRUE; |
131 data->updateSize = SDL_TRUE; |
117 |
132 |
118 + data->glEnableClientState(GL_VERTEX_ARRAY); |
133 + data->glEnableClientState(GL_VERTEX_ARRAY); |
190 - data->glDisableClientState(GL_TEXTURE_COORD_ARRAY); |
205 - data->glDisableClientState(GL_TEXTURE_COORD_ARRAY); |
191 - data->glDisableClientState(GL_VERTEX_ARRAY); |
206 - data->glDisableClientState(GL_VERTEX_ARRAY); |
192 } |
207 } |
193 |
208 |
194 data->glDisable(GL_TEXTURE_2D); |
209 data->glDisable(GL_TEXTURE_2D); |
195 diff -r c0021a587dc7 src/video/SDL_video.c |
210 diff -r d716dff4b13e src/video/SDL_video.c |
196 --- a/src/video/SDL_video.c Sun Oct 10 15:45:58 2010 -0700 |
211 --- a/src/video/SDL_video.c Thu Dec 02 11:56:23 2010 -0800 |
197 +++ b/src/video/SDL_video.c Sat Oct 16 18:35:03 2010 +0200 |
212 +++ b/src/video/SDL_video.c Thu Dec 02 22:38:57 2010 +0100 |
198 @@ -1416,9 +1416,9 @@ |
213 @@ -1421,9 +1421,9 @@ |
199 SDL_MinimizeWindow(window); |
214 SDL_MinimizeWindow(window); |
200 } |
215 } |
201 |
216 |
202 - if (display->gamma && _this->SetDisplayGammaRamp) { |
217 - if (display->gamma && _this->SetDisplayGammaRamp) { |
203 + /*if (display->gamma && _this->SetDisplayGammaRamp) { |
218 + /*if (display->gamma && _this->SetDisplayGammaRamp) { |
205 - } |
220 - } |
206 + }*/ |
221 + }*/ |
207 if ((window->flags & (SDL_WINDOW_INPUT_GRABBED | SDL_WINDOW_FULLSCREEN)) |
222 if ((window->flags & (SDL_WINDOW_INPUT_GRABBED | SDL_WINDOW_FULLSCREEN)) |
208 && _this->SetWindowGrab) { |
223 && _this->SetWindowGrab) { |
209 _this->SetWindowGrab(_this, window); |
224 _this->SetWindowGrab(_this, window); |
210 diff -r c0021a587dc7 src/video/uikit/SDL_uikitopengles.m |
225 diff -r d716dff4b13e src/video/uikit/SDL_uikitopengles.m |
211 --- a/src/video/uikit/SDL_uikitopengles.m Sun Oct 10 15:45:58 2010 -0700 |
226 --- a/src/video/uikit/SDL_uikitopengles.m Thu Dec 02 11:56:23 2010 -0800 |
212 +++ b/src/video/uikit/SDL_uikitopengles.m Sat Oct 16 18:35:03 2010 +0200 |
227 +++ b/src/video/uikit/SDL_uikitopengles.m Thu Dec 02 22:38:57 2010 +0100 |
213 @@ -114,8 +114,8 @@ |
228 @@ -114,8 +114,8 @@ |
214 bBits: _this->gl_config.blue_size \ |
229 bBits: _this->gl_config.blue_size \ |
215 aBits: _this->gl_config.alpha_size \ |
230 aBits: _this->gl_config.alpha_size \ |
216 depthBits: _this->gl_config.depth_size]; |
231 depthBits: _this->gl_config.depth_size]; |
217 - |
232 - |
219 + view.tag = SDL_VIEW_TAG; |
234 + view.tag = SDL_VIEW_TAG; |
220 + data->view = view; |
235 + data->view = view; |
221 |
236 |
222 /* add the view to our window */ |
237 /* add the view to our window */ |
223 [uiwindow addSubview: view ]; |
238 [uiwindow addSubview: view ]; |
224 diff -r c0021a587dc7 src/video/uikit/SDL_uikitview.m |
239 diff -r d716dff4b13e src/video/uikit/SDL_uikitopenglview.m |
225 --- a/src/video/uikit/SDL_uikitview.m Sun Oct 10 15:45:58 2010 -0700 |
240 --- a/src/video/uikit/SDL_uikitopenglview.m Thu Dec 02 11:56:23 2010 -0800 |
226 +++ b/src/video/uikit/SDL_uikitview.m Sat Oct 16 18:35:03 2010 +0200 |
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 |
|
254 @@ -23,11 +23,11 @@ |
|
255 #include "SDL_stdinc.h" |
|
256 #include "SDL_events.h" |
|
257 |
|
258 -#define IPHONE_TOUCH_EFFICIENT_DANGEROUS |
|
259 -#define FIXED_MULTITOUCH |
|
260 +#undef IPHONE_TOUCH_EFFICIENT_DANGEROUS |
|
261 +#undef FIXED_MULTITOUCH |
|
262 |
|
263 #ifndef IPHONE_TOUCH_EFFICIENT_DANGEROUS |
|
264 -#define MAX_SIMULTANEOUS_TOUCHES 5 |
|
265 +#define MAX_SIMULTANEOUS_TOUCHES 0 |
|
266 #endif |
|
267 |
|
268 /* *INDENT-OFF* */ |
|
269 diff -r d716dff4b13e src/video/uikit/SDL_uikitview.m |
|
270 --- a/src/video/uikit/SDL_uikitview.m Thu Dec 02 11:56:23 2010 -0800 |
|
271 +++ b/src/video/uikit/SDL_uikitview.m Thu Dec 02 22:38:57 2010 +0100 |
227 @@ -35,9 +35,6 @@ |
272 @@ -35,9 +35,6 @@ |
228 @implementation SDL_uikitview |
273 @implementation SDL_uikitview |
229 |
274 |
230 - (void)dealloc { |
275 - (void)dealloc { |
231 -#if SDL_IPHONE_KEYBOARD |
276 -#if SDL_IPHONE_KEYBOARD |
333 + if (data != NULL) |
378 + if (data != NULL) |
334 + view = data->view; |
379 + view = data->view; |
335 |
380 |
336 if (NULL == view) { |
381 if (NULL == view) { |
337 SDL_SetError("Window has no view"); |
382 SDL_SetError("Window has no view"); |
338 diff -r c0021a587dc7 src/video/uikit/SDL_uikitwindow.m |
383 diff -r d716dff4b13e src/video/uikit/SDL_uikitwindow.m |
339 --- a/src/video/uikit/SDL_uikitwindow.m Sun Oct 10 15:45:58 2010 -0700 |
384 --- a/src/video/uikit/SDL_uikitwindow.m Thu Dec 02 11:56:23 2010 -0800 |
340 +++ b/src/video/uikit/SDL_uikitwindow.m Sat Oct 16 18:35:03 2010 +0200 |
385 +++ b/src/video/uikit/SDL_uikitwindow.m Thu Dec 02 22:38:57 2010 +0100 |
341 @@ -144,7 +144,10 @@ |
386 @@ -144,7 +144,10 @@ |
342 if (SDL_UIKit_supports_multiple_displays) { |
387 if (SDL_UIKit_supports_multiple_displays) { |
343 [uiwindow setScreen:uiscreen]; |
388 [uiwindow setScreen:uiscreen]; |
344 } |
389 } |
345 - |
390 - |
346 + |
391 + |
347 + if ([[UIScreen screens] count] > 1) |
392 + if ([UIScreen respondsToSelector:@selector(screens)] && [[UIScreen screens] count] > 1) |
348 + uiwindow.screen = [[UIScreen screens] objectAtIndex:1]; |
393 + uiwindow.screen = [[UIScreen screens] objectAtIndex:1]; |
349 + |
394 + |
350 if (SetupWindowData(_this, window, uiwindow, SDL_TRUE) < 0) { |
395 if (SetupWindowData(_this, window, uiwindow, SDL_TRUE) < 0) { |
351 [uiwindow release]; |
396 [uiwindow release]; |
352 return -1; |
397 return -1; |
353 diff -r c0021a587dc7 src/video/uikit/keyinfotable.h |
398 diff -r d716dff4b13e src/video/uikit/keyinfotable.h |
354 --- a/src/video/uikit/keyinfotable.h Sun Oct 10 15:45:58 2010 -0700 |
399 --- a/src/video/uikit/keyinfotable.h Thu Dec 02 11:56:23 2010 -0800 |
355 +++ b/src/video/uikit/keyinfotable.h Sat Oct 16 18:35:03 2010 +0200 |
400 +++ b/src/video/uikit/keyinfotable.h Thu Dec 02 22:38:57 2010 +0100 |
356 @@ -54,7 +54,7 @@ |
401 @@ -54,7 +54,7 @@ |
357 /* 10 */ { SDL_SCANCODE_UNKNOWN, 0 }, |
402 /* 10 */ { SDL_SCANCODE_UNKNOWN, 0 }, |
358 /* 11 */ { SDL_SCANCODE_UNKNOWN, 0 }, |
403 /* 11 */ { SDL_SCANCODE_UNKNOWN, 0 }, |
359 /* 12 */ { SDL_SCANCODE_UNKNOWN, 0 }, |
404 /* 12 */ { SDL_SCANCODE_UNKNOWN, 0 }, |
360 -/* 13 */ { SDL_SCANCODE_UNKNOWN, 0 }, |
405 -/* 13 */ { SDL_SCANCODE_UNKNOWN, 0 }, |