Permalink
Browse files

iPhone fixes for compiling with the unofficial sdk

svn-id: r40440
  • Loading branch information...
1 parent 665e472 commit 6d56924bb1854ee9592c4223a4746a32038ade6d Oystein Eftevaag committed May 10, 2009
Showing with 2 additions and 7 deletions.
  1. +0 −5 backends/platform/iphone/iphone_video.m
  2. +1 −1 configure
  3. +1 −1 ports.mk
@@ -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 @@ - (void)initSurface {
glGenTextures(1, &_screenTexture);
glBindTexture(GL_TEXTURE_2D, _screenTexture);
- glEnable(GL_TEXTURE_2D);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
if (_textureBuffer) {
View
@@ -1858,7 +1858,7 @@ case $_backend in
;;
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'
View
@@ -117,7 +117,7 @@ scummvm-static: $(OBJS)
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

0 comments on commit 6d56924

Please sign in to comment.