diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-06-08 07:54:31 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2016-06-08 07:54:31 -0300 |
| commit | 3d95c82669ebcbee15e04574aa179a3da2e712a3 (patch) | |
| tree | 05cca7da008c1cf8caf2857984f52fb684ef4ab7 /platform/x11 | |
| parent | 040c87ea7b81c8235435626bca02f1046b059c1b (diff) | |
| parent | 5bed0af65e7bac0a4f8b97ea5392d2df2c25622d (diff) | |
Merge pull request #5090 from akien-mga/glew-1.13.0
Upgrade embedded GLEW to version 1.13.0
Diffstat (limited to 'platform/x11')
| -rw-r--r-- | platform/x11/detect.py | 3 | ||||
| -rw-r--r-- | platform/x11/platform_config.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/platform/x11/detect.py b/platform/x11/detect.py index 5a43bf9323..2561e09b9a 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -65,6 +65,7 @@ def get_flags(): return [ ('builtin_zlib', 'no'), + ('glew', 'yes'), ("openssl", "yes"), #("theora","no"), ] @@ -147,7 +148,7 @@ def configure(env): env.Append(CPPPATH=['#drivers/freetype/freetype/include']) - env.Append(CPPFLAGS=['-DOPENGL_ENABLED','-DGLEW_ENABLED']) + env.Append(CPPFLAGS=['-DOPENGL_ENABLED']) if os.system("pkg-config --exists alsa")==0: print("Enabling ALSA") diff --git a/platform/x11/platform_config.h b/platform/x11/platform_config.h index aac50c27c2..3b47b2c92d 100644 --- a/platform/x11/platform_config.h +++ b/platform/x11/platform_config.h @@ -34,6 +34,6 @@ #define PTHREAD_BSD_SET_NAME #endif -#define GLES2_INCLUDE_H "gl_context/glew.h" +#define GLES2_INCLUDE_H "gl_context/GL/glew.h" |