From ff3189edf0971262d63b67776b54d64506040162 Mon Sep 17 00:00:00 2001
From: Travis CI <zmoelnig@travis-ci.umlaeute.mur.at>
Date: Fri, 11 Jan 2019 09:48:11 +0000
Subject: Gem 40e01d74025f00d4be4a0732389a16b070b76d2d linux/amd64

built 'master:40e01d74025f00d4be4a0732389a16b070b76d2d' for linux/amd64
---
 Gem/develop/include/Gem/Gem/GemGL.h    | 16 +++++++++++++++-
 Gem/develop/include/Gem/Utils/GLUtil.h |  4 ++++
 2 files changed, 19 insertions(+), 1 deletion(-)

(limited to 'Gem/develop')

diff --git a/Gem/develop/include/Gem/Gem/GemGL.h b/Gem/develop/include/Gem/Gem/GemGL.h
index a009928..ef3b250 100644
--- a/Gem/develop/include/Gem/Gem/GemGL.h
+++ b/Gem/develop/include/Gem/Gem/GemGL.h
@@ -32,10 +32,18 @@
 # define GLEW_MX
 #endif
 
-#include "Gem/glew.h"
+#ifdef __EMSCRIPTEN__
+# include <GL/glew.h>
+# include <SDL/SDL_opengl.h>
+# include <GL/gl.h>
+# include <GL/glu.h>
+#else
+# include "Gem/glew.h"
+#endif
 
 #ifdef __APPLE__
 # include <OpenGL/OpenGL.h>
+#elif defined(__EMSCRIPTEN__)
 #elif defined _WIN32
 # include "Gem/wglew.h"
 #elif defined(__linux__) || defined(__FreeBSD_kernel__)
@@ -86,4 +94,10 @@ GEM_EXTERN GLXEWContext*glxewGetContext(void);
 # endif
 #endif
 
+
+// missing from Emscripten's glew implementation
+#ifndef GL_TEXTURE_RECTANGLE_EXT
+# define GL_TEXTURE_RECTANGLE_EXT 0x84F5
+#endif
+
 #endif /* _INCLUDE__GEM_GEM_GEMGL_H_ */
diff --git a/Gem/develop/include/Gem/Utils/GLUtil.h b/Gem/develop/include/Gem/Utils/GLUtil.h
index 7dad69d..fb15b25 100644
--- a/Gem/develop/include/Gem/Utils/GLUtil.h
+++ b/Gem/develop/include/Gem/Utils/GLUtil.h
@@ -26,7 +26,11 @@ struct _symbol;
 #include <string>
 
 /* for GLenum */
+#ifdef __EMSCRIPTEN__
+#include "Gem/glew.h"
+#else
 #include "Gem/GemGL.h"
+#endif
 #include "Gem/Exception.h"
 
 
-- 
cgit v1.2.1