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.

7 files changed, 11 insertions, 14 deletions

diff --git a/platform/haiku/detect.py b/platform/haiku/detect.py
index 2d132641f9..6d1a96a8da 100644
--- a/platform/haiku/detect.py
+++ b/platform/haiku/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'])
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 <alloca.h>
-#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
diff --git a/platform/windows/detect.py b/platform/windows/detect.py
index 97d2461e58..a6a949a11a 100644
--- a/platform/windows/detect.py
+++ b/platform/windows/detect.py
@@ -169,6 +169,7 @@ def get_flags():
 
 	return [
 		('freetype','builtin'), #use builtin freetype
+		('glew','yes'),
 		('openssl','builtin'), #use builtin openssl
 	]
 
@@ -242,7 +243,6 @@ def configure(env):
 
 		env.Append(CCFLAGS=['/DGLES2_ENABLED'])
 
-		env.Append(CCFLAGS=['/DGLEW_ENABLED'])
 		LIBS=['winmm','opengl32','dsound','kernel32','ole32','oleaut32','user32','gdi32', 'IPHLPAPI','Shlwapi', 'wsock32', 'shell32','advapi32','dinput8','dxguid']
 		env.Append(LINKFLAGS=[p+env["LIBSUFFIX"] for p in LIBS])
 
@@ -369,7 +369,7 @@ def configure(env):
 
 		env.Append(CCFLAGS=['-DWINDOWS_ENABLED','-mwindows'])
 		env.Append(CPPFLAGS=['-DRTAUDIO_ENABLED'])
-		env.Append(CCFLAGS=['-DGLES2_ENABLED','-DGLEW_ENABLED'])
+		env.Append(CCFLAGS=['-DGLES2_ENABLED'])
 		env.Append(LIBS=['mingw32','opengl32', 'dsound', 'ole32', 'd3d9','winmm','gdi32','iphlpapi','shlwapi','wsock32','kernel32', 'oleaut32', 'dinput8', 'dxguid'])
 
 		# if (env["bits"]=="32"):
diff --git a/platform/windows/platform_config.h b/platform/windows/platform_config.h
index 55f6b5547e..9e20750816 100644
--- a/platform/windows/platform_config.h
+++ b/platform/windows/platform_config.h
@@ -30,6 +30,6 @@
 //#else
 //#include <alloca.h>
 //#endif
-#define GLES2_INCLUDE_H "gl_context/glew.h"
+#define GLES2_INCLUDE_H "gl_context/GL/glew.h"
 
 
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"