diff options
| author | Travis CI <zmoelnig@travis-ci.umlaeute.mur.at> | 2019-02-07 21:06:33 +0000 |
|---|---|---|
| committer | Travis CI <zmoelnig@travis-ci.umlaeute.mur.at> | 2019-02-07 21:06:33 +0000 |
| commit | 2d50e14a3be3d93d9dcf72998691f0f6f0e7c771 (patch) | |
| tree | c08f880e80da582c69b43c5e1f0cc812ee4972d7 | |
| parent | 5488a050cb9152de6d6da5d0e2863c76d3144946 (diff) | |
Gem f3be46d2265d6e2ec7abd3bf7ac888faf56e0c1a linux/amd64
built 'master:f3be46d2265d6e2ec7abd3bf7ac888faf56e0c1a' for linux/amd64
| -rwxr-xr-x | Gem/Gem.pd_linux | bin | 35619583 -> 35627279 bytes | |||
| -rw-r--r-- | Gem/develop/include/Gem/Gem/GemGL.h | 10 | ||||
| -rw-r--r-- | Gem/develop/include/Gem/Utils/GLUtil.h | 2 | ||||
| -rwxr-xr-x | Gem/gem_modelOBJ.so | bin | 696320 -> 696424 bytes | |||
| -rwxr-xr-x | Gem/gem_recordQT4L.so | bin | 457323 -> 457339 bytes | |||
| -rwxr-xr-x | Gem/gem_recordV4L.so | bin | 128110 -> 128110 bytes | |||
| -rwxr-xr-x | Gem/gem_recordV4L2.so | bin | 127005 -> 127013 bytes |
7 files changed, 11 insertions, 1 deletions
diff --git a/Gem/Gem.pd_linux b/Gem/Gem.pd_linux Binary files differindex f1b134b..40575d3 100755 --- a/Gem/Gem.pd_linux +++ b/Gem/Gem.pd_linux 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); diff --git a/Gem/gem_modelOBJ.so b/Gem/gem_modelOBJ.so Binary files differindex c897bd1..b647c06 100755 --- a/Gem/gem_modelOBJ.so +++ b/Gem/gem_modelOBJ.so diff --git a/Gem/gem_recordQT4L.so b/Gem/gem_recordQT4L.so Binary files differindex f637fbb..5b60a5a 100755 --- a/Gem/gem_recordQT4L.so +++ b/Gem/gem_recordQT4L.so diff --git a/Gem/gem_recordV4L.so b/Gem/gem_recordV4L.so Binary files differindex f144064..c872e4b 100755 --- a/Gem/gem_recordV4L.so +++ b/Gem/gem_recordV4L.so diff --git a/Gem/gem_recordV4L2.so b/Gem/gem_recordV4L2.so Binary files differindex 990fc8a..44c76cb 100755 --- a/Gem/gem_recordV4L2.so +++ b/Gem/gem_recordV4L2.so |