From 768e9252714b57421b5c893a8258469a14630a30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Tue, 7 Jun 2016 19:59:33 +0200 Subject: GLEW: Define static + enabled and includes via SCons This allows us not to have to hack our definitions in the upstream files, making it easier to upgrade to newer versions in the future. For the include paths to work, the headers are moved to a GL subfolder to match their upstream location. --- platform/x11/detect.py | 3 ++- platform/x11/platform_config.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'platform/x11') 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" -- cgit v1.2.3