adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Getting rid of GFXMODULE_SDL and SNDMODULE_SDL defines, as we don't need

Browse Source 
them any more.



git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3524 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
Meep-Eep
2010-01-25 21:43:40 +00:00
parent b66ec8066b
commit ac0f4b0eef
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/build/unix/build.config
+2 -4
View File
@@ -198,7 +198,6 @@ uqm_prepare_config()
CHOICE_graphics_OPTION_pure_TITLE="Don't include OpenGL graphics support" CHOICE_graphics_OPTION_pure_TITLE="Don't include OpenGL graphics support"
CHOICE_graphics_OPTION_pure_ACTION='graphics_pure_action' CHOICE_graphics_OPTION_pure_ACTION='graphics_pure_action'
graphics_pure_action() { graphics_pure_action() {
CFLAGS="$CFLAGS -DGFXMODULE_SDL"
GFXMODULE_SDL=1 GFXMODULE_SDL=1
HAVE_OPENGL=0 HAVE_OPENGL=0
} }
@@ -206,7 +205,7 @@ uqm_prepare_config()
CHOICE_graphics_OPTION_opengl_ACTION='graphics_opengl_action' CHOICE_graphics_OPTION_opengl_ACTION='graphics_opengl_action'
CHOICE_graphics_OPTION_opengl_PRECOND="have_library opengl" CHOICE_graphics_OPTION_opengl_PRECOND="have_library opengl"
graphics_opengl_action() { graphics_opengl_action() {
CFLAGS="$CFLAGS -DGFXMODULE_SDL -DHAVE_OPENGL" CFLAGS="$CFLAGS -DHAVE_OPENGL"
GFXMODULE_SDL=1 GFXMODULE_SDL=1
HAVE_OPENGL=1 HAVE_OPENGL=1
use_library opengl use_library opengl
@@ -218,14 +217,13 @@ uqm_prepare_config()
CHOICE_sound_OPTION_mixsdl_TITLE="Use MixSDL for sound (internal)" CHOICE_sound_OPTION_mixsdl_TITLE="Use MixSDL for sound (internal)"
CHOICE_sound_OPTION_mixsdl_ACTION=sound_mixsdl_action CHOICE_sound_OPTION_mixsdl_ACTION=sound_mixsdl_action
sound_mixsdl_action() { sound_mixsdl_action() {
CFLAGS="$CFLAGS -DSOUNDMODULE_SDL"
SOUNDMODULE=mixsdl SOUNDMODULE=mixsdl
} }
CHOICE_sound_OPTION_openal_TITLE="Include OpenAL support (experimental)" CHOICE_sound_OPTION_openal_TITLE="Include OpenAL support (experimental)"
CHOICE_sound_OPTION_openal_PRECOND="have_library openal" CHOICE_sound_OPTION_openal_PRECOND="have_library openal"
CHOICE_sound_OPTION_openal_ACTION=sound_openal_action CHOICE_sound_OPTION_openal_ACTION=sound_openal_action
sound_openal_action() { sound_openal_action() {
CFLAGS="$CFLAGS -DHAVE_OPENAL -DSOUNDMODULE_SDL" CFLAGS="$CFLAGS -DHAVE_OPENAL"
SOUNDMODULE=openal SOUNDMODULE=openal
use_library openal use_library openal
} }