diff options
| author | D G Turner | 2013-11-07 12:58:34 +0100 |
|---|---|---|
| committer | D G Turner | 2013-11-24 00:48:01 +0000 |
| commit | ef85456859e466adc8913041e4f31809485c45ab (patch) | |
| tree | 359b1686396e12621f659429c857f11cdfbbf3c6 | |
| parent | 1ac01d2333af11d403ef84dd5192abb18814e5b3 (diff) | |
| download | scummvm-rg350-ef85456859e466adc8913041e4f31809485c45ab.tar.gz scummvm-rg350-ef85456859e466adc8913041e4f31809485c45ab.tar.bz2 scummvm-rg350-ef85456859e466adc8913041e4f31809485c45ab.zip | |
BUILD: Remove need for engine.mk in each engine directory.
Each engine now only has to provide a single configure.engine file
adding the engine into the configure script, which then produces the
required other files automatically.
47 files changed, 42 insertions, 229 deletions
diff --git a/.gitignore b/.gitignore index 04b81ddb43..469f22d11c 100644 --- a/.gitignore +++ b/.gitignore @@ -106,6 +106,7 @@ project.xcworkspace /plugins /engines/plugins_table.h +/engines/engines.mk /test/runner /test/runner.cpp @@ -83,7 +83,7 @@ include $(srcdir)/Makefile.common # check if configure has been run or has been changed since last run ENGINE_SUBDIRS_CONFIGURE := $(wildcard $(srcdir)/engines/*/configure.engine) -config.h config.mk engines/plugins_table.h: $(srcdir)/configure $(ENGINE_SUBDIRS_CONFIGURE) +config.h config.mk engines/plugins_table.h engines/engines.mk: $(srcdir)/configure $(ENGINE_SUBDIRS_CONFIGURE) ifeq "$(findstring config.mk,$(MAKEFILE_LIST))" "config.mk" @echo "Running $(srcdir)/configure with the last specified parameters" @sleep 2 diff --git a/Makefile.common b/Makefile.common index 0b2f8a564a..b56300a115 100644 --- a/Makefile.common +++ b/Makefile.common @@ -16,9 +16,7 @@ all: $(EXECUTABLE) plugins PLUGINS := MODULES := test devtools base $(MODULES) -ENGINE_SUBDIRS_MK := $(wildcard $(srcdir)/engines/*/engine.mk) -# Include the build instructions for all engines --include $(ENGINE_SUBDIRS_MK) +-include engines/engines.mk # After the game specific modules follow the shared modules MODULES += \ @@ -81,7 +79,7 @@ $(EXECUTABLE): $(OBJS) $(QUIET_LINK)$(LD) $(LDFLAGS) $(PRE_OBJS_FLAGS) $+ $(POST_OBJS_FLAGS) $(LIBS) -o $@ distclean: clean clean-devtools - $(RM) config.h config.mk config.log engines/plugins_table.h + $(RM) config.h config.mk config.log engines/engines.mk engines/plugins_table.h clean: $(RM_REC) $(DEPDIRS) @@ -149,7 +147,7 @@ endif # recreate them (which it can't), and in particular from looking for potential # source files. This can save quite a bit of disk access time. .PHONY: $(wildcard $(addsuffix /*.d,$(DEPDIRS))) $(addprefix $(srcdir)/, $(addsuffix /module.mk,$(MODULES))) \ - $(srcdir)/$(port_mk) $(srcdir)/rules.mk $ENGINE_SUBDIRS_MK + $(srcdir)/$(port_mk) $(srcdir)/rules.mk ###################################################################### # Get the current version information @@ -4383,6 +4383,40 @@ EOF fi +echo "Creating engines/engines.mk" +cat > engines/engines.mk << EOF +# This file is automatically generated by configure +# DO NOT EDIT MANUALLY +# This file is being included by "Makefile.common" +EOF + +for engine in $_engines; do + j=`echo $engine | tr '[:lower:]' '[:upper:]'` + if test "`get_engine_sub $engine`" = "no" ; then + # main engine + cat >> engines/engines.mk << EOF + +ifdef ENABLE_$j +DEFINES += -DENABLE_$j=\$(ENABLE_$j) +MODULES += engines/$engine +EOF + + for subeng in `get_engine_subengines $engine` ; do + k=`echo $subeng | tr '[:lower:]' '[:upper:]'` + cat >> engines/engines.mk << EOF + +ifdef ENABLE_$k +DEFINES += -DENABLE_$k +endif +EOF + done + + cat >> engines/engines.mk << EOF +endif +EOF + fi +done + echo "Creating engines/plugins_table.h" cat > engines/plugins_table.h << EOF /* This file is automatically generated by configure */ @@ -4390,9 +4424,9 @@ cat > engines/plugins_table.h << EOF // This file is being included by "base/plugins.cpp" EOF -for i in $_srcdir/engines/*; do - if [ -d $i ]; then - j=`echo ${i#$_srcdir/engines/} | tr '[:lower:]' '[:upper:]'` +for engine in $_engines; do + if test "`get_engine_sub $engine`" = "no" ; then + j=`echo $engine | tr '[:lower:]' '[:upper:]'` cat >> engines/plugins_table.h << EOF #if PLUGIN_ENABLED_STATIC($j) LINK_PLUGIN($j) diff --git a/engines/agi/engine.mk b/engines/agi/engine.mk deleted file mode 100644 index 18963fd4a4..0000000000 --- a/engines/agi/engine.mk +++ /dev/null @@ -1,4 +0,0 @@ -ifdef ENABLE_AGI -DEFINES += -DENABLE_AGI=$(ENABLE_AGI) -MODULES += engines/agi -endif diff --git a/engines/agos/engine.mk b/engines/agos/engine.mk deleted file mode 100644 index ba60a78844..0000000000 --- a/engines/agos/engine.mk +++ /dev/null @@ -1,8 +0,0 @@ -ifdef ENABLE_AGOS -DEFINES += -DENABLE_AGOS=$(ENABLE_AGOS) -MODULES += engines/agos - -ifdef ENABLE_AGOS2 -DEFINES += -DENABLE_AGOS2 -endif -endif diff --git a/engines/avalanche/engine.mk b/engines/avalanche/engine.mk deleted file mode 100644 index 17356ee376..0000000000 --- a/engines/avalanche/engine.mk +++ /dev/null @@ -1,4 +0,0 @@ -ifdef ENABLE_AVALANCHE -DEFINES += -DENABLE_AVALANCHE=$(ENABLE_AVALANCHE) -MODULES += engines/avalanche -endif diff --git a/engines/cge/engine.mk b/engines/cge/engine.mk deleted file mode 100644 index c71f4e0df2..0000000000 --- a/engines/cge/engine.mk +++ /dev/null @@ -1,4 +0,0 @@ -ifdef ENABLE_CGE -DEFINES += -DENABLE_CGE=$(ENABLE_CGE) -MODULES += engines/cge -endif diff --git a/engines/cine/engine.mk b/engines/cine/engine.mk deleted file mode 100644 index a32c319d3c..0000000000 --- a/engines/cine/engine.mk +++ /dev/null @@ -1,4 +0,0 @@ -ifdef ENABLE_CINE -DEFINES += -DENABLE_CINE=$(ENABLE_CINE) -MODULES += engines/cine -endif diff --git a/engines/composer/engine.mk b/engines/composer/engine.mk deleted file mode 100644 index b444021013..0000000000 --- a/engines/composer/engine.mk +++ /dev/null @@ -1,4 +0,0 @@ -ifdef ENABLE_COMPOSER -DEFINES += -DENABLE_COMPOSER=$(ENABLE_COMPOSER) -MODULES += engines/composer -endif diff --git a/engines/cruise/engine.mk b/engines/cruise/engine.mk deleted file mode 100644 index ac37c61834..0000000000 --- a/engines/cruise/engine.mk +++ /dev/null @@ -1,4 +0,0 @@ -ifdef ENABLE_CRUISE -DEFINES += -DENABLE_CRUISE=$(ENABLE_CRUISE) -MODULES += engines/cruise -endif diff --git a/engines/draci/engine.mk b/engines/draci/engine.mk deleted file mode 100644 index 81ccc3f70f..0000000000 --- a/engines/draci/engine.mk +++ /dev/null @@ -1,4 +0,0 @@ -ifdef ENABLE_DRACI -DEFINES += -DENABLE_DRACI=$(ENABLE_DRACI) -MODULES += engines/draci -endif diff --git a/engines/drascula/engine.mk b/engines/drascula/engine.mk deleted file mode 100644 index ca4f6c9883..0000000000 --- a/engines/drascula/engine.mk +++ /dev/null @@ -1,4 +0,0 @@ -ifdef ENABLE_DRASCULA -DEFINES += -DENABLE_DRASCULA=$(ENABLE_DRASCULA) -MODULES += engines/drascula -endif diff --git a/engines/dreamweb/engine.mk b/engines/dreamweb/engine.mk deleted file mode 100644 index 088fcca535..0000000000 --- a/engines/dreamweb/engine.mk +++ /dev/null @@ -1,4 +0,0 @@ -ifdef ENABLE_DREAMWEB -DEFINES += -DENABLE_DREAMWEB=$(ENABLE_DREAMWEB) -MODULES += engines/dreamweb -endif diff --git a/engines/fullpipe/engine.mk b/engines/fullpipe/engine.mk deleted file mode 100644 index 7aeec541f1..0000000000 --- a/engines/fullpipe/engine.mk +++ /dev/null @@ -1,4 +0,0 @@ -ifdef ENABLE_FULLPIPE -DEFINES += -DENABLE_FULLPIPE=$(ENABLE_FULLPIPE) -MODULES += engines/fullpipe -endif diff --git a/engines/gob/engine.mk b/engines/gob/engine.mk deleted file mode 100644 index c78e7ddbf1..0000000000 --- a/engines/gob/engine.mk +++ /dev/null @@ -1,4 +0,0 @@ -ifdef ENABLE_GOB -DEFINES += -DENABLE_GOB=$(ENABLE_GOB) -MODULES += engines/gob -endif diff --git a/engines/groovie/engine.mk b/engines/groovie/engine.mk deleted file mode 100644 index a209860e84..0000000000 --- a/engines/groovie/engine.mk +++ /dev/null @@ -1,8 +0,0 @@ -ifdef ENABLE_GROOVIE -DEFINES += -DENABLE_GROOVIE=$(ENABLE_GROOVIE) -MODULES += engines/groovie - -ifdef ENABLE_GROOVIE2 -DEFINES += -DENABLE_GROOVIE2 -endif -endif diff --git a/engines/hopkins/engine.mk b/engines/hopkins/engine.mk deleted file mode 100644 index ac2281c0be..0000000000 --- a/engines/hopkins/engine.mk +++ /dev/null @@ -1,4 +0,0 @@ -ifdef ENABLE_HOPKINS -DEFINES += -DENABLE_HOPKINS=$(ENABLE_HOPKINS) -MODULES += engines/hopkins -endif diff --git a/engines/hugo/engine.mk b/engines/hugo/engine.mk deleted file mode 100644 index a6ca531dd0..0000000000 --- a/engines/hugo/engine.mk +++ /dev/null @@ -1,4 +0,0 @@ -ifdef ENABLE_HUGO -DEFINES += -DENABLE_HUGO=$(ENABLE_HUGO) -MODULES += engines/hugo -endif diff --git a/engines/kyra/engine.mk b/engines/kyra/engine.mk deleted file mode 100644 index a2bfce3038..0000000000 --- a/engines/kyra/engine.mk +++ /dev/null @@ -1,12 +0,0 @@ -ifdef ENABLE_KYRA -DEFINES += -DENABLE_KYRA=$(ENABLE_KYRA) -MODULES += engines/kyra - -ifdef ENABLE_LOL -DEFINES += -DENABLE_LOL -endif - -ifdef ENABLE_EOB -DEFINES += -DENABLE_EOB -endif -endif diff --git a/engines/lastexpress/engine.mk b/engines/lastexpress/engine.mk deleted file mode 100644 index 6e0ba3bf25..0000000000 --- a/engines/lastexpress/engine.mk +++ /dev/null @@ -1,4 +0,0 @@ -ifdef ENABLE_LASTEXPRESS -DEFINES += -DENABLE_LASTEXPRESS=$(ENABLE_LASTEXPRESS) -MODULES += engines/lastexpress -endif diff --git a/engines/lure/engine.mk b/engines/lure/engine.mk deleted file mode 100644 index 62be295b28..0000000000 --- a/engines/lure/engine.mk +++ /dev/null @@ -1,4 +0,0 @@ -ifdef ENABLE_LURE -DEFINES += -DENABLE_LURE=$(ENABLE_LURE) -MODULES += engines/lure -endif diff --git a/engines/made/engine.mk b/engines/made/engine.mk deleted file mode 100644 index 8fd832cbb5..0000000000 --- a/engines/made/engine.mk +++ /dev/null @@ -1,4 +0,0 @@ -ifdef ENABLE_MADE -DEFINES += -DENABLE_MADE=$(ENABLE_MADE) -MODULES += engines/made -endif diff --git a/engines/mohawk/engine.mk b/engines/mohawk/engine.mk deleted file mode 100644 index e9474b5534..0000000000 --- a/engines/mohawk/engine.mk +++ /dev/null @@ -1,16 +0,0 @@ -ifdef ENABLE_MOHAWK -DEFINES += -DENABLE_MOHAWK=$(ENABLE_MOHAWK) -MODULES += engines/mohawk - -ifdef ENABLE_CSTIME -DEFINES += -DENABLE_CSTIME -endif - -ifdef ENABLE_MYST -DEFINES += -DENABLE_MYST -endif - -ifdef ENABLE_RIVEN -DEFINES += -DENABLE_RIVEN -endif -endif diff --git a/engines/mortevielle/engine.mk b/engines/mortevielle/engine.mk deleted file mode 100644 index 4232dece3d..0000000000 --- a/engines/mortevielle/engine.mk +++ /dev/null @@ -1,4 +0,0 @@ -ifdef ENABLE_MORTEVIELLE -DEFINES += -DENABLE_MORTEVIELLE=$(ENABLE_MORTEVIELLE) -MODULES += engines/mortevielle -endif diff --git a/engines/neverhood/engine.mk b/engines/neverhood/engine.mk deleted file mode 100644 index 52b032a5d8..0000000000 --- a/engines/neverhood/engine.mk +++ /dev/null @@ -1,4 +0,0 @@ -ifdef ENABLE_NEVERHOOD -DEFINES += -DENABLE_NEVERHOOD=$(ENABLE_NEVERHOOD) -MODULES += engines/neverhood -endif diff --git a/engines/parallaction/engine.mk b/engines/parallaction/engine.mk deleted file mode 100644 index 465b6fc813..0000000000 --- a/engines/parallaction/engine.mk +++ /dev/null @@ -1,4 +0,0 @@ -ifdef ENABLE_PARALLACTION -DEFINES += -DENABLE_PARALLACTION=$(ENABLE_PARALLACTION) -MODULES += engines/parallaction -endif diff --git a/engines/pegasus/engine.mk b/engines/pegasus/engine.mk deleted file mode 100644 index 60bba59e65..0000000000 --- a/engines/pegasus/engine.mk +++ /dev/null @@ -1,4 +0,0 @@ -ifdef ENABLE_PEGASUS -DEFINES += -DENABLE_PEGASUS=$(ENABLE_PEGASUS) -MODULES += engines/pegasus -endif diff --git a/engines/queen/engine.mk b/engines/queen/engine.mk deleted file mode 100644 index 05f3dcad91..0000000000 --- a/engines/queen/engine.mk +++ /dev/null @@ -1,4 +0,0 @@ -ifdef ENABLE_QUEEN -DEFINES += -DENABLE_QUEEN=$(ENABLE_QUEEN) -MODULES += engines/queen -endif diff --git a/engines/saga/engine.mk b/engines/saga/engine.mk deleted file mode 100644 index a6e855bafd..0000000000 --- a/engines/saga/engine.mk +++ /dev/null @@ -1,12 +0,0 @@ -ifdef ENABLE_SAGA -DEFINES += -DENABLE_SAGA=$(ENABLE_SAGA) -MODULES += engines/saga - -ifdef ENABLE_IHNM -DEFINES += -DENABLE_IHNM -endif - -ifdef ENABLE_SAGA2 -DEFINES += -DENABLE_SAGA2 -endif -endif diff --git a/engines/sci/engine.mk b/engines/sci/engine.mk deleted file mode 100644 index 7f26a19833..0000000000 --- a/engines/sci/engine.mk +++ /dev/null @@ -1,8 +0,0 @@ -ifdef ENABLE_SCI -DEFINES += -DENABLE_SCI=$(ENABLE_SCI) -MODULES += engines/sci - -ifdef ENABLE_SCI32 -DEFINES += -DENABLE_SCI32 -endif -endif diff --git a/engines/scumm/engine.mk b/engines/scumm/engine.mk deleted file mode 100644 index 640dfb51b4..0000000000 --- a/engines/scumm/engine.mk +++ /dev/null @@ -1,12 +0,0 @@ -ifdef ENABLE_SCUMM -DEFINES += -DENABLE_SCUMM=$(ENABLE_SCUMM) -MODULES += engines/scumm - -ifdef ENABLE_SCUMM_7_8 -DEFINES += -DENABLE_SCUMM_7_8 -endif - -ifdef ENABLE_HE -DEFINES += -DENABLE_HE -endif -endif diff --git a/engines/sky/engine.mk b/engines/sky/engine.mk deleted file mode 100644 index 182e6082a2..0000000000 --- a/engines/sky/engine.mk +++ /dev/null @@ -1,4 +0,0 @@ -ifdef ENABLE_SKY -DEFINES += -DENABLE_SKY=$(ENABLE_SKY) -MODULES += engines/sky -endif diff --git a/engines/sword1/engine.mk b/engines/sword1/engine.mk deleted file mode 100644 index 39f6afb4fb..0000000000 --- a/engines/sword1/engine.mk +++ /dev/null @@ -1,4 +0,0 @@ -ifdef ENABLE_SWORD1 -DEFINES += -DENABLE_SWORD1=$(ENABLE_SWORD1) -MODULES += engines/sword1 -endif diff --git a/engines/sword2/engine.mk b/engines/sword2/engine.mk deleted file mode 100644 index 5f05112180..0000000000 --- a/engines/sword2/engine.mk +++ /dev/null @@ -1,4 +0,0 @@ -ifdef ENABLE_SWORD2 -DEFINES += -DENABLE_SWORD2=$(ENABLE_SWORD2) -MODULES += engines/sword2 -endif diff --git a/engines/sword25/engine.mk b/engines/sword25/engine.mk deleted file mode 100644 index 32a906c5cd..0000000000 --- a/engines/sword25/engine.mk +++ /dev/null @@ -1,4 +0,0 @@ -ifdef ENABLE_SWORD25 -DEFINES += -DENABLE_SWORD25=$(ENABLE_SWORD25) -MODULES += engines/sword25 -endif diff --git a/engines/teenagent/engine.mk b/engines/teenagent/engine.mk deleted file mode 100644 index 82004eb489..0000000000 --- a/engines/teenagent/engine.mk +++ /dev/null @@ -1,4 +0,0 @@ -ifdef ENABLE_TEENAGENT -DEFINES += -DENABLE_TEENAGENT=$(ENABLE_TEENAGENT) -MODULES += engines/teenagent -endif diff --git a/engines/testbed/engine.mk b/engines/testbed/engine.mk deleted file mode 100644 index b19db6ee9d..0000000000 --- a/engines/testbed/engine.mk +++ /dev/null @@ -1,4 +0,0 @@ -ifdef ENABLE_TESTBED -DEFINES += -DENABLE_TESTBED=$(ENABLE_TESTBED) -MODULES += engines/testbed -endif diff --git a/engines/tinsel/engine.mk b/engines/tinsel/engine.mk deleted file mode 100644 index f3df46bc34..0000000000 --- a/engines/tinsel/engine.mk +++ /dev/null @@ -1,4 +0,0 @@ -ifdef ENABLE_TINSEL -DEFINES += -DENABLE_TINSEL=$(ENABLE_TINSEL) -MODULES += engines/tinsel -endif diff --git a/engines/toltecs/engine.mk b/engines/toltecs/engine.mk deleted file mode 100644 index 38bf6c04b8..0000000000 --- a/engines/toltecs/engine.mk +++ /dev/null @@ -1,4 +0,0 @@ -ifdef ENABLE_TOLTECS -DEFINES += -DENABLE_TOLTECS=$(ENABLE_TOLTECS) -MODULES += engines/toltecs -endif diff --git a/engines/tony/engine.mk b/engines/tony/engine.mk deleted file mode 100644 index 605f2e6cd2..0000000000 --- a/engines/tony/engine.mk +++ /dev/null @@ -1,4 +0,0 @@ -ifdef ENABLE_TONY -DEFINES += -DENABLE_TONY=$(ENABLE_TONY) -MODULES += engines/tony -endif diff --git a/engines/toon/engine.mk b/engines/toon/engine.mk deleted file mode 100644 index ec8b66f122..0000000000 --- a/engines/toon/engine.mk +++ /dev/null @@ -1,4 +0,0 @@ -ifdef ENABLE_TOON -DEFINES += -DENABLE_TOON=$(ENABLE_TOON) -MODULES += engines/toon -endif diff --git a/engines/touche/engine.mk b/engines/touche/engine.mk deleted file mode 100644 index 1629a82b2c..0000000000 --- a/engines/touche/engine.mk +++ /dev/null @@ -1,4 +0,0 @@ -ifdef ENABLE_TOUCHE -DEFINES += -DENABLE_TOUCHE=$(ENABLE_TOUCHE) -MODULES += engines/touche -endif diff --git a/engines/tsage/engine.mk b/engines/tsage/engine.mk deleted file mode 100644 index d734665560..0000000000 --- a/engines/tsage/engine.mk +++ /dev/null @@ -1,4 +0,0 @@ -ifdef ENABLE_TSAGE -DEFINES += -DENABLE_TSAGE=$(ENABLE_TSAGE) -MODULES += engines/tsage -endif diff --git a/engines/tucker/engine.mk b/engines/tucker/engine.mk deleted file mode 100644 index 6342af048e..0000000000 --- a/engines/tucker/engine.mk +++ /dev/null @@ -1,4 +0,0 @@ -ifdef ENABLE_TUCKER -DEFINES += -DENABLE_TUCKER=$(ENABLE_TUCKER) -MODULES += engines/tucker -endif diff --git a/engines/wintermute/engine.mk b/engines/wintermute/engine.mk deleted file mode 100644 index 145d2f76b8..0000000000 --- a/engines/wintermute/engine.mk +++ /dev/null @@ -1,4 +0,0 @@ -ifdef ENABLE_WINTERMUTE -DEFINES += -DENABLE_WINTERMUTE=$(ENABLE_WINTERMUTE) -MODULES += engines/wintermute -endif diff --git a/engines/zvision/engine.mk b/engines/zvision/engine.mk deleted file mode 100644 index be76a4d67d..0000000000 --- a/engines/zvision/engine.mk +++ /dev/null @@ -1,4 +0,0 @@ -ifdef ENABLE_ZVISION -DEFINES += -DENABLE_ZVISION=$(ENABLE_ZVISION) -MODULES += engines/zvision -endif |