TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Collapse ogldefines handling

Browse source 
ogldefines is always set to ['OGL'], so remove the definitions of it and
just set that value explicitly when OpenGL is used
This commit is contained in:
Kp 2013-02-24 22:48:00 +00:00
parent 857c8d30ac
commit e14d2ad601
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
SConstruct
View file

@ -330,7 +330,6 @@ if sys.platform == 'win32':
user_settings.sharepath = '' user_settings.sharepath = ''
env.Append(CPPDEFINES = ['_WIN32', 'HAVE_STRUCT_TIMEVAL']) env.Append(CPPDEFINES = ['_WIN32', 'HAVE_STRUCT_TIMEVAL'])
env.Append(CPPPATH = ['arch/win32/include']) env.Append(CPPPATH = ['arch/win32/include'])
ogldefines = ['OGL']
common_sources += ['arch/win32/messagebox.c'] common_sources += ['arch/win32/messagebox.c']
ogllibs = '' ogllibs = ''
libs += ['glu32', 'wsock32', 'ws2_32', 'winmm', 'mingw32', 'SDLmain', 'SDL'] 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__']) env.Append(CPPDEFINES = ['HAVE_STRUCT_TIMESPEC', 'HAVE_STRUCT_TIMEVAL', '__unix__'])
user_settings.asm = 0 user_settings.asm = 0
env.Append(CPPPATH = ['arch/linux/include']) env.Append(CPPPATH = ['arch/linux/include'])
ogldefines = ['OGL']
common_sources += ['arch/cocoa/SDLMain.m', 'arch/carbon/messagebox.c'] common_sources += ['arch/cocoa/SDLMain.m', 'arch/carbon/messagebox.c']
ogllibs = '' ogllibs = ''
libs = '' libs = ''
@ -370,7 +368,6 @@ else:
env.ParseConfig('sdl-config --libs') env.ParseConfig('sdl-config --libs')
env.Append(CPPDEFINES = ['__LINUX__', 'HAVE_STRUCT_TIMESPEC', 'HAVE_STRUCT_TIMEVAL']) env.Append(CPPDEFINES = ['__LINUX__', 'HAVE_STRUCT_TIMESPEC', 'HAVE_STRUCT_TIMEVAL'])
env.Append(CPPPATH = ['arch/linux/include']) env.Append(CPPPATH = ['arch/linux/include'])
ogldefines = ['OGL']
libs += env['LIBS'] libs += env['LIBS']
if (user_settings.opengles == 1): if (user_settings.opengles == 1):
ogllibs = [ user_settings.opengles_lib, 'EGL'] ogllibs = [ user_settings.opengles_lib, 'EGL']
@ -393,7 +390,7 @@ if (user_settings.opengl == 1) or (user_settings.opengles == 1):
env.Append(CPPDEFINES = ['OGLES']) env.Append(CPPDEFINES = ['OGLES'])
else: else:
print "building with OpenGL" print "building with OpenGL"
env.Append(CPPDEFINES = ogldefines) env.Append(CPPDEFINES = ['OGL'])
common_sources += arch_ogl_sources common_sources += arch_ogl_sources
libs += ogllibs libs += ogllibs
else: else: