diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2016-06-07 19:22:05 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2016-06-08 00:10:30 +0200 |
| commit | 4c658dc52303ece088a245ede2835a68b78530b2 (patch) | |
| tree | 94f3d7d653c9c637c2d077e6b4f04f5bb990177f | |
| parent | 193272aa8a809168b836dde3535cf96ce1f52264 (diff) | |
Haiku: Do not define GLEW_ENABLED to undefine it later
Partial revert of f61eb5fd8e13642c82364f8ee66a0f6c791a4511.
| -rw-r--r-- | drivers/gl_context/glew.c | 4 | ||||
| -rw-r--r-- | platform/haiku/detect.py | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/drivers/gl_context/glew.c b/drivers/gl_context/glew.c index 962e82b657..fc0aa28a72 100644 --- a/drivers/gl_context/glew.c +++ b/drivers/gl_context/glew.c @@ -1,7 +1,3 @@ -#ifdef __HAIKU__ - #undef GLEW_ENABLED -#endif - #ifdef GLEW_ENABLED /* ** The OpenGL Extension Wrangler Library diff --git a/platform/haiku/detect.py b/platform/haiku/detect.py index 637b42dc03..2d132641f9 100644 --- a/platform/haiku/detect.py +++ b/platform/haiku/detect.py @@ -52,9 +52,10 @@ 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', '-DOPENGL_ENABLED', '-DMEDIA_KIT_ENABLED']) + #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', 'GLEW']) + env.Append(LIBS = ['be', 'game', 'media', 'network', 'bnetapi', 'z', 'GL']) import methods env.Append(BUILDERS = {'GLSL120' : env.Builder(action = methods.build_legacygl_headers, suffix = 'glsl.h',src_suffix = '.glsl')}) |