Fixing the problems caused by the previous commits.

Note to self: don't commit in a hurry nor while half-asleep.




git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3526 8092fc87-c524-0410-9efc-e669fe64eaf9

sc2/build/unix/build.config

@@ -198,15 +198,16 @@ uqm_prepare_config()
 	CHOICE_graphics_OPTION_pure_TITLE="Don't include OpenGL graphics support"
 	CHOICE_graphics_OPTION_pure_ACTION='graphics_pure_action'
 	graphics_pure_action() {
-		GFXMODULE_SDL=1
+		CFLAGS="$CFLAGS -DGFXMODULE_SDL"
+		GFXMODULE=sdl
 		HAVE_OPENGL=0
 	}
 	CHOICE_graphics_OPTION_opengl_TITLE="Include OpenGL graphics support"
 	CHOICE_graphics_OPTION_opengl_ACTION='graphics_opengl_action'
 	CHOICE_graphics_OPTION_opengl_PRECOND="have_library opengl"
 	graphics_opengl_action() {
-		CFLAGS="$CFLAGS -DHAVE_OPENGL"
-		GFXMODULE_SDL=1
+		CFLAGS="$CFLAGS -DGFXMODULE_SDL -DHAVE_OPENGL"
+		GFXMODULE=sdl
 		HAVE_OPENGL=1
 		use_library opengl
 	}
@@ -435,7 +436,7 @@ uqm_process_config() {
 			PREPROC_OBJC MKDEP_OBJC COMPILE_OBJC \
 			MAKE ECHON SED DEBUG JOYSTICK NETPLAY \
 			OGGVORBIS SOUNDMODULE USE_INTERNAL_MIKMOD \
-			GFXMODULE_SDL HAVE_OPENGL \
+			GFXMODULE HAVE_OPENGL \
 			HAVE_GETOPT_LONG HAVE_REGEX_H_FLAG \
 			USE_ZIP_IO USE_PLATFORM_ACCEL THREADLIB USE_WINSOCK \
 			INSTALL_LIBDIR INSTALL_BINDIR INSTALL_SHAREDIR \