[Scummvm-cvs-logs] SF.net SVN: scummvm:[40440] scummvm/trunk

[vinterstum at users.sourceforge.net]

Revision: 40440
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40440&view=rev
Author:   vinterstum
Date:     2009-05-10 22:15:33 +0000 (Sun, 10 May 2009)

Log Message:
-----------
iPhone fixes for compiling with the unofficial sdk

Modified Paths:
--------------
    scummvm/trunk/backends/platform/iphone/iphone_video.m
    scummvm/trunk/configure
    scummvm/trunk/ports.mk

Modified: scummvm/trunk/backends/platform/iphone/iphone_video.m
===================================================================
--- scummvm/trunk/backends/platform/iphone/iphone_video.m	2009-05-10 22:05:04 UTC (rev 40439)
+++ scummvm/trunk/backends/platform/iphone/iphone_video.m	2009-05-10 22:15:33 UTC (rev 40440)
@@ -26,10 +26,6 @@
 #include "iphone_video.h"
 #include "iphone_common.h"
 
-#import <UIKit/UIKit.h>
-#import <Foundation/Foundation.h>
-#import <QuartzCore/QuartzCore.h>
-
 static iPhoneView *sharedInstance = nil;
 static int _width = 0;
 static int _height = 0;
@@ -271,7 +267,6 @@
 
 	glGenTextures(1, &_screenTexture);
 	glBindTexture(GL_TEXTURE_2D, _screenTexture);
-	glEnable(GL_TEXTURE_2D);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
 	
 	if (_textureBuffer) {

Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure	2009-05-10 22:05:04 UTC (rev 40439)
+++ scummvm/trunk/configure	2009-05-10 22:15:33 UTC (rev 40440)
@@ -1858,7 +1858,7 @@
 		;;
 	iphone)
 		OBJCFLAGS="$OBJCFLAGS --std=c99"
-		LIBS="$LIBS -lobjc -framework UIKit -framework CoreGraphics -framework CoreSurface -framework QuartzCore -framework GraphicsServices -framework CoreFoundation -framework Foundation -framework AudioToolbox -framework CoreAudio"
+		LIBS="$LIBS -lobjc -framework UIKit -framework CoreGraphics -framework OpenGLES -framework QuartzCore -framework GraphicsServices -framework CoreFoundation -framework Foundation -framework AudioToolbox -framework CoreAudio"
 		;;
 	dc)
 		INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/dc -isystem $(ronindir)/include'

Modified: scummvm/trunk/ports.mk
===================================================================
--- scummvm/trunk/ports.mk	2009-05-10 22:05:04 UTC (rev 40439)
+++ scummvm/trunk/ports.mk	2009-05-10 22:15:33 UTC (rev 40440)
@@ -117,7 +117,7 @@
 iphone: $(OBJS)
 	$(CXX) $(LDFLAGS) -o scummvm $(OBJS) \
 		$(OSX_STATIC_LIBS) \
-		-framework UIKit -framework CoreGraphics -framework CoreSurface \
+		-framework UIKit -framework CoreGraphics -framework OpenGLES \
 		-framework GraphicsServices -framework CoreFoundation -framework QuartzCore \
 		-framework Foundation -framework AudioToolbox -framework CoreAudio \
 		-lobjc -lz


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.