summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-04-08 13:02:30 +0300
committerTor Lillqvist <tml@collabora.com>2014-04-08 13:03:42 +0300
commit1309c34ac02a9d120bdf2e74c904abef5bbcf611 (patch)
tree75e4f7c14013561fe26c0173503cc0a7e6016b32 /external
parentd114939dabaf5cb0c14b619ef851be17c28e69e5 (diff)
We build a static libGLEW for iOS anyway
So no need to bother with what framework(s) to link to. Change-Id: I7dac64357bc01221787ef7e393952d492e2d84c7
Diffstat (limited to 'external')
-rw-r--r--external/glew/UnpackedTarball_glew.mk6
-rw-r--r--external/glew/glew-ios.patch.112
2 files changed, 0 insertions, 18 deletions
diff --git a/external/glew/UnpackedTarball_glew.mk b/external/glew/UnpackedTarball_glew.mk
index c3124d881b1b..91ec24021708 100644
--- a/external/glew/UnpackedTarball_glew.mk
+++ b/external/glew/UnpackedTarball_glew.mk
@@ -35,12 +35,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,glew,\
))
endif
-ifeq ($(OS),IOS)
-$(eval $(call gb_UnpackedTarball_add_patches,glew,\
- external/glew/glew-ios.patch.1 \
-))
-endif
-
ifeq ($(DISABLE_DYNLOADING),TRUE)
$(eval $(call gb_UnpackedTarball_add_patches,glew,\
external/glew/glew-static-only.patch.1 \
diff --git a/external/glew/glew-ios.patch.1 b/external/glew/glew-ios.patch.1
deleted file mode 100644
index 05814f69cccc..000000000000
--- a/external/glew/glew-ios.patch.1
+++ /dev/null
@@ -1,12 +0,0 @@
--*- Mode:Diff -*-
---- glew/config/Makefile.darwin
-+++ glew/config/Makefile.darwin
-@@ -8,7 +8,7 @@
- CFLAGS.EXTRA += -I/usr/X11R6/include -D'GLEW_APPLE_GLX'
- LDFLAGS.GL = -L/usr/X11R6/lib -lGL -lX11
- else
--LDFLAGS.GL = -framework AGL -framework OpenGL
-+LDFLAGS.GL = -framework OpenGLES
- endif
- LDFLAGS.STATIC =
- LDFLAGS.DYNAMIC =