[Libreoffice-commits] core.git: external/glew

[Tor Lillqvist]

 external/glew/UnpackedTarball_glew.mk |    6 ------
 external/glew/glew-ios.patch.1        |   12 ------------
 2 files changed, 18 deletions(-)

New commits:
commit 1309c34ac02a9d120bdf2e74c904abef5bbcf611
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Apr 8 13:02:30 2014 +0300

    We build a static libGLEW for iOS anyway
    
    So no need to bother with what framework(s) to link to.
    
    Change-Id: I7dac64357bc01221787ef7e393952d492e2d84c7

diff --git a/external/glew/UnpackedTarball_glew.mk b/external/glew/UnpackedTarball_glew.mk
index c3124d8..91ec240 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 05814f6..0000000
--- 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 =