diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-04-08 13:54:53 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-04-08 14:45:49 +0300 |
| commit | d3f63d4b3d75d5e1b0df3281a1bdf7be1729288e (patch) | |
| tree | 628429abb19ef4501fa36770841ddd49553ab284 | |
| parent | 65b27f8d1c23692426c9d90f546462b9e43fec24 (diff) | |
No glu.h in OpenGL ES for iOS
Change-Id: Ie0eb1f68d997c4f2bd37c9d7c2ff6feccbc7b8ce
| -rw-r--r-- | external/glew/UnpackedTarball_glew.mk | 7 | ||||
| -rw-r--r-- | external/glew/glew-ios.patch.1 | 14 |
2 files changed, 21 insertions, 0 deletions
diff --git a/external/glew/UnpackedTarball_glew.mk b/external/glew/UnpackedTarball_glew.mk index 91ec24021708..1b100bcf2a27 100644 --- a/external/glew/UnpackedTarball_glew.mk +++ b/external/glew/UnpackedTarball_glew.mk @@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,glew,0)) $(eval $(call gb_UnpackedTarball_fix_end_of_line,glew,\ Makefile \ + include/GL/glew.h \ )) ifeq ($(OS)$(COM),WNTMSC) @@ -35,6 +36,12 @@ $(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 new file mode 100644 index 000000000000..9253ed3a771d --- /dev/null +++ b/external/glew/glew-ios.patch.1 @@ -0,0 +1,14 @@ +-*- Mode:Diff -*- +--- glew/include/GL/glew.h ++++ glew/include/GL/glew.h +@@ -1180,6 +1180,10 @@ + + /* ---------------------------------- GLU ---------------------------------- */ + ++#if !defined(GLEW_NO_GLU) && defined(__APPLE__) && defined(__IPHONE_OS_VERSION_MIN_REQUIRED) ++#define GLEW_NO_GLU ++#endif ++ + #ifndef GLEW_NO_GLU + /* this is where we can safely include GLU */ + # if defined(__APPLE__) && defined(__MACH__) |