1.1 --- a/Xcode-iOS/Test/TestiPhoneOS.xcodeproj/project.pbxproj Sat Jan 28 14:05:48 2012 -0500
1.2 +++ b/Xcode-iOS/Test/TestiPhoneOS.xcodeproj/project.pbxproj Sat Jan 28 14:53:23 2012 -0500
1.3 @@ -1712,7 +1712,10 @@
1.4 C01FCF4F08A954540054247B /* Debug */ = {
1.5 isa = XCBuildConfiguration;
1.6 buildSettings = {
1.7 - ARCHS = "$(ARCHS_STANDARD_32_BIT)";
1.8 + ARCHS = (
1.9 + armv7,
1.10 + armv6,
1.11 + );
1.12 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
1.13 GCC_OPTIMIZATION_LEVEL = 0;
1.14 HEADER_SEARCH_PATHS = ../../include;
1.15 @@ -1727,7 +1730,10 @@
1.16 C01FCF5008A954540054247B /* Release */ = {
1.17 isa = XCBuildConfiguration;
1.18 buildSettings = {
1.19 - ARCHS = "$(ARCHS_STANDARD_32_BIT)";
1.20 + ARCHS = (
1.21 + armv7,
1.22 + armv6,
1.23 + );
1.24 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
1.25 HEADER_SEARCH_PATHS = ../../include;
1.26 IPHONEOS_DEPLOYMENT_TARGET = 3.1.3;
2.1 --- a/src/render/opengles/SDL_glesfuncs.h Sat Jan 28 14:05:48 2012 -0500
2.2 +++ b/src/render/opengles/SDL_glesfuncs.h Sat Jan 28 14:53:23 2012 -0500
2.3 @@ -11,6 +11,7 @@
2.4 SDL_PROC(void, glEnable, (GLenum))
2.5 SDL_PROC(void, glEnableClientState, (GLenum))
2.6 SDL_PROC(void, glFinish, (void))
2.7 +SDL_PROC(void, glGenFramebuffersOES, (GLsizei, GLuint *))
2.8 SDL_PROC(void, glGenTextures, (GLsizei, GLuint *))
2.9 SDL_PROC(GLenum, glGetError, (void))
2.10 SDL_PROC(void, glGetIntegerv, (GLenum, GLint *))
3.1 --- a/src/render/opengles/SDL_render_gles.c Sat Jan 28 14:05:48 2012 -0500
3.2 +++ b/src/render/opengles/SDL_render_gles.c Sat Jan 28 14:53:23 2012 -0500
3.3 @@ -206,7 +206,7 @@
3.4 result = SDL_malloc(sizeof(GLES_FBOList));
3.5 result->w = w;
3.6 result->h = h;
3.7 - glGenFramebuffersOES(1, &result->FBO);
3.8 + data->glGenFramebuffersOES(1, &result->FBO);
3.9 result->next = data->framebuffers;
3.10 data->framebuffers = result;
3.11 }
4.1 --- a/src/render/opengles2/SDL_gles2funcs.h Sat Jan 28 14:05:48 2012 -0500
4.2 +++ b/src/render/opengles2/SDL_gles2funcs.h Sat Jan 28 14:53:23 2012 -0500
4.3 @@ -17,6 +17,7 @@
4.4 SDL_PROC(void, glEnable, (GLenum))
4.5 SDL_PROC(void, glEnableVertexAttribArray, (GLuint))
4.6 SDL_PROC(void, glFinish, (void))
4.7 +SDL_PROC(void, glGenFramebuffers, (GLsizei, GLuint *))
4.8 SDL_PROC(void, glGenTextures, (GLsizei, GLuint *))
4.9 SDL_PROC(void, glGetBooleanv, (GLenum, GLboolean *))
4.10 SDL_PROC(const GLubyte *, glGetString, (GLenum))
5.1 --- a/src/render/opengles2/SDL_render_gles2.c Sat Jan 28 14:05:48 2012 -0500
5.2 +++ b/src/render/opengles2/SDL_render_gles2.c Sat Jan 28 14:53:23 2012 -0500
5.3 @@ -210,7 +210,7 @@
5.4 result = SDL_malloc(sizeof(GLES2_FBOList));
5.5 result->w = w;
5.6 result->h = h;
5.7 - glGenFramebuffers(1, &result->FBO);
5.8 + data->glGenFramebuffers(1, &result->FBO);
5.9 result->next = data->framebuffers;
5.10 data->framebuffers = result;
5.11 }