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.vars.in

@@ -42,7 +42,7 @@ uqm_OGGVORBIS='@OGGVORBIS@'
 uqm_USE_INTERNAL_MIKMOD='@USE_INTERNAL_MIKMOD@'
 uqm_HAVE_GETOPT_LONG='@HAVE_GETOPT_LONG@'
 uqm_HAVE_REGEX='@HAVE_REGEX_H_FLAG@'
-uqm_GFXMODULE_SDL='@GFXMODULE_SDL@'
+uqm_GFXMODULE='@GFXMODULE@'
 uqm_HAVE_OPENGL='@HAVE_OPENGL@'
 uqm_USE_ZIP_IO='@USE_ZIP_IO@'
 uqm_USE_PLATFORM_ACCEL='@USE_PLATFORM_ACCEL@'
@@ -55,6 +55,6 @@ MACRO___MINGW32__='@MACRO___MINGW32__@'
 export BUILD_SYSTEM HOST_SYSTEM DEBUG
 export MACRO_WIN32 MACRO___MINGW32__
 export uqm_SOUNDMODULE uqm_USE_INTERNAL_MIKMOD uqm_HAVE_GETOPT_LONG
-export uqm_HAVE_REGEX uqm_USE_WINSOCK uqm_GFXMODULE_SDL uqm_HAVE_OPENGL
+export uqm_HAVE_REGEX uqm_USE_WINSOCK uqm_GFXMODULE uqm_HAVE_OPENGL
 export uqm_USE_ZIP_IO uqm_USE_PLATFORM_ACCEL uqm_THREADLIB uqm_NETPLAY
 

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"
+		CFLAGS="$CFLAGS -DGFXMODULE_SDL -DHAVE_OPENGL"
-		GFXMODULE_SDL=1
+		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 \

sc2/src/libs/graphics/Makeinfo

@@ -1,10 +1,9 @@
-uqm_SUBDIRS=
+if [ "$uqm_GFXMODULE" = "sdl" ]; then
+	uqm_SUBDIRS="sdl"
+fi
+
 uqm_CFILES="boxint.c clipline.c cmap.c context.c drawable.c filegfx.c
 		bbox.c dcqueue.c gfxload.c
 		font.c frame.c gfx_common.c intersec.c loaddisp.c
 		pixmap.c resgfx.c tfb_draw.c tfb_prim.c widgets.c"
 
-if [ -n "$uqm_GFXMODULE_SDL" ]; then
-	uqm_SUBDIRS="$uqm_SUBDIRS sdl"
-fi
-

sc2/src/libs/input/Makeinfo

@@ -1,2 +1,5 @@
-uqm_SUBDIRS="sdl"
+if [ "$uqm_GFXMODULE" = "sdl" ]; then
+	uqm_SUBDIRS="sdl"
+fi
+
 uqm_CFILES="input_common.c"

sc2/src/libs/input/sdl/input.c

@@ -16,8 +16,6 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef GFXMODULE_SDL
-
 #include <assert.h>
 #include <errno.h>
 #include "../inpintrn.h"
@@ -511,4 +509,3 @@ BeginInputFrame (void)
 	VControl_BeginFrame ();
 }
 
-#endif