From 458374b222dddc23df056298b1485ac5508624bd Mon Sep 17 00:00:00 2001 From: Travis CI Date: Thu, 7 Feb 2019 23:07:09 +0000 Subject: Gem 6ea7a457bfdbafb64c4123cb12882643bcf4109f osx/x86_64 built 'master:6ea7a457bfdbafb64c4123cb12882643bcf4109f' for osx/x86_64 --- Gem/develop/include/Gem/Gem/GemGL.h | 10 +++++++++- Gem/develop/include/Gem/Utils/GLUtil.h | 2 ++ 2 files changed, 11 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 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 # include # include -# include +# ifdef GEM_HAVE_GLU +# include +# 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); -- cgit v1.2.1