diff options
48 files changed, 144 insertions, 132 deletions
diff --git a/.gitignore b/.gitignore index 0fe212098c..04b81ddb43 100644 --- a/.gitignore +++ b/.gitignore @@ -105,6 +105,8 @@ project.xcworkspace /plugins +/engines/plugins_table.h + /test/runner /test/runner.cpp /test/*.dSYM @@ -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: $(srcdir)/configure $(ENGINE_SUBDIRS_CONFIGURE) +config.h config.mk engines/plugins_table.h: $(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 41a3245b76..0b2f8a564a 100644 --- a/Makefile.common +++ b/Makefile.common @@ -81,7 +81,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 + $(RM) config.h config.mk config.log engines/plugins_table.h clean: $(RM_REC) $(DEPDIRS) @@ -4382,3 +4382,14 @@ include \$(srcdir)/Makefile EOF fi + +echo "Creating engines/plugins_table.h" +cat > engines/plugins_table.h << EOF +/* This file is automatically generated by configure */ +/* DO NOT EDIT MANUALLY */ +// This file is being included by "base/plugins.cpp" +EOF + +for i in $_srcdir/engines/*/engine-plugin.h; do + cat $i >> engines/plugins_table.h +done diff --git a/engines/agi/engine-plugin.h b/engines/agi/engine-plugin.h new file mode 100644 index 0000000000..962a8ca441 --- /dev/null +++ b/engines/agi/engine-plugin.h @@ -0,0 +1,3 @@ +#if PLUGIN_ENABLED_STATIC(AGI) +LINK_PLUGIN(AGI) +#endif diff --git a/engines/agos/engine-plugin.h b/engines/agos/engine-plugin.h new file mode 100644 index 0000000000..ea4e6f7168 --- /dev/null +++ b/engines/agos/engine-plugin.h @@ -0,0 +1,3 @@ +#if PLUGIN_ENABLED_STATIC(AGOS) +LINK_PLUGIN(AGOS) +#endif diff --git a/engines/avalanche/engine-plugin.h b/engines/avalanche/engine-plugin.h new file mode 100644 index 0000000000..bfe791dd17 --- /dev/null +++ b/engines/avalanche/engine-plugin.h @@ -0,0 +1,3 @@ +#if PLUGIN_ENABLED_STATIC(AVALANCHE) +LINK_PLUGIN(AVALANCHE) +#endif diff --git a/engines/cge/engine-plugin.h b/engines/cge/engine-plugin.h new file mode 100644 index 0000000000..8f9c23eec0 --- /dev/null +++ b/engines/cge/engine-plugin.h @@ -0,0 +1,3 @@ +#if PLUGIN_ENABLED_STATIC(CGE) +LINK_PLUGIN(CGE) +#endif diff --git a/engines/cine/engine-plugin.h b/engines/cine/engine-plugin.h new file mode 100644 index 0000000000..be38a293bd --- /dev/null +++ b/engines/cine/engine-plugin.h @@ -0,0 +1,3 @@ +#if PLUGIN_ENABLED_STATIC(CINE) +LINK_PLUGIN(CINE) +#endif diff --git a/engines/composer/engine-plugin.h b/engines/composer/engine-plugin.h new file mode 100644 index 0000000000..d06f241b40 --- /dev/null +++ b/engines/composer/engine-plugin.h @@ -0,0 +1,3 @@ +#if PLUGIN_ENABLED_STATIC(COMPOSER) +LINK_PLUGIN(COMPOSER) +#endif diff --git a/engines/cruise/engine-plugin.h b/engines/cruise/engine-plugin.h new file mode 100644 index 0000000000..78fbbbd38a --- /dev/null +++ b/engines/cruise/engine-plugin.h @@ -0,0 +1,3 @@ +#if PLUGIN_ENABLED_STATIC(CRUISE) +LINK_PLUGIN(CRUISE) +#endif diff --git a/engines/draci/engine-plugin.h b/engines/draci/engine-plugin.h new file mode 100644 index 0000000000..c02afdbb56 --- /dev/null +++ b/engines/draci/engine-plugin.h @@ -0,0 +1,3 @@ +#if PLUGIN_ENABLED_STATIC(DRACI) +LINK_PLUGIN(DRACI) +#endif diff --git a/engines/drascula/engine-plugin.h b/engines/drascula/engine-plugin.h new file mode 100644 index 0000000000..d0f598cce9 --- /dev/null +++ b/engines/drascula/engine-plugin.h @@ -0,0 +1,3 @@ +#if PLUGIN_ENABLED_STATIC(DRASCULA) +LINK_PLUGIN(DRASCULA) +#endif diff --git a/engines/dreamweb/engine-plugin.h b/engines/dreamweb/engine-plugin.h new file mode 100644 index 0000000000..fae9e7a754 --- /dev/null +++ b/engines/dreamweb/engine-plugin.h @@ -0,0 +1,3 @@ +#if PLUGIN_ENABLED_STATIC(DREAMWEB) +LINK_PLUGIN(DREAMWEB) +#endif diff --git a/engines/fullpipe/engine-plugin.h b/engines/fullpipe/engine-plugin.h new file mode 100644 index 0000000000..ea875a7e57 --- /dev/null +++ b/engines/fullpipe/engine-plugin.h @@ -0,0 +1,3 @@ +#if PLUGIN_ENABLED_STATIC(FULLPIPE) +LINK_PLUGIN(FULLPIPE) +#endif diff --git a/engines/gob/engine-plugin.h b/engines/gob/engine-plugin.h new file mode 100644 index 0000000000..86cff48cbc --- /dev/null +++ b/engines/gob/engine-plugin.h @@ -0,0 +1,3 @@ +#if PLUGIN_ENABLED_STATIC(GOB) +LINK_PLUGIN(GOB) +#endif diff --git a/engines/groovie/engine-plugin.h b/engines/groovie/engine-plugin.h new file mode 100644 index 0000000000..dcb05b1333 --- /dev/null +++ b/engines/groovie/engine-plugin.h @@ -0,0 +1,3 @@ +#if PLUGIN_ENABLED_STATIC(GROOVIE) +LINK_PLUGIN(GROOVIE) +#endif diff --git a/engines/hopkins/engine-plugin.h b/engines/hopkins/engine-plugin.h new file mode 100644 index 0000000000..fe54ca1449 --- /dev/null +++ b/engines/hopkins/engine-plugin.h @@ -0,0 +1,3 @@ +#if PLUGIN_ENABLED_STATIC(HOPKINS) +LINK_PLUGIN(HOPKINS) +#endif diff --git a/engines/hugo/engine-plugin.h b/engines/hugo/engine-plugin.h new file mode 100644 index 0000000000..12b6edcd74 --- /dev/null +++ b/engines/hugo/engine-plugin.h @@ -0,0 +1,3 @@ +#if PLUGIN_ENABLED_STATIC(HUGO) +LINK_PLUGIN(HUGO) +#endif diff --git a/engines/kyra/engine-plugin.h b/engines/kyra/engine-plugin.h new file mode 100644 index 0000000000..b3bcb477da --- /dev/null +++ b/engines/kyra/engine-plugin.h @@ -0,0 +1,3 @@ +#if PLUGIN_ENABLED_STATIC(KYRA) +LINK_PLUGIN(KYRA) +#endif diff --git a/engines/lastexpress/engine-plugin.h b/engines/lastexpress/engine-plugin.h new file mode 100644 index 0000000000..2cca42fe92 --- /dev/null +++ b/engines/lastexpress/engine-plugin.h @@ -0,0 +1,3 @@ +#if PLUGIN_ENABLED_STATIC(LASTEXPRESS) +LINK_PLUGIN(LASTEXPRESS) +#endif diff --git a/engines/lure/engine-plugin.h b/engines/lure/engine-plugin.h new file mode 100644 index 0000000000..a1392601ac --- /dev/null +++ b/engines/lure/engine-plugin.h @@ -0,0 +1,3 @@ +#if PLUGIN_ENABLED_STATIC(LURE) +LINK_PLUGIN(LURE) +#endif diff --git a/engines/made/engine-plugin.h b/engines/made/engine-plugin.h new file mode 100644 index 0000000000..ed544471ba --- /dev/null +++ b/engines/made/engine-plugin.h @@ -0,0 +1,3 @@ +#if PLUGIN_ENABLED_STATIC(MADE) +LINK_PLUGIN(MADE) +#endif diff --git a/engines/mohawk/engine-plugin.h b/engines/mohawk/engine-plugin.h new file mode 100644 index 0000000000..d2e69794b1 --- /dev/null +++ b/engines/mohawk/engine-plugin.h @@ -0,0 +1,3 @@ +#if PLUGIN_ENABLED_STATIC(MOHAWK) +LINK_PLUGIN(MOHAWK) +#endif diff --git a/engines/mortevielle/engine-plugin.h b/engines/mortevielle/engine-plugin.h new file mode 100644 index 0000000000..a0895d42f6 --- /dev/null +++ b/engines/mortevielle/engine-plugin.h @@ -0,0 +1,3 @@ +#if PLUGIN_ENABLED_STATIC(MORTEVIELLE) +LINK_PLUGIN(MORTEVIELLE) +#endif diff --git a/engines/neverhood/engine-plugin.h b/engines/neverhood/engine-plugin.h new file mode 100644 index 0000000000..7857703d07 --- /dev/null +++ b/engines/neverhood/engine-plugin.h @@ -0,0 +1,3 @@ +#if PLUGIN_ENABLED_STATIC(NEVERHOOD) +LINK_PLUGIN(NEVERHOOD) +#endif diff --git a/engines/parallaction/engine-plugin.h b/engines/parallaction/engine-plugin.h new file mode 100644 index 0000000000..21fb5d9ba1 --- /dev/null +++ b/engines/parallaction/engine-plugin.h @@ -0,0 +1,3 @@ +#if PLUGIN_ENABLED_STATIC(PARALLACTION) +LINK_PLUGIN(PARALLACTION) +#endif diff --git a/engines/pegasus/engine-plugin.h b/engines/pegasus/engine-plugin.h new file mode 100644 index 0000000000..7f9cb4388b --- /dev/null +++ b/engines/pegasus/engine-plugin.h @@ -0,0 +1,3 @@ +#if PLUGIN_ENABLED_STATIC(PEGASUS) +LINK_PLUGIN(PEGASUS) +#endif diff --git a/engines/plugins_table.h b/engines/plugins_table.h deleted file mode 100644 index 38cd43ac74..0000000000 --- a/engines/plugins_table.h +++ /dev/null @@ -1,130 +0,0 @@ -// This file is being included by "base/plugins.cpp" -#if PLUGIN_ENABLED_STATIC(SCUMM) -LINK_PLUGIN(SCUMM) -#endif -#if PLUGIN_ENABLED_STATIC(AGI) -LINK_PLUGIN(AGI) -#endif -#if PLUGIN_ENABLED_STATIC(AGOS) -LINK_PLUGIN(AGOS) -#endif -#if PLUGIN_ENABLED_STATIC(AVALANCHE) -LINK_PLUGIN(AVALANCHE) -#endif -#if PLUGIN_ENABLED_STATIC(CGE) -LINK_PLUGIN(CGE) -#endif -#if PLUGIN_ENABLED_STATIC(CINE) -LINK_PLUGIN(CINE) -#endif -#if PLUGIN_ENABLED_STATIC(COMPOSER) -LINK_PLUGIN(COMPOSER) -#endif -#if PLUGIN_ENABLED_STATIC(CRUISE) -LINK_PLUGIN(CRUISE) -#endif -#if PLUGIN_ENABLED_STATIC(DRACI) -LINK_PLUGIN(DRACI) -#endif -#if PLUGIN_ENABLED_STATIC(DRASCULA) -LINK_PLUGIN(DRASCULA) -#endif -#if PLUGIN_ENABLED_STATIC(DREAMWEB) -LINK_PLUGIN(DREAMWEB) -#endif -#if PLUGIN_ENABLED_STATIC(FULLPIPE) -LINK_PLUGIN(FULLPIPE) -#endif -#if PLUGIN_ENABLED_STATIC(GOB) -LINK_PLUGIN(GOB) -#endif -#if PLUGIN_ENABLED_STATIC(GROOVIE) -LINK_PLUGIN(GROOVIE) -#endif -#if PLUGIN_ENABLED_STATIC(HOPKINS) -LINK_PLUGIN(HOPKINS) -#endif -#if PLUGIN_ENABLED_STATIC(HUGO) -LINK_PLUGIN(HUGO) -#endif -#if PLUGIN_ENABLED_STATIC(KYRA) -LINK_PLUGIN(KYRA) -#endif -#if PLUGIN_ENABLED_STATIC(MORTEVIELLE) -LINK_PLUGIN(MORTEVIELLE) -#endif -#if PLUGIN_ENABLED_STATIC(LASTEXPRESS) -LINK_PLUGIN(LASTEXPRESS) -#endif -#if PLUGIN_ENABLED_STATIC(LURE) -LINK_PLUGIN(LURE) -#endif -#if PLUGIN_ENABLED_STATIC(MADE) -LINK_PLUGIN(MADE) -#endif -#if PLUGIN_ENABLED_STATIC(MOHAWK) -LINK_PLUGIN(MOHAWK) -#endif -#if PLUGIN_ENABLED_STATIC(NEVERHOOD) -LINK_PLUGIN(NEVERHOOD) -#endif -#if PLUGIN_ENABLED_STATIC(PARALLACTION) -LINK_PLUGIN(PARALLACTION) -#endif -#if PLUGIN_ENABLED_STATIC(PEGASUS) -LINK_PLUGIN(PEGASUS) -#endif -#if PLUGIN_ENABLED_STATIC(QUEEN) -LINK_PLUGIN(QUEEN) -#endif -#if PLUGIN_ENABLED_STATIC(SAGA) -LINK_PLUGIN(SAGA) -#endif -#if PLUGIN_ENABLED_STATIC(SCI) -LINK_PLUGIN(SCI) -#endif -#if PLUGIN_ENABLED_STATIC(SKY) -LINK_PLUGIN(SKY) -#endif -#if PLUGIN_ENABLED_STATIC(SWORD1) -LINK_PLUGIN(SWORD1) -#endif -#if PLUGIN_ENABLED_STATIC(SWORD2) -LINK_PLUGIN(SWORD2) -#endif -#if PLUGIN_ENABLED_STATIC(SWORD25) -LINK_PLUGIN(SWORD25) -#endif -#if PLUGIN_ENABLED_STATIC(TEENAGENT) -LINK_PLUGIN(TEENAGENT) -#endif -#if PLUGIN_ENABLED_STATIC(TESTBED) -LINK_PLUGIN(TESTBED) -#endif -#if PLUGIN_ENABLED_STATIC(TINSEL) -LINK_PLUGIN(TINSEL) -#endif -#if PLUGIN_ENABLED_STATIC(TOLTECS) -LINK_PLUGIN(TOLTECS) -#endif -#if PLUGIN_ENABLED_STATIC(TONY) -LINK_PLUGIN(TONY) -#endif -#if PLUGIN_ENABLED_STATIC(TOON) -LINK_PLUGIN(TOON) -#endif -#if PLUGIN_ENABLED_STATIC(TSAGE) -LINK_PLUGIN(TSAGE) -#endif -#if PLUGIN_ENABLED_STATIC(TOUCHE) -LINK_PLUGIN(TOUCHE) -#endif -#if PLUGIN_ENABLED_STATIC(TUCKER) -LINK_PLUGIN(TUCKER) -#endif -#if PLUGIN_ENABLED_STATIC(WINTERMUTE) -LINK_PLUGIN(WINTERMUTE) -#endif -#if PLUGIN_ENABLED_STATIC(ZVISION) -LINK_PLUGIN(ZVISION) -#endif diff --git a/engines/queen/engine-plugin.h b/engines/queen/engine-plugin.h new file mode 100644 index 0000000000..145f162a53 --- /dev/null +++ b/engines/queen/engine-plugin.h @@ -0,0 +1,3 @@ +#if PLUGIN_ENABLED_STATIC(QUEEN) +LINK_PLUGIN(QUEEN) +#endif diff --git a/engines/saga/engine-plugin.h b/engines/saga/engine-plugin.h new file mode 100644 index 0000000000..d271e36c50 --- /dev/null +++ b/engines/saga/engine-plugin.h @@ -0,0 +1,3 @@ +#if PLUGIN_ENABLED_STATIC(SAGA) +LINK_PLUGIN(SAGA) +#endif diff --git a/engines/sci/engine-plugin.h b/engines/sci/engine-plugin.h new file mode 100644 index 0000000000..01184e14e1 --- /dev/null +++ b/engines/sci/engine-plugin.h @@ -0,0 +1,3 @@ +#if PLUGIN_ENABLED_STATIC(SCI) +LINK_PLUGIN(SCI) +#endif diff --git a/engines/scumm/engine-plugin.h b/engines/scumm/engine-plugin.h new file mode 100644 index 0000000000..be9f83a149 --- /dev/null +++ b/engines/scumm/engine-plugin.h @@ -0,0 +1,3 @@ +#if PLUGIN_ENABLED_STATIC(SCUMM) +LINK_PLUGIN(SCUMM) +#endif diff --git a/engines/sky/engine-plugin.h b/engines/sky/engine-plugin.h new file mode 100644 index 0000000000..54e762226d --- /dev/null +++ b/engines/sky/engine-plugin.h @@ -0,0 +1,3 @@ +#if PLUGIN_ENABLED_STATIC(SKY) +LINK_PLUGIN(SKY) +#endif diff --git a/engines/sword1/engine-plugin.h b/engines/sword1/engine-plugin.h new file mode 100644 index 0000000000..4f8b9fd5d3 --- /dev/null +++ b/engines/sword1/engine-plugin.h @@ -0,0 +1,3 @@ +#if PLUGIN_ENABLED_STATIC(SWORD1) +LINK_PLUGIN(SWORD1) +#endif diff --git a/engines/sword2/engine-plugin.h b/engines/sword2/engine-plugin.h new file mode 100644 index 0000000000..791c358002 --- /dev/null +++ b/engines/sword2/engine-plugin.h @@ -0,0 +1,3 @@ +#if PLUGIN_ENABLED_STATIC(SWORD2) +LINK_PLUGIN(SWORD2) +#endif diff --git a/engines/sword25/engine-plugin.h b/engines/sword25/engine-plugin.h new file mode 100644 index 0000000000..526b443f57 --- /dev/null +++ b/engines/sword25/engine-plugin.h @@ -0,0 +1,3 @@ +#if PLUGIN_ENABLED_STATIC(SWORD25) +LINK_PLUGIN(SWORD25) +#endif diff --git a/engines/teenagent/engine-plugin.h b/engines/teenagent/engine-plugin.h new file mode 100644 index 0000000000..1edf835c5e --- /dev/null +++ b/engines/teenagent/engine-plugin.h @@ -0,0 +1,3 @@ +#if PLUGIN_ENABLED_STATIC(TEENAGENT) +LINK_PLUGIN(TEENAGENT) +#endif diff --git a/engines/testbed/engine-plugin.h b/engines/testbed/engine-plugin.h new file mode 100644 index 0000000000..8ae5687fa1 --- /dev/null +++ b/engines/testbed/engine-plugin.h @@ -0,0 +1,3 @@ +#if PLUGIN_ENABLED_STATIC(TESTBED) +LINK_PLUGIN(TESTBED) +#endif diff --git a/engines/tinsel/engine-plugin.h b/engines/tinsel/engine-plugin.h new file mode 100644 index 0000000000..a8046b2b92 --- /dev/null +++ b/engines/tinsel/engine-plugin.h @@ -0,0 +1,3 @@ +#if PLUGIN_ENABLED_STATIC(TINSEL) +LINK_PLUGIN(TINSEL) +#endif diff --git a/engines/toltecs/engine-plugin.h b/engines/toltecs/engine-plugin.h new file mode 100644 index 0000000000..8d6320957f --- /dev/null +++ b/engines/toltecs/engine-plugin.h @@ -0,0 +1,3 @@ +#if PLUGIN_ENABLED_STATIC(TOLTECS) +LINK_PLUGIN(TOLTECS) +#endif diff --git a/engines/tony/engine-plugin.h b/engines/tony/engine-plugin.h new file mode 100644 index 0000000000..68bd31b7d9 --- /dev/null +++ b/engines/tony/engine-plugin.h @@ -0,0 +1,3 @@ +#if PLUGIN_ENABLED_STATIC(TONY) +LINK_PLUGIN(TONY) +#endif diff --git a/engines/toon/engine-plugin.h b/engines/toon/engine-plugin.h new file mode 100644 index 0000000000..969ac88265 --- /dev/null +++ b/engines/toon/engine-plugin.h @@ -0,0 +1,3 @@ +#if PLUGIN_ENABLED_STATIC(TOON) +LINK_PLUGIN(TOON) +#endif diff --git a/engines/touche/engine-plugin.h b/engines/touche/engine-plugin.h new file mode 100644 index 0000000000..d778ec54a3 --- /dev/null +++ b/engines/touche/engine-plugin.h @@ -0,0 +1,3 @@ +#if PLUGIN_ENABLED_STATIC(TOUCHE) +LINK_PLUGIN(TOUCHE) +#endif diff --git a/engines/tsage/engine-plugin.h b/engines/tsage/engine-plugin.h new file mode 100644 index 0000000000..73711aa4a0 --- /dev/null +++ b/engines/tsage/engine-plugin.h @@ -0,0 +1,3 @@ +#if PLUGIN_ENABLED_STATIC(TSAGE) +LINK_PLUGIN(TSAGE) +#endif diff --git a/engines/tucker/engine-plugin.h b/engines/tucker/engine-plugin.h new file mode 100644 index 0000000000..524574c264 --- /dev/null +++ b/engines/tucker/engine-plugin.h @@ -0,0 +1,3 @@ +#if PLUGIN_ENABLED_STATIC(TUCKER) +LINK_PLUGIN(TUCKER) +#endif diff --git a/engines/wintermute/engine-plugin.h b/engines/wintermute/engine-plugin.h new file mode 100644 index 0000000000..e338020200 --- /dev/null +++ b/engines/wintermute/engine-plugin.h @@ -0,0 +1,3 @@ +#if PLUGIN_ENABLED_STATIC(WINTERMUTE) +LINK_PLUGIN(WINTERMUTE) +#endif diff --git a/engines/zvision/engine-plugin.h b/engines/zvision/engine-plugin.h new file mode 100644 index 0000000000..384a39e25d --- /dev/null +++ b/engines/zvision/engine-plugin.h @@ -0,0 +1,3 @@ +#if PLUGIN_ENABLED_STATIC(ZVISION) +LINK_PLUGIN(ZVISION) +#endif |