From e14d2ad60194ee0c0d6bfb4f359ba580f06f22af Mon Sep 17 00:00:00 2001
From: Kp <kp@valhallalegends.com>
Date: Sun, 24 Feb 2013 22:48:00 +0000
Subject: [PATCH] Collapse ogldefines handling

ogldefines is always set to ['OGL'], so remove the definitions of it and
just set that value explicitly when OpenGL is used
---
 SConstruct | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/SConstruct b/SConstruct
index faa7ed51a..e35673709 100644
--- a/SConstruct
+++ b/SConstruct
@@ -330,7 +330,6 @@ if sys.platform == 'win32':
 	user_settings.sharepath = ''
 	env.Append(CPPDEFINES = ['_WIN32', 'HAVE_STRUCT_TIMEVAL'])
 	env.Append(CPPPATH = ['arch/win32/include'])
-	ogldefines = ['OGL']
 	common_sources += ['arch/win32/messagebox.c']
 	ogllibs = ''
 	libs += ['glu32', 'wsock32', 'ws2_32', 'winmm', 'mingw32', 'SDLmain', 'SDL']
@@ -342,7 +341,6 @@ elif sys.platform == 'darwin':
 	env.Append(CPPDEFINES = ['HAVE_STRUCT_TIMESPEC', 'HAVE_STRUCT_TIMEVAL', '__unix__'])
 	user_settings.asm = 0
 	env.Append(CPPPATH = ['arch/linux/include'])
-	ogldefines = ['OGL']
 	common_sources += ['arch/cocoa/SDLMain.m', 'arch/carbon/messagebox.c']
 	ogllibs = ''
 	libs = ''
@@ -370,7 +368,6 @@ else:
 	env.ParseConfig('sdl-config --libs')
 	env.Append(CPPDEFINES = ['__LINUX__', 'HAVE_STRUCT_TIMESPEC', 'HAVE_STRUCT_TIMEVAL'])
 	env.Append(CPPPATH = ['arch/linux/include'])
-	ogldefines = ['OGL']
 	libs += env['LIBS']
 	if (user_settings.opengles == 1):
 		ogllibs = [ user_settings.opengles_lib, 'EGL']
@@ -393,7 +390,7 @@ if (user_settings.opengl == 1) or (user_settings.opengles == 1):
 		env.Append(CPPDEFINES = ['OGLES'])
 	else:
 		print "building with OpenGL"
-	env.Append(CPPDEFINES = ogldefines)
+	env.Append(CPPDEFINES = ['OGL'])
 	common_sources += arch_ogl_sources
 	libs += ogllibs
 else: