aboutsummaryrefslogtreecommitdiff
path: root/Gem/develop
diff options
context:
space:
mode:
authorTravis CI <zmoelnig@travis-ci.umlaeute.mur.at>2019-02-07 23:07:09 +0000
committerTravis CI <zmoelnig@travis-ci.umlaeute.mur.at>2019-02-07 23:07:09 +0000
commit458374b222dddc23df056298b1485ac5508624bd (patch)
tree1bfa1d84bacae16a4e042bb87b2b157758735492 /Gem/develop
parent336aab27be02c79cebad1b9ee1a96425222036e0 (diff)
Gem 6ea7a457bfdbafb64c4123cb12882643bcf4109f osx/x86_64
built 'master:6ea7a457bfdbafb64c4123cb12882643bcf4109f' for osx/x86_64
Diffstat (limited to 'Gem/develop')
-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);