1 diff -r f50c7996d925 Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj |
1 diff -r c0021a587dc7 Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj |
2 --- a/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj Wed Sep 29 21:24:50 2010 -0700 |
2 --- a/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj Sun Oct 10 15:45:58 2010 -0700 |
3 +++ b/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj Sun Oct 03 00:21:37 2010 +0200 |
3 +++ b/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj Sat Oct 16 18:35:03 2010 +0200 |
4 @@ -106,6 +106,7 @@ |
4 @@ -1549,15 +1549,19 @@ |
5 04F2AF561104ABD200D6DDF7 /* SDL_assert.c in Sources */ = {isa = PBXBuildFile; fileRef = 04F2AF551104ABD200D6DDF7 /* SDL_assert.c */; }; |
|
6 56ED04E1118A8EE200A56AA6 /* SDL_power.c in Sources */ = {isa = PBXBuildFile; fileRef = 56ED04E0118A8EE200A56AA6 /* SDL_power.c */; }; |
|
7 56ED04E3118A8EFD00A56AA6 /* SDL_syspower.m in Sources */ = {isa = PBXBuildFile; fileRef = 56ED04E2118A8EFD00A56AA6 /* SDL_syspower.m */; }; |
|
8 + 61F7E7F4125543DA00DE6C14 /* SDL_uikitappdelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = FD689FCC0E26E9D400F90B21 /* SDL_uikitappdelegate.m */; }; |
|
9 FD24846D0E5655AE0021E198 /* SDL_uikitkeyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = FD24846B0E5655AE0021E198 /* SDL_uikitkeyboard.h */; }; |
|
10 FD3F495C0DEA5B2100C5B771 /* begin_code.h in Headers */ = {isa = PBXBuildFile; fileRef = FD99B8CC0DD52EB400FB1D6B /* begin_code.h */; settings = {ATTRIBUTES = (Public, ); }; }; |
|
11 FD3F495D0DEA5B2100C5B771 /* close_code.h in Headers */ = {isa = PBXBuildFile; fileRef = FD99B8CD0DD52EB400FB1D6B /* close_code.h */; settings = {ATTRIBUTES = (Public, ); }; }; |
|
12 @@ -192,8 +193,6 @@ |
|
13 FD689F250E26E5D900F90B21 /* SDL_uikitwindow.m in Sources */ = {isa = PBXBuildFile; fileRef = FD689F150E26E5D900F90B21 /* SDL_uikitwindow.m */; }; |
|
14 FD689F260E26E5D900F90B21 /* SDL_uikitopenglview.h in Headers */ = {isa = PBXBuildFile; fileRef = FD689F160E26E5D900F90B21 /* SDL_uikitopenglview.h */; }; |
|
15 FD689F270E26E5D900F90B21 /* SDL_uikitopenglview.m in Sources */ = {isa = PBXBuildFile; fileRef = FD689F170E26E5D900F90B21 /* SDL_uikitopenglview.m */; }; |
|
16 - FD689FCE0E26E9D400F90B21 /* SDL_uikitappdelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = FD689FCC0E26E9D400F90B21 /* SDL_uikitappdelegate.m */; }; |
|
17 - FD689FCF0E26E9D400F90B21 /* SDL_uikitappdelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = FD689FCD0E26E9D400F90B21 /* SDL_uikitappdelegate.h */; }; |
|
18 FD6C83B60DEA66E500ABEE55 /* SDL_systimer.h in Headers */ = {isa = PBXBuildFile; fileRef = FD99BA2D0DD52EDC00FB1D6B /* SDL_systimer.h */; }; |
|
19 FD8BD7AC0E27DCA400B52CD5 /* SDL_opengles.h in Headers */ = {isa = PBXBuildFile; fileRef = FD8BD7AB0E27DCA400B52CD5 /* SDL_opengles.h */; settings = {ATTRIBUTES = (Public, ); }; }; |
|
20 FD8BD8250E27E25900B52CD5 /* SDL_sysloadso.c in Sources */ = {isa = PBXBuildFile; fileRef = FD8BD8190E27E25900B52CD5 /* SDL_sysloadso.c */; }; |
|
21 @@ -1186,7 +1185,6 @@ |
|
22 FD689F200E26E5D900F90B21 /* SDL_uikitvideo.h in Headers */, |
|
23 FD689F240E26E5D900F90B21 /* SDL_uikitwindow.h in Headers */, |
|
24 FD689F260E26E5D900F90B21 /* SDL_uikitopenglview.h in Headers */, |
|
25 - FD689FCF0E26E9D400F90B21 /* SDL_uikitappdelegate.h in Headers */, |
|
26 FD8BD7AC0E27DCA400B52CD5 /* SDL_opengles.h in Headers */, |
|
27 FDC656490E560DF800311C8E /* jumphack.h in Headers */, |
|
28 FD24846D0E5655AE0021E198 /* SDL_uikitkeyboard.h in Headers */, |
|
29 @@ -1347,6 +1345,7 @@ |
|
30 isa = PBXSourcesBuildPhase; |
|
31 buildActionMask = 2147483647; |
|
32 files = ( |
|
33 + 61F7E7F4125543DA00DE6C14 /* SDL_uikitappdelegate.m in Sources */, |
|
34 006E9852119550FB001DE610 /* audio.c in Sources */, |
|
35 006E9853119550FB001DE610 /* common.c in Sources */, |
|
36 006E9859119550FB001DE610 /* platform.c in Sources */, |
|
37 @@ -1429,7 +1428,6 @@ |
|
38 FD689F230E26E5D900F90B21 /* SDL_uikitview.m in Sources */, |
|
39 FD689F250E26E5D900F90B21 /* SDL_uikitwindow.m in Sources */, |
|
40 FD689F270E26E5D900F90B21 /* SDL_uikitopenglview.m in Sources */, |
|
41 - FD689FCE0E26E9D400F90B21 /* SDL_uikitappdelegate.m in Sources */, |
|
42 FD8BD8250E27E25900B52CD5 /* SDL_sysloadso.c in Sources */, |
|
43 FDC656480E560DF800311C8E /* jumphack.c in Sources */, |
|
44 0495E68C0E97408800152DFE /* SDL_renderer_gl.c in Sources */, |
|
45 @@ -1549,15 +1547,19 @@ |
|
46 isa = XCBuildConfiguration; |
5 isa = XCBuildConfiguration; |
47 buildSettings = { |
6 buildSettings = { |
48 ALWAYS_SEARCH_USER_PATHS = NO; |
7 ALWAYS_SEARCH_USER_PATHS = NO; |
49 + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; |
8 + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; |
50 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; |
9 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; |
52 GCC_DEBUGGING_SYMBOLS = full; |
11 GCC_DEBUGGING_SYMBOLS = full; |
53 + GCC_THUMB_SUPPORT = NO; |
12 + GCC_THUMB_SUPPORT = NO; |
54 + GCC_VERSION = com.apple.compilers.llvmgcc42; |
13 + GCC_VERSION = com.apple.compilers.llvmgcc42; |
55 GCC_WARN_ABOUT_RETURN_TYPE = YES; |
14 GCC_WARN_ABOUT_RETURN_TYPE = YES; |
56 GCC_WARN_UNUSED_VARIABLE = NO; |
15 GCC_WARN_UNUSED_VARIABLE = NO; |
57 - IPHONEOS_DEPLOYMENT_TARGET = 3.1; |
|
58 + HEADER_SEARCH_PATHS = "\"$(SRCROOT)/../../include\""; |
16 + HEADER_SEARCH_PATHS = "\"$(SRCROOT)/../../include\""; |
59 + IPHONEOS_DEPLOYMENT_TARGET = 3.0; |
17 IPHONEOS_DEPLOYMENT_TARGET = 3.1; |
60 ONLY_ACTIVE_ARCH = NO; |
18 ONLY_ACTIVE_ARCH = NO; |
61 PREBINDING = NO; |
19 PREBINDING = NO; |
62 - SDKROOT = iphoneos3.2; |
20 - SDKROOT = iphoneos3.2; |
63 + SDKROOT = iphoneos4.0; |
21 + SDKROOT = iphoneos4.0; |
64 TARGETED_DEVICE_FAMILY = "1,2"; |
22 TARGETED_DEVICE_FAMILY = "1,2"; |
65 }; |
23 }; |
66 name = Debug; |
24 name = Debug; |
67 @@ -1566,14 +1568,18 @@ |
25 @@ -1566,14 +1570,19 @@ |
68 isa = XCBuildConfiguration; |
26 isa = XCBuildConfiguration; |
69 buildSettings = { |
27 buildSettings = { |
70 ALWAYS_SEARCH_USER_PATHS = NO; |
28 ALWAYS_SEARCH_USER_PATHS = NO; |
71 - ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)"; |
29 - ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)"; |
72 + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; |
30 + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; |
73 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; |
31 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; |
74 GCC_C_LANGUAGE_STANDARD = c99; |
32 GCC_C_LANGUAGE_STANDARD = c99; |
75 + GCC_OPTIMIZATION_LEVEL = 2; |
33 + GCC_OPTIMIZATION_LEVEL = 2; |
76 + GCC_THUMB_SUPPORT = NO; |
34 + GCC_THUMB_SUPPORT = NO; |
|
35 + GCC_UNROLL_LOOPS = YES; |
77 + GCC_VERSION = com.apple.compilers.llvmgcc42; |
36 + GCC_VERSION = com.apple.compilers.llvmgcc42; |
78 GCC_WARN_ABOUT_RETURN_TYPE = YES; |
37 GCC_WARN_ABOUT_RETURN_TYPE = YES; |
79 GCC_WARN_UNUSED_VARIABLE = NO; |
38 GCC_WARN_UNUSED_VARIABLE = NO; |
80 - IPHONEOS_DEPLOYMENT_TARGET = 3.1; |
|
81 + HEADER_SEARCH_PATHS = "\"$(SRCROOT)/../../include\""; |
39 + HEADER_SEARCH_PATHS = "\"$(SRCROOT)/../../include\""; |
82 + IPHONEOS_DEPLOYMENT_TARGET = 3.0; |
40 IPHONEOS_DEPLOYMENT_TARGET = 3.1; |
83 PREBINDING = NO; |
41 PREBINDING = NO; |
84 - SDKROOT = iphoneos3.2; |
42 - SDKROOT = iphoneos3.2; |
85 + SDKROOT = iphoneos4.0; |
43 + SDKROOT = iphoneos4.0; |
86 TARGETED_DEVICE_FAMILY = "1,2"; |
44 TARGETED_DEVICE_FAMILY = "1,2"; |
87 }; |
45 }; |
88 name = Release; |
46 name = Release; |
89 diff -r f50c7996d925 Xcode-iPhoneOS/SDL/testsdl-Info.plist |
47 diff -r c0021a587dc7 Xcode-iPhoneOS/SDL/testsdl-Info.plist |
90 --- a/Xcode-iPhoneOS/SDL/testsdl-Info.plist Wed Sep 29 21:24:50 2010 -0700 |
48 --- a/Xcode-iPhoneOS/SDL/testsdl-Info.plist Sun Oct 10 15:45:58 2010 -0700 |
91 +++ b/Xcode-iPhoneOS/SDL/testsdl-Info.plist Sun Oct 03 00:21:37 2010 +0200 |
49 +++ b/Xcode-iPhoneOS/SDL/testsdl-Info.plist Sat Oct 16 18:35:03 2010 +0200 |
92 @@ -16,7 +16,5 @@ |
50 @@ -16,7 +16,5 @@ |
93 <string>????</string> |
51 <string>????</string> |
94 <key>CFBundleVersion</key> |
52 <key>CFBundleVersion</key> |
95 <string>1.0</string> |
53 <string>1.0</string> |
96 - <key>NSMainNibFile</key> |
54 - <key>NSMainNibFile</key> |
97 - <string>MainWindow</string> |
55 - <string>MainWindow</string> |
98 </dict> |
56 </dict> |
99 </plist> |
57 </plist> |
100 diff -r f50c7996d925 include/SDL_config_iphoneos.h |
58 diff -r c0021a587dc7 include/SDL_config_iphoneos.h |
101 --- a/include/SDL_config_iphoneos.h Wed Sep 29 21:24:50 2010 -0700 |
59 --- a/include/SDL_config_iphoneos.h Sun Oct 10 15:45:58 2010 -0700 |
102 +++ b/include/SDL_config_iphoneos.h Sun Oct 03 00:21:37 2010 +0200 |
60 +++ b/include/SDL_config_iphoneos.h Sat Oct 16 18:35:03 2010 +0200 |
103 @@ -98,6 +98,8 @@ |
61 @@ -98,6 +98,8 @@ |
104 #define HAVE_COS 1 |
62 #define HAVE_COS 1 |
105 #define HAVE_COSF 1 |
63 #define HAVE_COSF 1 |
106 #define HAVE_FABS 1 |
64 #define HAVE_FABS 1 |
107 +#define HAVE_ATAN 1 |
65 +#define HAVE_ATAN 1 |
133 |
91 |
134 +/* Tag to grab the uikit view from external code for further modification */ |
92 +/* Tag to grab the uikit view from external code for further modification */ |
135 +#define SDL_VIEW_TAG 456987 |
93 +#define SDL_VIEW_TAG 456987 |
136 + |
94 + |
137 #endif /* _SDL_config_iphoneos_h */ |
95 #endif /* _SDL_config_iphoneos_h */ |
138 diff -r f50c7996d925 src/video/SDL_renderer_gles.c |
96 diff -r c0021a587dc7 src/SDL_fatal.c |
139 --- a/src/video/SDL_renderer_gles.c Wed Sep 29 21:24:50 2010 -0700 |
97 --- a/src/SDL_fatal.c Sun Oct 10 15:45:58 2010 -0700 |
140 +++ b/src/video/SDL_renderer_gles.c Sun Oct 03 00:21:37 2010 +0200 |
98 +++ b/src/SDL_fatal.c Sat Oct 16 18:35:03 2010 +0200 |
|
99 @@ -38,9 +38,9 @@ |
|
100 static void |
|
101 SDL_Parachute(int sig) |
|
102 { |
|
103 - signal(sig, SIG_DFL); |
|
104 + /*signal(sig, SIG_DFL); |
|
105 SDL_Quit(); |
|
106 - raise(sig); |
|
107 + raise(sig);*/ |
|
108 } |
|
109 |
|
110 static const int SDL_fatal_signals[] = { |
|
111 diff -r c0021a587dc7 src/video/SDL_renderer_gles.c |
|
112 --- a/src/video/SDL_renderer_gles.c Sun Oct 10 15:45:58 2010 -0700 |
|
113 +++ b/src/video/SDL_renderer_gles.c Sat Oct 16 18:35:03 2010 +0200 |
141 @@ -324,6 +324,9 @@ |
114 @@ -324,6 +324,9 @@ |
142 data->glDisable(GL_CULL_FACE); |
115 data->glDisable(GL_CULL_FACE); |
143 data->updateSize = SDL_TRUE; |
116 data->updateSize = SDL_TRUE; |
144 |
117 |
145 + data->glEnableClientState(GL_VERTEX_ARRAY); |
118 + data->glEnableClientState(GL_VERTEX_ARRAY); |
217 - data->glDisableClientState(GL_TEXTURE_COORD_ARRAY); |
190 - data->glDisableClientState(GL_TEXTURE_COORD_ARRAY); |
218 - data->glDisableClientState(GL_VERTEX_ARRAY); |
191 - data->glDisableClientState(GL_VERTEX_ARRAY); |
219 } |
192 } |
220 |
193 |
221 data->glDisable(GL_TEXTURE_2D); |
194 data->glDisable(GL_TEXTURE_2D); |
222 diff -r f50c7996d925 src/video/SDL_video.c |
195 diff -r c0021a587dc7 src/video/SDL_video.c |
223 --- a/src/video/SDL_video.c Wed Sep 29 21:24:50 2010 -0700 |
196 --- a/src/video/SDL_video.c Sun Oct 10 15:45:58 2010 -0700 |
224 +++ b/src/video/SDL_video.c Sun Oct 03 00:21:37 2010 +0200 |
197 +++ b/src/video/SDL_video.c Sat Oct 16 18:35:03 2010 +0200 |
225 @@ -1416,9 +1416,9 @@ |
198 @@ -1416,9 +1416,9 @@ |
226 SDL_MinimizeWindow(window); |
199 SDL_MinimizeWindow(window); |
227 } |
200 } |
228 |
201 |
229 - if (display->gamma && _this->SetDisplayGammaRamp) { |
202 - if (display->gamma && _this->SetDisplayGammaRamp) { |
232 - } |
205 - } |
233 + }*/ |
206 + }*/ |
234 if ((window->flags & (SDL_WINDOW_INPUT_GRABBED | SDL_WINDOW_FULLSCREEN)) |
207 if ((window->flags & (SDL_WINDOW_INPUT_GRABBED | SDL_WINDOW_FULLSCREEN)) |
235 && _this->SetWindowGrab) { |
208 && _this->SetWindowGrab) { |
236 _this->SetWindowGrab(_this, window); |
209 _this->SetWindowGrab(_this, window); |
237 diff -r f50c7996d925 src/video/uikit/SDL_uikitopengles.m |
210 diff -r c0021a587dc7 src/video/uikit/SDL_uikitopengles.m |
238 --- a/src/video/uikit/SDL_uikitopengles.m Wed Sep 29 21:24:50 2010 -0700 |
211 --- a/src/video/uikit/SDL_uikitopengles.m Sun Oct 10 15:45:58 2010 -0700 |
239 +++ b/src/video/uikit/SDL_uikitopengles.m Sun Oct 03 00:21:37 2010 +0200 |
212 +++ b/src/video/uikit/SDL_uikitopengles.m Sat Oct 16 18:35:03 2010 +0200 |
240 @@ -114,7 +114,7 @@ |
213 @@ -114,8 +114,8 @@ |
241 bBits: _this->gl_config.blue_size \ |
214 bBits: _this->gl_config.blue_size \ |
242 aBits: _this->gl_config.alpha_size \ |
215 aBits: _this->gl_config.alpha_size \ |
243 depthBits: _this->gl_config.depth_size]; |
216 depthBits: _this->gl_config.depth_size]; |
244 - |
217 - |
|
218 - data->view = view; |
245 + view.tag = SDL_VIEW_TAG; |
219 + view.tag = SDL_VIEW_TAG; |
246 data->view = view; |
220 + data->view = view; |
247 |
221 |
248 /* add the view to our window */ |
222 /* add the view to our window */ |
249 diff -r f50c7996d925 src/video/uikit/SDL_uikitview.m |
223 [uiwindow addSubview: view ]; |
250 --- a/src/video/uikit/SDL_uikitview.m Wed Sep 29 21:24:50 2010 -0700 |
224 diff -r c0021a587dc7 src/video/uikit/SDL_uikitview.m |
251 +++ b/src/video/uikit/SDL_uikitview.m Sun Oct 03 00:21:37 2010 +0200 |
225 --- a/src/video/uikit/SDL_uikitview.m Sun Oct 10 15:45:58 2010 -0700 |
|
226 +++ b/src/video/uikit/SDL_uikitview.m Sat Oct 16 18:35:03 2010 +0200 |
252 @@ -35,9 +35,6 @@ |
227 @@ -35,9 +35,6 @@ |
253 @implementation SDL_uikitview |
228 @implementation SDL_uikitview |
254 |
229 |
255 - (void)dealloc { |
230 - (void)dealloc { |
256 -#if SDL_IPHONE_KEYBOARD |
231 -#if SDL_IPHONE_KEYBOARD |
373 + uiwindow.screen = [[UIScreen screens] objectAtIndex:1]; |
348 + uiwindow.screen = [[UIScreen screens] objectAtIndex:1]; |
374 + |
349 + |
375 if (SetupWindowData(_this, window, uiwindow, SDL_TRUE) < 0) { |
350 if (SetupWindowData(_this, window, uiwindow, SDL_TRUE) < 0) { |
376 [uiwindow release]; |
351 [uiwindow release]; |
377 return -1; |
352 return -1; |
378 diff -r f50c7996d925 src/video/uikit/keyinfotable.h |
353 diff -r c0021a587dc7 src/video/uikit/keyinfotable.h |
379 --- a/src/video/uikit/keyinfotable.h Wed Sep 29 21:24:50 2010 -0700 |
354 --- a/src/video/uikit/keyinfotable.h Sun Oct 10 15:45:58 2010 -0700 |
380 +++ b/src/video/uikit/keyinfotable.h Sun Oct 03 00:21:37 2010 +0200 |
355 +++ b/src/video/uikit/keyinfotable.h Sat Oct 16 18:35:03 2010 +0200 |
381 @@ -54,7 +54,7 @@ |
356 @@ -54,7 +54,7 @@ |
382 /* 10 */ { SDL_SCANCODE_UNKNOWN, 0 }, |
357 /* 10 */ { SDL_SCANCODE_UNKNOWN, 0 }, |
383 /* 11 */ { SDL_SCANCODE_UNKNOWN, 0 }, |
358 /* 11 */ { SDL_SCANCODE_UNKNOWN, 0 }, |
384 /* 12 */ { SDL_SCANCODE_UNKNOWN, 0 }, |
359 /* 12 */ { SDL_SCANCODE_UNKNOWN, 0 }, |
385 -/* 13 */ { SDL_SCANCODE_UNKNOWN, 0 }, |
360 -/* 13 */ { SDL_SCANCODE_UNKNOWN, 0 }, |