From e1cb00e2145f859cf0c589d84cdd1e9f5c4b8087 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: [PATCH] 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. --- detect.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/detect.py b/detect.py index 2d132641..6d1a96a8 100644 --- a/detect.py +++ b/detect.py @@ -23,7 +23,8 @@ def get_opts(): def get_flags(): return [ - ('builtin_zlib', 'no') + ('builtin_zlib', 'no'), + #('glew', 'yes'), # TODO: investigate the GLEW situation on Haiku ] def configure(env): @@ -52,7 +53,6 @@ def configure(env): #env.Append(CCFLAGS=['-DFREETYPE_ENABLED']) env.Append(CPPFLAGS = ['-DPTHREAD_NO_RENAME']) # TODO: enable when we have pthread_setname_np - #env.Append(CPPFLAGS = ['-DGLEW_ENABLED']) # TODO: investigate the GLEW situation on Haiku env.Append(CPPFLAGS = ['-DOPENGL_ENABLED', '-DMEDIA_KIT_ENABLED']) env.Append(CPPFLAGS = ['-DUNIX_ENABLED', '-DGLES2_ENABLED', '-DGLES_OVER_GL']) env.Append(LIBS = ['be', 'game', 'media', 'network', 'bnetapi', 'z', 'GL'])