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/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