diff options
| author | Tor Lillqvist <tml@collabora.com> | 2015-06-17 18:40:22 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2015-06-17 19:12:48 +0300 |
| commit | 158dca0e47d533ea0a532596061f794a4c24be91 (patch) | |
| tree | 8e1d1358d4ae6e628c08f5c91e92456e0009d0b8 /external/glew | |
| parent | 4a273473998a47ea7d125d3d4bd7e6d8b252767a (diff) | |
This patch is upstream, too
Change-Id: I8a8d78b291c4b1fb6f0ef5d97cfae7c6a6ceaf64
Diffstat (limited to 'external/glew')
| -rw-r--r-- | external/glew/UnpackedTarball_glew.mk | 6 | ||||
| -rw-r--r-- | external/glew/glew-ios.patch.1 | 19 |
2 files changed, 0 insertions, 25 deletions
diff --git a/external/glew/UnpackedTarball_glew.mk b/external/glew/UnpackedTarball_glew.mk index 0c86057c704e..3b1a5a187361 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 b29f75bf3f90..000000000000 --- a/external/glew/glew-ios.patch.1 +++ /dev/null @@ -1,19 +0,0 @@ --*- Mode:Diff -*- ---- glew/include/GL/glew.h -+++ glew/include/GL/glew.h -@@ -1180,6 +1180,15 @@ - - /* ---------------------------------- GLU ---------------------------------- */ - -+#ifndef GLEW_NO_GLU -+# ifdef __APPLE__ -+# include <Availability.h> -+# if defined(__IPHONE_OS_VERSION_MIN_REQUIRED) -+# define GLEW_NO_GLU -+# endif -+# endif -+#endif -+ - #ifndef GLEW_NO_GLU - /* this is where we can safely include GLU */ - # if defined(__APPLE__) && defined(__MACH__) |