aboutsummaryrefslogtreecommitdiff
path: root/Gem/develop/include
diff options
context:
space:
mode:
authorTravis CI <zmoelnig@travis-ci.umlaeute.mur.at>2019-02-07 23:07:46 +0000
committerTravis CI <zmoelnig@travis-ci.umlaeute.mur.at>2019-02-07 23:07:46 +0000
commitaa5a0048ef7a324e85a5704c0e0ea5374b5da3a9 (patch)
treef0115f7a4482f678ae13ef5a0e692a6c51e09629 /Gem/develop/include
parent2d8e19d10be55c6c7f99bb306bec3507b353f485 (diff)
Gem 6ea7a457bfdbafb64c4123cb12882643bcf4109f osx/i386
built 'master:6ea7a457bfdbafb64c4123cb12882643bcf4109f' for osx/i386
Diffstat (limited to 'Gem/develop/include')
-rw-r--r--Gem/develop/include/Gem/Gem/GemGL.h10
-rw-r--r--Gem/develop/include/Gem/Utils/GLUtil.h2
2 files changed, 11 insertions, 1 deletions
diff --git a/Gem/develop/include/Gem/Gem/GemGL.h b/Gem/develop/include/Gem/Gem/GemGL.h
index ef3b250..49ac407 100644
--- a/Gem/develop/include/Gem/Gem/GemGL.h
+++ b/Gem/develop/include/Gem/Gem/GemGL.h
@@ -32,11 +32,19 @@
# define GLEW_MX
#endif
+#ifndef GEM_HAVE_GLU
+# define GLEW_NO_GLU
+#else
+#endif
+
+
#ifdef __EMSCRIPTEN__
# include <GL/glew.h>
# include <SDL/SDL_opengl.h>
# include <GL/gl.h>
-# include <GL/glu.h>
+# ifdef GEM_HAVE_GLU
+# include <GL/glu.h>
+# endif
#else
# include "Gem/glew.h"
#endif
diff --git a/Gem/develop/include/Gem/Utils/GLUtil.h b/Gem/develop/include/Gem/Utils/GLUtil.h
index fb15b25..a28377c 100644
--- a/Gem/develop/include/Gem/Utils/GLUtil.h
+++ b/Gem/develop/include/Gem/Utils/GLUtil.h
@@ -46,6 +46,8 @@ GEM_EXTERN extern int getGLdefine(const struct _symbol *name);
GEM_EXTERN extern int getGLdefine(const struct _atom *name);
GEM_EXTERN extern int getGLbitfield(int argc,
struct _atom *argv);
+GEM_EXTERN extern void gluLookAt(GLdouble, GLdouble, GLdouble, GLdouble, GLdouble, GLdouble, GLdouble, GLdouble, GLdouble);
+GEM_EXTERN extern void gluPerspective(GLdouble, GLdouble, GLdouble, GLdouble);