[Scummvm-cvs-logs] CVS: scummvm Makefile.common,1.65,1.66

[Max Horn]

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

Modified Files:
	Makefile.common 
Log Message:
new module 'base'; moved gameDetector.*, main.cpp and base/plugins.* there (this removes the need for an ugly hack in the build system, and is also conceptionally cleaner)

Index: Makefile.common
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile.common,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- Makefile.common	17 Sep 2003 21:53:11 -0000	1.65
+++ Makefile.common	17 Sep 2003 22:40:54 -0000	1.66
@@ -45,6 +45,8 @@
 # Module settings
 ######################################################################
 
+MODULES := base $(MODULES)
+
 ifdef DISABLE_SCUMM
 DEFINES += -DDISABLE_SCUMM
 else
@@ -88,18 +90,12 @@
 # Include the build instructions for all modules
 -include $(addsuffix /module.mk,$(MODULES))
 
-# Make engine.o depend on all other object files. This way if anything is
-# changed, it causes engine.cpp to be recompiled. This in turn ensures that
+# Make main.o depend on all other object files. This way if anything is
+# changed, it causes main.cpp to be recompiled. This in turn ensures that
 # 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)
+base/main.o: $(OBJS)
 
+# The build rule for the ScummVM executable
 scummvm$(EXEEXT):  $(OBJS)
 	$(CXX) $(LDFLAGS) -o $@ $+ $(LIBS)