[Scummvm-cvs-logs] CVS: scummvm Makefile,1.30,1.31 Makefile.common,1.47,1.48 Makefile.mingw,1.11,1.12

Max Horn fingolfin at users.sourceforge.net
Sat Apr 26 04:45:06 CEST 2003


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

Modified Files:
	Makefile Makefile.common Makefile.mingw 
Log Message:
Make it possible to disable some/all of our three game modules (scumm/simon/sky) with three flags in the Makefile

Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- Makefile	23 Mar 2003 13:11:55 -0000	1.30
+++ Makefile	26 Apr 2003 11:44:13 -0000	1.31
@@ -48,11 +48,17 @@
 
 
 #######################################################################
-# Misc stuff - you should normally never have to edit this            #
+# Control which modules are built - uncomment any to disable module   #
 #######################################################################
 
-# Concat DEFINES and INCLUDES to for the CPPFLAGS
-CPPFLAGS:= $(DEFINES) $(INCLUDES)
+# DISABLE_SCUMM = 1
+# DISABLE_SIMON = 1
+# DISABLE_SKY = 1
+
+
+#######################################################################
+# Misc stuff - you should normally never have to edit this            #
+#######################################################################
 
 include Makefile.common
 

Index: Makefile.common
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile.common,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- Makefile.common	17 Mar 2003 12:33:48 -0000	1.47
+++ Makefile.common	26 Apr 2003 11:44:13 -0000	1.48
@@ -22,10 +22,26 @@
 # TODO - the nested ones (scumm/smush, backends/...) should be handled from the
 # module.mk of their parents. In fact the only reason they are listed here is to ensure the
 # DEPDIRS directive works correctly.
+
+ifdef DISABLE_SCUMM
+DEFINES += -DDISABLE_SCUMM
+else
+MODULES += scumm
+endif
+
+ifdef DISABLE_SIMON
+DEFINES += -DDISABLE_SIMON
+else
+MODULES += simon
+endif
+
+ifdef DISABLE_SKY
+DEFINES += -DDISABLE_SKY
+else
+MODULES += sky
+endif
+
 MODULES += \
-	scumm \
-	simon \
-	sky \
 	common \
 	gui \
 	backends \
@@ -36,8 +52,11 @@
 	backends/fs/windows \
 	backends/midi
 
+# Concat DEFINES and INCLUDES to form the CPPFLAGS
+CPPFLAGS:= $(DEFINES) $(INCLUDES)
+
 # Include the build instructions for all modules
--include $(patsubst %,%/module.mk,$(MODULES))
+-include $(addsuffix /module.mk,$(MODULES))
 
 # HACK temporary fix to get compilation on OS X (and possibly others) working again
 OBJS:=common/engine.o $(OBJS)
@@ -59,8 +78,8 @@
 
 # If you use GCC, disable the above and enable this for intelligent
 # dependency tracking. 
-DEPDIRS = $(patsubst %,%/$(DEPDIR),$(MODULES))
-DEPFILES = $(wildcard $(patsubst %,%/*.d,$(DEPDIRS)))
+DEPDIRS = $(addsuffix /$(DEPDIR),$(MODULES))
+DEPFILES = $(wildcard $(addsuffix /*.d,$(DEPDIRS)))
 
 .cpp.o:
 	$(MKDIR) $(*D)/$(DEPDIR)

Index: Makefile.mingw
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile.mingw,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Makefile.mingw	31 Dec 2002 02:09:56 -0000	1.11
+++ Makefile.mingw	26 Apr 2003 11:44:13 -0000	1.12
@@ -50,9 +50,6 @@
 # Misc stuff - you should normally never have to edit this            #
 #######################################################################
 
-# Concat DEFINES and INCLUDES to for the CPPFLAGS
-CPPFLAGS:= $(DEFINES) $(INCLUDES)
-
 include Makefile.common
 
 scummvmico.o: scummvm.ico





More information about the Scummvm-git-logs mailing list