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/osx/detect.py | 7 ++----- platform/osx/platform_config.h | 3 +-- 2 files changed, 3 insertions(+), 7 deletions(-) (limited to 'platform/osx') diff --git a/platform/osx/detect.py b/platform/osx/detect.py index d668509b90..d1aa54b71d 100644 --- a/platform/osx/detect.py +++ b/platform/osx/detect.py @@ -28,10 +28,10 @@ def get_opts(): def get_flags(): return [ - ('opengl', 'no'), ('legacygl', 'yes'), ('builtin_zlib', 'no'), ('freetype','builtin'), #use builtin freetype + ('glew', 'yes'), ] @@ -94,11 +94,8 @@ def configure(env): # env.Append(LIBPATH=['#platform/osx/lib']) - #if env['opengl'] == 'yes': - # env.Append(CPPFLAGS=['-DOPENGL_ENABLED','-DGLEW_ENABLED']) - env.Append(CPPFLAGS=["-DAPPLE_STYLE_KEYS"]) - env.Append(CPPFLAGS=['-DUNIX_ENABLED','-DGLES2_ENABLED','-DGLEW_ENABLED', '-DOSX_ENABLED']) + env.Append(CPPFLAGS=['-DUNIX_ENABLED','-DGLES2_ENABLED','-DOSX_ENABLED']) env.Append(LIBS=['pthread']) #env.Append(CPPFLAGS=['-F/Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks', '-isysroot', '/Developer/SDKs/MacOSX10.4u.sdk', '-mmacosx-version-min=10.4']) #env.Append(LINKFLAGS=['-mmacosx-version-min=10.4', '-isysroot', '/Developer/SDKs/MacOSX10.4u.sdk', '-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk']) diff --git a/platform/osx/platform_config.h b/platform/osx/platform_config.h index 085f13df73..86505206ae 100644 --- a/platform/osx/platform_config.h +++ b/platform/osx/platform_config.h @@ -27,6 +27,5 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ #include -#define GLES2_INCLUDE_H "gl_context/glew.h" -#define GLES1_INCLUDE_H "gl_context/glew.h" +#define GLES2_INCLUDE_H "gl_context/GL/glew.h" #define PTHREAD_RENAME_SELF -- cgit v1.2.3