Browse Source

Haiku: Do not define GLEW_ENABLED to undefine it later

Partial revert of f61eb5fd8e13642c82364f8ee66a0f6c791a4511.
Rémi Verschelde 9 years ago
parent
commit
4c658dc523
2 changed files with 3 additions and 6 deletions
  1. 0 4
      drivers/gl_context/glew.c
  2. 3 2
      platform/haiku/detect.py

+ 0 - 4
drivers/gl_context/glew.c

@@ -1,7 +1,3 @@
-#ifdef __HAIKU__
-	#undef GLEW_ENABLED
-#endif
-
 #ifdef GLEW_ENABLED
 /*
 ** The OpenGL Extension Wrangler Library

+ 3 - 2
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')})