[Scummvm-cvs-logs] CVS: scummvm Makefile,1.47,1.48 Makefile.common,1.64,1.65 configure,1.42,1.43

[Max Horn]

Update of /cvsroot/scummvm/scummvm
In directory sc8-pr-cvs1:/tmp/cvs-serv27705

Modified Files:
	Makefile Makefile.common configure 
Log Message:
some tweaks to the build system (work toward plugin support)

Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- Makefile	23 Aug 2003 20:36:46 -0000	1.47
+++ Makefile	17 Sep 2003 21:53:11 -0000	1.48
@@ -23,13 +23,16 @@
 LIBS	:=
 OBJS	:=
 
+MODULES :=
+MODULE_DIRS :=
+
 # Load the make rules generated by configure
 include config.mak
 
 # Uncomment this for stricter compile time code verification
 # CXXFLAGS+= -Wshadow -Werror
 
-CXXFLAGS:= -O -Wall -Wuninitialized -Wno-long-long -Wno-multichar -Wno-unknown-pragmas $(CXXFLAGS)
+CXXFLAGS:= -O -fno-inline -Wall -Wuninitialized -Wno-long-long -Wno-multichar -Wno-unknown-pragmas $(CXXFLAGS)
 # Even more warnings...
 CXXFLAGS+= -pedantic -Wpointer-arith -Wcast-qual -Wcast-align -Wconversion
 CXXFLAGS+= -Wshadow -Wimplicit -Wundef -Wnon-virtual-dtor

Index: Makefile.common
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile.common,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- Makefile.common	8 Sep 2003 22:38:21 -0000	1.64
+++ Makefile.common	17 Sep 2003 21:53:11 -0000	1.65
@@ -48,7 +48,7 @@
 ifdef DISABLE_SCUMM
 DEFINES += -DDISABLE_SCUMM
 else
-MODULES += scumm scumm/smush
+MODULES += scumm
 endif
 
 ifdef DISABLE_SIMON
@@ -60,23 +60,19 @@
 ifdef DISABLE_SKY
 DEFINES += -DDISABLE_SKY
 else
-MODULES += sky sky/compacts sky/music
+MODULES += sky
 endif
 
 ifdef DISABLE_SWORD2
 DEFINES += -DDISABLE_SWORD2
 else
-MODULES += bs2 bs2/driver
+MODULES += bs2
 endif
 
 # After the game specific modules follow the shared modules
 MODULES += \
 	gui \
 	backends \
-	backends/fs/posix \
-	backends/fs/morphos \
-	backends/fs/windows \
-	backends/midi \
 	sound \
 	common
 
@@ -97,6 +93,10 @@
 # the build date in gScummVMBuildDate is correct.
 common/main.o: $(OBJS)
 
+# Some files depend on the values of the DISABLE_* flags; we let these
+# depend on config.mak, so that they get recompiled if config.mak changes.
+common/plugins.o common/gameDetector.o: config.mak
+
 # HACK temporary fix to get compilation on OS X (and possibly others) working again
 OBJS:=common/main.o common/gameDetector.o $(OBJS)
 
@@ -108,7 +108,7 @@
 
 .PHONY: all clean dist distclean
 
-DEPDIRS = $(addsuffix /$(DEPDIR),$(MODULES))
+DEPDIRS = $(addsuffix /$(DEPDIR),$(MODULE_DIRS))
 DEPFILES = $(wildcard $(addsuffix /*.d,$(DEPDIRS)))
 
 # Old (dumb) compile & dependcy rules

Index: configure
===================================================================
RCS file: /cvsroot/scummvm/scummvm/configure,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- configure	23 Aug 2003 23:33:05 -0000	1.42
+++ configure	17 Sep 2003 21:53:11 -0000	1.43
@@ -516,6 +516,7 @@
     LIBS="$LIBS `$_sdlconfig --libs`"
     OBJS="$OBJS backends/sdl/sdl-common.o backends/sdl/sdl.o"
     MODULES="$MODULES backends/sdl"
+    MODULE_DIRS="$MODULE_DIRS backends/sdl"
     ;;
   sdlgl)
     find_sdlconfig
@@ -523,6 +524,7 @@
     LIBS="$LIBS `$_sdlconfig --libs` -lGL"
     OBJS="$OBJS backends/sdl/sdl-common.o backends/sdl/sdl_gl.o"
     MODULES="$MODULES backends/sdl"
+    MODULE_DIRS="$MODULE_DIRS backends/sdl"
     ;;
   x11)
     INCLUDES="$INCLUDES -I/usr/X11R6/include"
@@ -531,6 +533,7 @@
     OBJS="$OBJS backends/x11/x11.o"
     DEFINES="$DEFINES -DX11_BACKEND"
     MODULES="$MODULES backends/x11"
+    MODULE_DIRS="$MODULE_DIRS backends/x11"
     ;;
   *)
     echo "support for $_backend backend not implemented in configure script yet"
@@ -578,6 +581,7 @@
 RANLIB := $_ranlib
 BACKEND := $_backend
 MODULES += $MODULES
+MODULE_DIRS += $MODULE_DIRS
 
 $_make_def_HAVE_GCC3
 $_mak_scumm