aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--backends/platform/iphone/iphone_video.m5
-rwxr-xr-xconfigure2
-rw-r--r--ports.mk2
3 files changed, 2 insertions, 7 deletions
diff --git a/backends/platform/iphone/iphone_video.m b/backends/platform/iphone/iphone_video.m
index 5f6804bc17..690e2339ae 100644
--- a/backends/platform/iphone/iphone_video.m
+++ b/backends/platform/iphone/iphone_video.m
@@ -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 @@ uint getSizeNextPOT(uint size) {
glGenTextures(1, &_screenTexture);
glBindTexture(GL_TEXTURE_2D, _screenTexture);
- glEnable(GL_TEXTURE_2D);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
if (_textureBuffer) {
diff --git a/configure b/configure
index dad2331841..325a2698b4 100755
--- a/configure
+++ b/configure
@@ -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'
diff --git a/ports.mk b/ports.mk
index edd03bce56..e3a9df2640 100644
--- a/ports.mk
+++ b/ports.mk
@@ -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