[Scummvm-git-logs] scummvm master -> 4954e7879fd8c060994e3b89bf9e21e75878a451
sev-
noreply at scummvm.org
Tue Dec 24 23:34:57 UTC 2024
This automated email contains information about 34 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
f1f826f0e2 CONFIGURE: Added possibility to define engine components. Turn lua into a component
70242c0976 DEVTOOLS: Add components to engine skeleton in create_engine
fdecb6afca ENGINES: Add components to configure.engine's explanatory comment
ba6604dd21 DEVTOOLS: CREATE_PROJECT: Add support for components
f93919b6e9 CONFIGURE: Re-add lua as a feature
0207a98c59 CONFIGURE: Implemented two passes for engine checking
8f0cf59c73 CONFIGURE: Properly pass disabled features from the awk script
daa3bd0abf CONFIGURE: Fix multiple component disabling. Add vpx component
fac386e025 SLUDGE: Mark engine as using vpx component
aa43f4f5e7 CONFIGRE: Added theoradec component and marked all the relevant engines
4079c8a85a CONFIGURE: Slightly simplify the engines.awk.out generation
d96d8bd3a5 CONFIGURE: Autoenable components for engine features with matching names
ebd5333634 SWORD25: Mark lua as hard dependency and theoradec as a soft one
9c9f303862 TETRAEDGE: Mark lua as a hard dependency
63f60562d0 CONFIGURE: Eliminate duplicate defines for features/components
15d894ab95 CONFIGURE: Print list of disabled components as well
d780708c96 ENGINES: Add mt32emu as a feature and component
2b41c7807d CONFIGURE: Added tinygl as a component
eb60f2a16a ULTIMA: Lua is a hard dependency for ultima6
481492eb89 BLADERUNNER: The engine does not really use mt32emu component
a2721371ca DRAGONS: The engine cannot truly use mt32emu component, switching off
005d6caba6 HDB: Mark lua as hard engine dependency
2a69a0ff17 MOHAWK: The MIDI code is not used in the engine, thus, removing mt32emu as a component
eae088d18e CONFIGURE: Don't duplicate features and components
38032921b8 CONFIGURE: Don't enable component when the related feature is disabled
f7a881b114 CONFIGURE: Component settings are really a define
8e4ae65f8e CONFIGURE: Pretty print enabled and disabled components
22e235f4d4 CREATE_PROJECT: Add Lua feature
aeec3e9a8e CREATE_PROJECT: Use std::find to search the feature
60104f3311 CREATE_PROJECT: Disable components when they are not needed
3ad09d8999 CREATE_PROJECT: Make unused components disabling verbose
46b62be404 CREATE_PROJECT: Explain why an engine is disabled
d33ec239fa CONFIGURE: Added imgui component and marked all the relevant engines
4954e7879f CONFIGURE: Document features that can't be components
Commit: f1f826f0e284ff40c416d38f4aa2944aede98fb2
https://github.com/scummvm/scummvm/commit/f1f826f0e284ff40c416d38f4aa2944aede98fb2
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-12-25T00:34:39+01:00
Commit Message:
CONFIGURE: Added possibility to define engine components. Turn lua into a component
Components are parts of the ScummVM common code that could be optionally
built only when the engines that use them are enabled
Changed paths:
configure
engines.awk
engines/hdb/configure.engine
engines/sword25/configure.engine
engines/tetraedge/configure.engine
engines/ultima/configure.engine
diff --git a/configure b/configure
index 1ebdc563c06..ba52064eefa 100755
--- a/configure
+++ b/configure
@@ -108,6 +108,7 @@ add_engine() {
set_var _engine_${1}_subengines "${4}"
set_var _engine_${1}_base "${5}"
set_var _engine_${1}_deps "${6}"
+ set_var _engine_${1}_components "${7}"
for sub in ${4}; do
set_var _engine_${sub}_sub "yes"
set_var _engine_${sub}_parent "${1}"
@@ -122,6 +123,14 @@ add_feature() {
set_var _feature_${1}_settings "${3}"
}
+# Add a component: id name settings-list
+add_component() {
+ _components="${_components} ${1}"
+
+ set_var _component_${1}_name "${2}"
+ set_var _component_${1}_settings "${3}"
+}
+
_srcdir=`dirname $0`
# Read list of engines
@@ -189,7 +198,6 @@ _verbose_build=no
_werror_build=no
_text_console=no
_mt32emu=yes
-_lua=yes
_build_scalers=yes
_build_hq_scalers=yes
_build_edge_scalers=yes
@@ -302,11 +310,12 @@ add_feature tinygl "TinyGL" "_tinygl"
add_feature vpx "libvpx" "_vpx"
add_feature vorbis "Vorbis file support" "_vorbis _tremor"
add_feature zlib "zlib" "_zlib"
-add_feature lua "lua" "_lua"
add_feature fribidi "FriBidi" "_fribidi"
add_feature test_cxx11 "Test C++11" "_test_cxx11"
add_feature imgui "imgui" "_imgui"
+add_component lua "lua" "USE_LUA"
+
# Directories for installing ScummVM.
# This list is closely based on what GNU autoconf does,
# although the default value for datadir differs.
@@ -947,7 +956,6 @@ Optional Features:
--enable-plugins enable the support for dynamic plugins
--default-dynamic make plugins dynamic by default
--disable-mt32emu don't enable the integrated MT-32 emulator
- --disable-lua don't enable Lua support
--disable-nuked-opl don't build Nuked OPL driver
--disable-16bit don't enable 16bit color support
--disable-highres don't enable support for high resolution engines >320x240
@@ -1311,8 +1319,6 @@ for ac_option in $@; do
--default-dynamic) _plugins_default=dynamic;;
--enable-mt32emu) _mt32emu=yes ;;
--disable-mt32emu) _mt32emu=no ;;
- --enable-lua) _lua=yes ;;
- --disable-lua) _lua=no ;;
--enable-nuked-opl) _nuked_opl=yes ;;
--disable-nuked-opl) _nuked_opl=no ;;
--enable-translation) _translation=yes ;;
@@ -3604,7 +3610,6 @@ if test -n "$_host"; then
_nuked_opl=no
_tinygl=no
_bink=no
- _lua=no
_png=no
_freetype2=no
_port_mk="backends/platform/ds/ds.mk"
@@ -4985,11 +4990,6 @@ echo "$_detection_features_full"
#
define_in_config_if_yes "$_mt32emu" 'USE_MT32EMU'
-#
-# Check whether Lua support is requested
-#
-define_in_config_if_yes "$_lua" 'USE_LUA'
-
#
# Check whether Nuked OPL emulator support is disabled
#
@@ -7173,10 +7173,6 @@ if test "$_mt32emu" = yes ; then
echo_n ", MT-32 emulator"
fi
-if test "$_lua" = yes ; then
- echo_n ", Lua"
-fi
-
if test "$_nuked_opl" = yes ; then
echo_n ", Nuked OPL emulator"
fi
diff --git a/engines.awk b/engines.awk
index 591aa144c77..f9facbd11b0 100755
--- a/engines.awk
+++ b/engines.awk
@@ -36,6 +36,10 @@ function add_to_config_h_if_yes(value, define) {
print("/* " define " */") >> config_h
}
+function add_line_to_config_h(line) {
+ print(line) >> config_h
+}
+
#
# Feature handling functions
#
@@ -85,6 +89,11 @@ function get_engine_dependencies(engine, deps) {
return get_values("_engine_" engine "_deps", deps)
}
+# Get the components
+function get_engine_components(engine, deps) {
+ return get_values("_engine_" engine "_components", components)
+}
+
# Get the base engine game support description
function get_engine_base(engine) {
return ENVIRON["_engine_" engine "_base"]
@@ -107,6 +116,18 @@ function disable_engine(engine) {
ENVIRON["_engine_" engine "_build"] = "no"
}
+function enable_component(comp) {
+ ENVIRON["_component_" comp "_enabled"] = "yes"
+}
+
+function get_component_enabled(comp) {
+ return ENVIRON["_component_" comp "_enabled"]
+}
+
+function get_component_settings(comp) {
+ return ENVIRON["_component_" comp "_settings"]
+}
+
function check_engine_deps(engine) {
unmet_deps = ""
@@ -127,6 +148,17 @@ function check_engine_deps(engine) {
}
}
+function check_engine_components(engine) {
+ # Check whether the engine is enabled
+ if (get_engine_build(engine) != "no") {
+ # Collect components
+ compcount = get_engine_components(engine, components)
+ for (c = 1; c <= compcount; c++) {
+ enable_component(components[c])
+ }
+ }
+}
+
# Prepare the strings about the engines to build
function prepare_engine_build_strings(engine) {
if (string = get_engine_build_string(engine, "static"))
@@ -267,6 +299,7 @@ END {
for (e = 1; e <= engine_count; e++) {
engine = engines[e]
check_engine_deps(engine)
+ check_engine_components(engine)
if (get_engine_sub(engine) == "no") {
# It's a main engine
if (get_engine_build(engine) == "no") {
@@ -342,6 +375,31 @@ END {
print_engines("Engines Skipped:", _engines_skipped, _skipped)
print_engines("WARNING: This ScummVM build contains the following UNSTABLE engines:", _engines_built_wip, _wip)
+ #
+ # Process components
+ #
+ add_line_to_config_h("\n/* components */")
+ add_line_to_config_mk("\n# components")
+ components_count = get_values("_components", components)
+ comp_enabled = ""
+ for (c = 1; c <= components_count; c++) {
+ setting = get_component_settings(components[c])
+ add_to_config_h_if_yes(get_component_enabled(components[c]), "#define " setting)
+
+ if (get_component_enabled(components[c]) == "yes") {
+ add_line_to_config_mk(setting "=1")
+ comp_enabled = comp_enabled components[c] " "
+ } else {
+ add_line_to_config_mk("# " setting)
+ }
+ }
+ add_line_to_config_h("/* end of components */")
+ add_line_to_config_mk("# end of components")
+
+ if (comp_enabled == "")
+ comp_enabled = "<none>"
+ print("\nComponents Enabled: " comp_enabled)
+
# Ensure engines folder exists prior to trying to generate
# files into it (used for out-of-tree-builds)
system("mkdir -p engines")
diff --git a/engines/hdb/configure.engine b/engines/hdb/configure.engine
index 5f735a26a9a..655af0028c0 100644
--- a/engines/hdb/configure.engine
+++ b/engines/hdb/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
-add_engine hdb "Hyperspace Delivery Boy!" yes "" "" "16bit highres lua"
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
+add_engine hdb "Hyperspace Delivery Boy!" yes "" "" "16bit highres" "lua"
diff --git a/engines/sword25/configure.engine b/engines/sword25/configure.engine
index 49a0b9d0721..584ab41f935 100644
--- a/engines/sword25/configure.engine
+++ b/engines/sword25/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
-add_engine sword25 "Broken Sword 2.5" yes "" "" "png 16bit highres lua theoradec"
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
+add_engine sword25 "Broken Sword 2.5" yes "" "" "png 16bit highres theoradec" "lua"
diff --git a/engines/tetraedge/configure.engine b/engines/tetraedge/configure.engine
index 38756bdbc04..31c8b38bb5c 100644
--- a/engines/tetraedge/configure.engine
+++ b/engines/tetraedge/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
-add_engine tetraedge "Tetraedge" yes "" "" "highres 3d freetype2 vorbis png jpeg lua theoradec"
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
+add_engine tetraedge "Tetraedge" yes "" "" "highres 3d freetype2 vorbis png jpeg theoradec" "lua"
diff --git a/engines/ultima/configure.engine b/engines/ultima/configure.engine
index 7777a2a0ec9..883ca017306 100644
--- a/engines/ultima/configure.engine
+++ b/engines/ultima/configure.engine
@@ -1,7 +1,7 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine ultima "Ultima" yes "ultima1 ultima4 ultima6 ultima8"
-add_engine ultima1 "Ultima I - The First Age of Darkness" no "" "" ""
+add_engine ultima1 "Ultima I - The First Age of Darkness" no "" "" ""
add_engine ultima4 "Ultima IV - Quest of the Avatar" yes "" "" "16bit"
-add_engine ultima6 "Ultima VI = The False Prophet" yes "" "" "highres 16bit lua"
+add_engine ultima6 "Ultima VI = The False Prophet" yes "" "" "highres 16bit" "lua"
add_engine ultima8 "Ultima VIII - Pagan" yes "" "" "highres 16bit"
Commit: 70242c097624f2693a618ede50b76ac809988dfb
https://github.com/scummvm/scummvm/commit/70242c097624f2693a618ede50b76ac809988dfb
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-12-25T00:34:39+01:00
Commit Message:
DEVTOOLS: Add components to engine skeleton in create_engine
Changed paths:
devtools/create_engine/files/configure.engine
diff --git a/devtools/create_engine/files/configure.engine b/devtools/create_engine/files/configure.engine
index ba672dd365e..1147e9fc40c 100644
--- a/devtools/create_engine/files/configure.engine
+++ b/devtools/create_engine/files/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
-add_engine xyzzy "Xyzzy" no "" "" ""
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
+add_engine xyzzy "Xyzzy" no "" "" "" ""
Commit: fdecb6afca06f35ed27ab0bb733a9ab076b1a452
https://github.com/scummvm/scummvm/commit/fdecb6afca06f35ed27ab0bb733a9ab076b1a452
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-12-25T00:34:39+01:00
Commit Message:
ENGINES: Add components to configure.engine's explanatory comment
Changed paths:
engines/access/configure.engine
engines/adl/configure.engine
engines/agi/configure.engine
engines/agos/configure.engine
engines/ags/configure.engine
engines/asylum/configure.engine
engines/avalanche/configure.engine
engines/bagel/configure.engine
engines/bbvs/configure.engine
engines/bladerunner/configure.engine
engines/buried/configure.engine
engines/cge/configure.engine
engines/cge2/configure.engine
engines/chamber/configure.engine
engines/chewy/configure.engine
engines/cine/configure.engine
engines/composer/configure.engine
engines/crab/configure.engine
engines/cruise/configure.engine
engines/cryo/configure.engine
engines/cryomni3d/configure.engine
engines/darkseed/configure.engine
engines/dgds/configure.engine
engines/director/configure.engine
engines/dm/configure.engine
engines/draci/configure.engine
engines/dragons/configure.engine
engines/drascula/configure.engine
engines/dreamweb/configure.engine
engines/efh/configure.engine
engines/freescape/configure.engine
engines/glk/configure.engine
engines/gnap/configure.engine
engines/gob/configure.engine
engines/griffon/configure.engine
engines/grim/configure.engine
engines/groovie/configure.engine
engines/hadesch/configure.engine
engines/hopkins/configure.engine
engines/hpl1/configure.engine
engines/hugo/configure.engine
engines/hypno/configure.engine
engines/icb/configure.engine
engines/illusions/configure.engine
engines/immortal/configure.engine
engines/kingdom/configure.engine
engines/kyra/configure.engine
engines/lab/configure.engine
engines/lastexpress/configure.engine
engines/lilliput/configure.engine
engines/lure/configure.engine
engines/m4/configure.engine
engines/macventure/configure.engine
engines/made/configure.engine
engines/mads/configure.engine
engines/mm/configure.engine
engines/mohawk/configure.engine
engines/mortevielle/configure.engine
engines/mtropolis/configure.engine
engines/mutationofjb/configure.engine
engines/myst3/configure.engine
engines/nancy/configure.engine
engines/neverhood/configure.engine
engines/ngi/configure.engine
engines/parallaction/configure.engine
engines/pegasus/configure.engine
engines/petka/configure.engine
engines/pink/configure.engine
engines/playground3d/configure.engine
engines/plumbers/configure.engine
engines/prince/configure.engine
engines/private/configure.engine
engines/qdengine/configure.engine
engines/queen/configure.engine
engines/saga/configure.engine
engines/saga2/configure.engine
engines/sci/configure.engine
engines/scumm/configure.engine
engines/sherlock/configure.engine
engines/sky/configure.engine
engines/sludge/configure.engine
engines/stark/configure.engine
engines/startrek/configure.engine
engines/supernova/configure.engine
engines/sword1/configure.engine
engines/sword2/configure.engine
engines/teenagent/configure.engine
engines/testbed/configure.engine
engines/tinsel/configure.engine
engines/titanic/configure.engine
engines/toltecs/configure.engine
engines/tony/configure.engine
engines/toon/configure.engine
engines/touche/configure.engine
engines/trecision/configure.engine
engines/tsage/configure.engine
engines/tucker/configure.engine
engines/twine/configure.engine
engines/twp/configure.engine
engines/vcruise/configure.engine
engines/voyeur/configure.engine
engines/wage/configure.engine
engines/watchmaker/configure.engine
engines/wintermute/configure.engine
engines/zvision/configure.engine
diff --git a/engines/access/configure.engine b/engines/access/configure.engine
index 00824300627..609ff94e287 100644
--- a/engines/access/configure.engine
+++ b/engines/access/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine access "Access" yes
diff --git a/engines/adl/configure.engine b/engines/adl/configure.engine
index c138b64943f..288522d2266 100644
--- a/engines/adl/configure.engine
+++ b/engines/adl/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine adl "ADL" yes "" "" "16bit highres"
diff --git a/engines/agi/configure.engine b/engines/agi/configure.engine
index fad659f86d4..c2e6e14aab7 100644
--- a/engines/agi/configure.engine
+++ b/engines/agi/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine agi "AGI" yes
diff --git a/engines/agos/configure.engine b/engines/agos/configure.engine
index cd7fcf9d785..81ab8bd1c20 100644
--- a/engines/agos/configure.engine
+++ b/engines/agos/configure.engine
@@ -1,4 +1,4 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine agos "AGOS" yes "agos2" "AGOS 1 games"
add_engine agos2 "AGOS 2 games" yes "" "" "highres"
diff --git a/engines/ags/configure.engine b/engines/ags/configure.engine
index facd925d4b9..8ad0af74249 100644
--- a/engines/ags/configure.engine
+++ b/engines/ags/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine ags "Adventure Game Studio" yes "" "" "16bit mad"
diff --git a/engines/asylum/configure.engine b/engines/asylum/configure.engine
index 6e9da8d85c9..b0c3f5768e3 100644
--- a/engines/asylum/configure.engine
+++ b/engines/asylum/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine asylum "Sanitarium" yes "" "" "highres"
diff --git a/engines/avalanche/configure.engine b/engines/avalanche/configure.engine
index 9b913ff0533..b8066a62c29 100644
--- a/engines/avalanche/configure.engine
+++ b/engines/avalanche/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine avalanche "Lord Avalot d'Argent" no "" "" "highres"
diff --git a/engines/bagel/configure.engine b/engines/bagel/configure.engine
index 5faf2943868..6ba1f726470 100644
--- a/engines/bagel/configure.engine
+++ b/engines/bagel/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine bagel "BAGEL" yes "" "" "16bit highres freetype2"
diff --git a/engines/bbvs/configure.engine b/engines/bbvs/configure.engine
index 8be3e078d9b..27c87ce9e10 100644
--- a/engines/bbvs/configure.engine
+++ b/engines/bbvs/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine bbvs "Beavis and Butthead in Virtual Stupidity" yes
diff --git a/engines/bladerunner/configure.engine b/engines/bladerunner/configure.engine
index e88efef4def..a4a6150a872 100644
--- a/engines/bladerunner/configure.engine
+++ b/engines/bladerunner/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine bladerunner "Blade Runner" yes "" "" "16bit highres"
diff --git a/engines/buried/configure.engine b/engines/buried/configure.engine
index 56854c293b5..189b4ab7d1c 100644
--- a/engines/buried/configure.engine
+++ b/engines/buried/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine buried "The Journeyman Project 2: Buried in Time" yes "" "" "highres freetype2"
diff --git a/engines/cge/configure.engine b/engines/cge/configure.engine
index 72af1197bed..719a74c9fc5 100644
--- a/engines/cge/configure.engine
+++ b/engines/cge/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine cge "CGE" yes
diff --git a/engines/cge2/configure.engine b/engines/cge2/configure.engine
index 79d091fec53..b310c326bf7 100644
--- a/engines/cge2/configure.engine
+++ b/engines/cge2/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine cge2 "CGE2" yes
diff --git a/engines/chamber/configure.engine b/engines/chamber/configure.engine
index 77c195434e8..4d7e7b52461 100644
--- a/engines/chamber/configure.engine
+++ b/engines/chamber/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine chamber "Chamber" no
diff --git a/engines/chewy/configure.engine b/engines/chewy/configure.engine
index 336b3655825..f16957d980e 100644
--- a/engines/chewy/configure.engine
+++ b/engines/chewy/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine chewy "Chewy: Esc from F5" yes
diff --git a/engines/cine/configure.engine b/engines/cine/configure.engine
index 2b7e2085fa4..626fae3c45d 100644
--- a/engines/cine/configure.engine
+++ b/engines/cine/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine cine "Cinematique evo 1" yes
diff --git a/engines/composer/configure.engine b/engines/composer/configure.engine
index 17120a3a3d2..44c6b00ee8c 100644
--- a/engines/composer/configure.engine
+++ b/engines/composer/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine composer "Magic Composer" yes "" "" "highres"
diff --git a/engines/crab/configure.engine b/engines/crab/configure.engine
index fd42460c8c9..11800b97d2f 100644
--- a/engines/crab/configure.engine
+++ b/engines/crab/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine crab "CRAB" yes "" "" "16bit highres png freetype2 vorbis"
diff --git a/engines/cruise/configure.engine b/engines/cruise/configure.engine
index 925da25370a..492ff6d97ac 100644
--- a/engines/cruise/configure.engine
+++ b/engines/cruise/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine cruise "Cinematique evo 2" yes
diff --git a/engines/cryo/configure.engine b/engines/cryo/configure.engine
index a0f5a044e9d..1d13e9669db 100644
--- a/engines/cryo/configure.engine
+++ b/engines/cryo/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine cryo "Lost Eden" no "" "" ""
diff --git a/engines/cryomni3d/configure.engine b/engines/cryomni3d/configure.engine
index 726cc2a5dd1..d457e936ee7 100644
--- a/engines/cryomni3d/configure.engine
+++ b/engines/cryomni3d/configure.engine
@@ -1,4 +1,4 @@
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine cryomni3d "Cryo Omni3D games" yes "versailles" "" "highres"
add_engine versailles "Versailles 1685" yes
diff --git a/engines/darkseed/configure.engine b/engines/darkseed/configure.engine
index e8fe3de4c25..511d9722922 100644
--- a/engines/darkseed/configure.engine
+++ b/engines/darkseed/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine darkseed "Darkseed" yes "" "" "highres"
diff --git a/engines/dgds/configure.engine b/engines/dgds/configure.engine
index aaac51da36c..1c7a5c8f44e 100644
--- a/engines/dgds/configure.engine
+++ b/engines/dgds/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine dgds "Dynamix Game Development System" yes
diff --git a/engines/director/configure.engine b/engines/director/configure.engine
index 0cf07abd520..a93609f9fb2 100644
--- a/engines/director/configure.engine
+++ b/engines/director/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine director "Macromedia Director" yes "" "" "highres"
diff --git a/engines/dm/configure.engine b/engines/dm/configure.engine
index 33f897832af..97d085cb62e 100644
--- a/engines/dm/configure.engine
+++ b/engines/dm/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine dm "Dungeon Master" no
diff --git a/engines/draci/configure.engine b/engines/draci/configure.engine
index 09022b06f59..cf104a46b3d 100644
--- a/engines/draci/configure.engine
+++ b/engines/draci/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine draci "Dragon History" yes
diff --git a/engines/dragons/configure.engine b/engines/dragons/configure.engine
index 9cfef68ba4c..9b482672a1a 100644
--- a/engines/dragons/configure.engine
+++ b/engines/dragons/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine dragons "Blazing Dragons" yes "" "" "16bit"
diff --git a/engines/drascula/configure.engine b/engines/drascula/configure.engine
index b9b76638fd1..36a318b607f 100644
--- a/engines/drascula/configure.engine
+++ b/engines/drascula/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine drascula "Drascula: The Vampire Strikes Back" yes
diff --git a/engines/dreamweb/configure.engine b/engines/dreamweb/configure.engine
index 27506e650f3..4087a189ad2 100644
--- a/engines/dreamweb/configure.engine
+++ b/engines/dreamweb/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine dreamweb "Dreamweb" yes
diff --git a/engines/efh/configure.engine b/engines/efh/configure.engine
index f868fa2444d..baf0aee4dfa 100644
--- a/engines/efh/configure.engine
+++ b/engines/efh/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine efh "Escape From Hell" yes
diff --git a/engines/freescape/configure.engine b/engines/freescape/configure.engine
index 6e2620258e9..d1988a77154 100644
--- a/engines/freescape/configure.engine
+++ b/engines/freescape/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine freescape "Freescape" yes "" "" "highres 16bit 3d"
diff --git a/engines/glk/configure.engine b/engines/glk/configure.engine
index bca92e86087..7db6d57f739 100644
--- a/engines/glk/configure.engine
+++ b/engines/glk/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine glk "Glk Interactive Fiction games" yes "" "" "16bit freetype2 jpeg png"
diff --git a/engines/gnap/configure.engine b/engines/gnap/configure.engine
index aaf870c3c8a..fb615f66815 100644
--- a/engines/gnap/configure.engine
+++ b/engines/gnap/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine gnap "UFOs" yes "" "" "highres 16bit"
diff --git a/engines/gob/configure.engine b/engines/gob/configure.engine
index 8e012f58156..a12324c06cb 100644
--- a/engines/gob/configure.engine
+++ b/engines/gob/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine gob "Gobli*ns" yes
diff --git a/engines/griffon/configure.engine b/engines/griffon/configure.engine
index 69f07b88443..19904564459 100644
--- a/engines/griffon/configure.engine
+++ b/engines/griffon/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine griffon "The Griffon Legend" yes "" "" "16bit"
diff --git a/engines/grim/configure.engine b/engines/grim/configure.engine
index 2a97d265524..9a8c00991ca 100644
--- a/engines/grim/configure.engine
+++ b/engines/grim/configure.engine
@@ -1,4 +1,4 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine grim "Grim" yes "monkey4" "Grim Fandango" "16bit 3d highres"
add_engine monkey4 "Escape from Monkey Island" no "" "" "bink"
diff --git a/engines/groovie/configure.engine b/engines/groovie/configure.engine
index 1ac422a6417..0cbf2501f49 100644
--- a/engines/groovie/configure.engine
+++ b/engines/groovie/configure.engine
@@ -1,4 +1,4 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine groovie "Groovie" yes "groovie2" "7th Guest" "highres"
add_engine groovie2 "Groovie 2 games" yes "" "" "jpeg 16bit"
diff --git a/engines/hadesch/configure.engine b/engines/hadesch/configure.engine
index fbe9af111ed..853fd8b0e92 100644
--- a/engines/hadesch/configure.engine
+++ b/engines/hadesch/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine hadesch "Hades Challenge" yes "" "" "highres"
diff --git a/engines/hopkins/configure.engine b/engines/hopkins/configure.engine
index cd9f50a5f9b..f46e29d0f67 100644
--- a/engines/hopkins/configure.engine
+++ b/engines/hopkins/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine hopkins "Hopkins FBI" yes "" "" "16bit highres"
diff --git a/engines/hpl1/configure.engine b/engines/hpl1/configure.engine
index 30451b0a462..62451ac44eb 100644
--- a/engines/hpl1/configure.engine
+++ b/engines/hpl1/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine hpl1 "Hpl1" no "" "" "16bit 3d highres jpeg gif png opengl_game_shaders"
diff --git a/engines/hugo/configure.engine b/engines/hugo/configure.engine
index 9ab5c54e1ed..8eb3611f9f0 100644
--- a/engines/hugo/configure.engine
+++ b/engines/hugo/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine hugo "Hugo Trilogy" yes
diff --git a/engines/hypno/configure.engine b/engines/hypno/configure.engine
index 47deb21418a..f6d7df84d0d 100644
--- a/engines/hypno/configure.engine
+++ b/engines/hypno/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine hypno "Hypnotix Inc." yes "" "" ""
diff --git a/engines/icb/configure.engine b/engines/icb/configure.engine
index f7f3e93c253..da844deba56 100644
--- a/engines/icb/configure.engine
+++ b/engines/icb/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine icb "In Cold Blood" no "" "" "16bit highres bink"
diff --git a/engines/illusions/configure.engine b/engines/illusions/configure.engine
index 2b262a076d6..f3e14a1345e 100644
--- a/engines/illusions/configure.engine
+++ b/engines/illusions/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine illusions "Illusions Engine" yes
diff --git a/engines/immortal/configure.engine b/engines/immortal/configure.engine
index 835d5bdc5f6..3dcca378168 100644
--- a/engines/immortal/configure.engine
+++ b/engines/immortal/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine immortal "The Immortal" no "" "" ""
diff --git a/engines/kingdom/configure.engine b/engines/kingdom/configure.engine
index 5a93f25a2a3..9895b3640c1 100644
--- a/engines/kingdom/configure.engine
+++ b/engines/kingdom/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine kingdom "Kingdom: The Far Reaches" yes "" "" ""
diff --git a/engines/kyra/configure.engine b/engines/kyra/configure.engine
index b7d6334fcc7..6f49d3140d7 100644
--- a/engines/kyra/configure.engine
+++ b/engines/kyra/configure.engine
@@ -1,5 +1,5 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine kyra "Kyra" yes "lol eob" "Legend of Kyrandia 1-3"
add_engine lol "Lands of Lore" yes
add_engine eob "Eye of the Beholder" yes
diff --git a/engines/lab/configure.engine b/engines/lab/configure.engine
index 3be9545aa65..476b30addb6 100644
--- a/engines/lab/configure.engine
+++ b/engines/lab/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine lab "Labyrinth of Time" yes
diff --git a/engines/lastexpress/configure.engine b/engines/lastexpress/configure.engine
index 66bac55dea3..fd666b98b55 100644
--- a/engines/lastexpress/configure.engine
+++ b/engines/lastexpress/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine lastexpress "The Last Express" no "" "" "16bit highres"
diff --git a/engines/lilliput/configure.engine b/engines/lilliput/configure.engine
index 0b912f7dc84..2c82685cfdd 100644
--- a/engines/lilliput/configure.engine
+++ b/engines/lilliput/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine lilliput "Lilliput" no
diff --git a/engines/lure/configure.engine b/engines/lure/configure.engine
index e9f92893e3a..f198ab0085c 100644
--- a/engines/lure/configure.engine
+++ b/engines/lure/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine lure "Lure of the Temptress" yes
diff --git a/engines/m4/configure.engine b/engines/m4/configure.engine
index afb1f4b97d7..67964f2d5d4 100644
--- a/engines/m4/configure.engine
+++ b/engines/m4/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine m4 "M4" yes "" "" "highres"
diff --git a/engines/macventure/configure.engine b/engines/macventure/configure.engine
index 7aca6f6f8ae..f0ae901a5b8 100644
--- a/engines/macventure/configure.engine
+++ b/engines/macventure/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine macventure "MacVenture" no "" "" "highres"
diff --git a/engines/made/configure.engine b/engines/made/configure.engine
index 22667123382..53784d903a5 100644
--- a/engines/made/configure.engine
+++ b/engines/made/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine made "MADE" yes
diff --git a/engines/mads/configure.engine b/engines/mads/configure.engine
index a264e25acfc..12640c8c631 100644
--- a/engines/mads/configure.engine
+++ b/engines/mads/configure.engine
@@ -1,4 +1,4 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine mads "MADS" yes "madsv2" "Rex Nebular"
add_engine madsv2 "MADS V2" no "" "Return of the Phantom, Dragonsphere"
diff --git a/engines/mm/configure.engine b/engines/mm/configure.engine
index ad09deabc44..5231ea9db1e 100644
--- a/engines/mm/configure.engine
+++ b/engines/mm/configure.engine
@@ -1,5 +1,5 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine mm "Might and Magic" yes "mm1 xeen"
add_engine mm1 "Might and Magic 1" yes
add_engine xeen "Might and Magic Xeen" yes
diff --git a/engines/mohawk/configure.engine b/engines/mohawk/configure.engine
index c5d0a4c87ef..9ab05d507bb 100644
--- a/engines/mohawk/configure.engine
+++ b/engines/mohawk/configure.engine
@@ -1,5 +1,5 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine mohawk "Mohawk" yes "cstime myst mystme riven" "Living Books" "highres"
add_engine cstime "Where in Time is Carmen Sandiego?" no
add_engine riven "Riven: The Sequel to Myst" yes "" "" "16bit"
diff --git a/engines/mortevielle/configure.engine b/engines/mortevielle/configure.engine
index 0fe89acc99e..d9aac3ce73a 100644
--- a/engines/mortevielle/configure.engine
+++ b/engines/mortevielle/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine mortevielle "Mortevielle" yes "" "" "highres"
diff --git a/engines/mtropolis/configure.engine b/engines/mtropolis/configure.engine
index ef9a8913212..67b83dbec9c 100644
--- a/engines/mtropolis/configure.engine
+++ b/engines/mtropolis/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine mtropolis "mTropolis" yes "" "" "16bit highres"
diff --git a/engines/mutationofjb/configure.engine b/engines/mutationofjb/configure.engine
index 499e0780a27..8365adf3204 100644
--- a/engines/mutationofjb/configure.engine
+++ b/engines/mutationofjb/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine mutationofjb "Mutation of JB" no
diff --git a/engines/myst3/configure.engine b/engines/myst3/configure.engine
index 5feb3e3792a..5a6f8f212e1 100644
--- a/engines/myst3/configure.engine
+++ b/engines/myst3/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine myst3 "Myst 3" yes "" "" "16bit 3d highres jpeg bink"
diff --git a/engines/nancy/configure.engine b/engines/nancy/configure.engine
index b49e32ba802..10f4e4783f1 100644
--- a/engines/nancy/configure.engine
+++ b/engines/nancy/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine nancy "Nancy Drew" yes "" "" "16bit highres vorbis bink"
diff --git a/engines/neverhood/configure.engine b/engines/neverhood/configure.engine
index f04e6c69f66..3a12eb46af9 100644
--- a/engines/neverhood/configure.engine
+++ b/engines/neverhood/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine neverhood "Neverhood" yes "" "" "highres"
diff --git a/engines/ngi/configure.engine b/engines/ngi/configure.engine
index 62d49eb8eb4..d3de6ef3918 100644
--- a/engines/ngi/configure.engine
+++ b/engines/ngi/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine ngi "Nikita Game Interface" yes "" "" "16bit highres"
diff --git a/engines/parallaction/configure.engine b/engines/parallaction/configure.engine
index babca4579f8..0a9a08d26e6 100644
--- a/engines/parallaction/configure.engine
+++ b/engines/parallaction/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine parallaction "Parallaction" yes
diff --git a/engines/pegasus/configure.engine b/engines/pegasus/configure.engine
index 650d57a602d..a14415b988d 100644
--- a/engines/pegasus/configure.engine
+++ b/engines/pegasus/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine pegasus "The Journeyman Project: Pegasus Prime" yes "" "" "16bit highres"
diff --git a/engines/petka/configure.engine b/engines/petka/configure.engine
index 893ad48ce9c..527d11cb5e1 100644
--- a/engines/petka/configure.engine
+++ b/engines/petka/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine petka "Red Comrades" yes "" "" "highres 16bit freetype2"
diff --git a/engines/pink/configure.engine b/engines/pink/configure.engine
index caee8231a2c..0a1c8255c83 100644
--- a/engines/pink/configure.engine
+++ b/engines/pink/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine pink "Pink Panther" yes "" "" "highres"
diff --git a/engines/playground3d/configure.engine b/engines/playground3d/configure.engine
index 45489558f3e..8cd9ec8c952 100644
--- a/engines/playground3d/configure.engine
+++ b/engines/playground3d/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine playground3d "Playground 3d: the testing and playground environment for 3d renderers" no "" "" "16bit 3d highres"
diff --git a/engines/plumbers/configure.engine b/engines/plumbers/configure.engine
index 4a309abcfb4..9bb32d5eb05 100644
--- a/engines/plumbers/configure.engine
+++ b/engines/plumbers/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine plumbers "Plumbers Don't Wear Ties" yes
diff --git a/engines/prince/configure.engine b/engines/prince/configure.engine
index bb0ca28f6d1..90378def816 100644
--- a/engines/prince/configure.engine
+++ b/engines/prince/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine prince "The Prince and The Coward" yes "" "" "highres"
diff --git a/engines/private/configure.engine b/engines/private/configure.engine
index cf86f752de8..1f08f59ec17 100644
--- a/engines/private/configure.engine
+++ b/engines/private/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine private "Private Eye" yes "" "" "highres"
diff --git a/engines/qdengine/configure.engine b/engines/qdengine/configure.engine
index dc6903b258d..76ef4d033b1 100644
--- a/engines/qdengine/configure.engine
+++ b/engines/qdengine/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine qdengine "QD Engine" yes "" "" "vorbis 16bit highres mpeg2"
diff --git a/engines/queen/configure.engine b/engines/queen/configure.engine
index c8766743f9d..2416dc8ca9f 100644
--- a/engines/queen/configure.engine
+++ b/engines/queen/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine queen "Flight of the Amazon Queen" yes
diff --git a/engines/saga/configure.engine b/engines/saga/configure.engine
index 7f93486cb3a..c9815f17291 100644
--- a/engines/saga/configure.engine
+++ b/engines/saga/configure.engine
@@ -1,4 +1,4 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine saga "SAGA" yes "ihnm" "ITE"
add_engine ihnm "IHNM" yes "" "" "highres"
diff --git a/engines/saga2/configure.engine b/engines/saga2/configure.engine
index 849ea96dc23..e302bed8098 100644
--- a/engines/saga2/configure.engine
+++ b/engines/saga2/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine saga2 "SAGA2" yes "" "" "highres"
diff --git a/engines/sci/configure.engine b/engines/sci/configure.engine
index fab61ff4519..ef80ce1fa7c 100644
--- a/engines/sci/configure.engine
+++ b/engines/sci/configure.engine
@@ -1,4 +1,4 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine sci "SCI" yes "sci32" "SCI 0-1.1 games"
add_engine sci32 "SCI32 games" yes "" "" "highres"
diff --git a/engines/scumm/configure.engine b/engines/scumm/configure.engine
index 42c75226da6..ce6bbcbeb2b 100644
--- a/engines/scumm/configure.engine
+++ b/engines/scumm/configure.engine
@@ -1,5 +1,5 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine scumm "SCUMM" yes "scumm_7_8 he" "v0-v6 games"
add_engine scumm_7_8 "v7 & v8 games" yes
add_engine he "HE71+ games" yes "" "" "highres bink"
diff --git a/engines/sherlock/configure.engine b/engines/sherlock/configure.engine
index fd1c354e785..756ec27ecb2 100644
--- a/engines/sherlock/configure.engine
+++ b/engines/sherlock/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine sherlock "The Lost Files of Sherlock Holmes" yes
diff --git a/engines/sky/configure.engine b/engines/sky/configure.engine
index 32b84849cbb..99b39cae71c 100644
--- a/engines/sky/configure.engine
+++ b/engines/sky/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine sky "Beneath a Steel Sky" yes
diff --git a/engines/sludge/configure.engine b/engines/sludge/configure.engine
index d43be63156b..ebfaa0d75e0 100644
--- a/engines/sludge/configure.engine
+++ b/engines/sludge/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine sludge "Sludge" no "" "" "16bit png"
diff --git a/engines/stark/configure.engine b/engines/stark/configure.engine
index eb279cabae1..d77a1f5bbd0 100644
--- a/engines/stark/configure.engine
+++ b/engines/stark/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine stark "The Longest Journey" yes "" "" "16bit 3d highres freetype2 vorbis bink"
diff --git a/engines/startrek/configure.engine b/engines/startrek/configure.engine
index bdcd68ef5da..f7311d4d5fa 100644
--- a/engines/startrek/configure.engine
+++ b/engines/startrek/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine startrek "Star Trek 25th Anniversary/Judgment Rites" no
diff --git a/engines/supernova/configure.engine b/engines/supernova/configure.engine
index 0971286f0e3..1fe5fa9ee46 100644
--- a/engines/supernova/configure.engine
+++ b/engines/supernova/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine supernova "Mission Supernova" yes
diff --git a/engines/sword1/configure.engine b/engines/sword1/configure.engine
index 1d17903b69b..d6b10a65a3c 100644
--- a/engines/sword1/configure.engine
+++ b/engines/sword1/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine sword1 "Broken Sword" yes "" "" "highres"
diff --git a/engines/sword2/configure.engine b/engines/sword2/configure.engine
index a794e7287cd..ee32d0f7abd 100644
--- a/engines/sword2/configure.engine
+++ b/engines/sword2/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine sword2 "Broken Sword II" yes "" "" "highres"
diff --git a/engines/teenagent/configure.engine b/engines/teenagent/configure.engine
index 223a0e884cc..3c8312a927b 100644
--- a/engines/teenagent/configure.engine
+++ b/engines/teenagent/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine teenagent "Teen Agent" yes
diff --git a/engines/testbed/configure.engine b/engines/testbed/configure.engine
index c0a68c8eb87..6eb5a3f26f0 100644
--- a/engines/testbed/configure.engine
+++ b/engines/testbed/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine testbed "TestBed: the Testing framework" no
diff --git a/engines/tinsel/configure.engine b/engines/tinsel/configure.engine
index c0f3e0a18df..0aacc91936f 100644
--- a/engines/tinsel/configure.engine
+++ b/engines/tinsel/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine tinsel "Tinsel" yes
diff --git a/engines/titanic/configure.engine b/engines/titanic/configure.engine
index 66acce16814..e2c42c3454e 100644
--- a/engines/titanic/configure.engine
+++ b/engines/titanic/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine titanic "Starship Titanic" yes "" "" "16bit jpeg highres mad"
diff --git a/engines/toltecs/configure.engine b/engines/toltecs/configure.engine
index 8310a6d6ef3..761410c55fa 100644
--- a/engines/toltecs/configure.engine
+++ b/engines/toltecs/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine toltecs "3 Skulls of the Toltecs" yes "" "" "highres"
diff --git a/engines/tony/configure.engine b/engines/tony/configure.engine
index 2df4434982a..cdbf90e07ae 100644
--- a/engines/tony/configure.engine
+++ b/engines/tony/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine tony "Tony Tough and the Night of Roasted Moths" yes "" "" "16bit highres"
diff --git a/engines/toon/configure.engine b/engines/toon/configure.engine
index 689bce1c025..ddcc3999c19 100644
--- a/engines/toon/configure.engine
+++ b/engines/toon/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine toon "Toonstruck" yes "" "" "highres"
diff --git a/engines/touche/configure.engine b/engines/touche/configure.engine
index f35940ef471..857ddca1280 100644
--- a/engines/touche/configure.engine
+++ b/engines/touche/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine touche "Touche: The Adventures of the Fifth Musketeer" yes "" "" "highres"
diff --git a/engines/trecision/configure.engine b/engines/trecision/configure.engine
index d266b4b6ed3..030c68f1487 100644
--- a/engines/trecision/configure.engine
+++ b/engines/trecision/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine trecision "Trecision Adventure Module" yes "" "" "highres 16bit"
diff --git a/engines/tsage/configure.engine b/engines/tsage/configure.engine
index 51c5b6a856b..5e05c03f9d2 100644
--- a/engines/tsage/configure.engine
+++ b/engines/tsage/configure.engine
@@ -1,5 +1,5 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine tsage "TsAGE" yes "ringworld blueforce ringworld2"
add_engine ringworld "Ringworld: Revenge of the Patriarch" yes
add_engine blueforce "Blue Force" yes
diff --git a/engines/tucker/configure.engine b/engines/tucker/configure.engine
index 06676cf0a40..5d9c4a15236 100644
--- a/engines/tucker/configure.engine
+++ b/engines/tucker/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine tucker "Bud Tucker in Double Trouble" yes
diff --git a/engines/twine/configure.engine b/engines/twine/configure.engine
index ed21fa34f38..afe9bfaa64c 100644
--- a/engines/twine/configure.engine
+++ b/engines/twine/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine twine "Little Big Adventure" yes "" "" "highres"
diff --git a/engines/twp/configure.engine b/engines/twp/configure.engine
index 6f79c934658..c2cb7fbb481 100644
--- a/engines/twp/configure.engine
+++ b/engines/twp/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine twp "Thimbleweed Park" yes "" "" "16bit 3d highres vorbis png opengl_game_shaders"
diff --git a/engines/vcruise/configure.engine b/engines/vcruise/configure.engine
index 5f94cf67101..7d1775d9918 100644
--- a/engines/vcruise/configure.engine
+++ b/engines/vcruise/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine vcruise "V-Cruise" yes "" "" "16bit highres"
diff --git a/engines/voyeur/configure.engine b/engines/voyeur/configure.engine
index 647e20267f0..3941ad874b9 100644
--- a/engines/voyeur/configure.engine
+++ b/engines/voyeur/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine voyeur "Voyeur" yes
diff --git a/engines/wage/configure.engine b/engines/wage/configure.engine
index b180e20db28..77b0542223f 100644
--- a/engines/wage/configure.engine
+++ b/engines/wage/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine wage "WAGE" no "" "" "highres"
diff --git a/engines/watchmaker/configure.engine b/engines/watchmaker/configure.engine
index 4c502f69285..50f864adbad 100644
--- a/engines/watchmaker/configure.engine
+++ b/engines/watchmaker/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine watchmaker "The Watchmaker" no "" "" "highres 16bit 3d opengl_game_classic"
diff --git a/engines/wintermute/configure.engine b/engines/wintermute/configure.engine
index 7083e2af18e..1e7d00c751f 100644
--- a/engines/wintermute/configure.engine
+++ b/engines/wintermute/configure.engine
@@ -1,5 +1,5 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine wintermute "Wintermute" yes "foxtail herocraft wme3d" "" "16bit highres jpeg png"
add_engine wme3d "Wintermute3D" no "" "" "3d"
add_engine foxtail "FoxTail" yes
diff --git a/engines/zvision/configure.engine b/engines/zvision/configure.engine
index 8681522a352..44df4f6df83 100644
--- a/engines/zvision/configure.engine
+++ b/engines/zvision/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine zvision "Z-Vision" yes "" "" "freetype2 16bit highres"
Commit: ba6604dd21ee8272c6fadf6e70df98025d25ed01
https://github.com/scummvm/scummvm/commit/ba6604dd21ee8272c6fadf6e70df98025d25ed01
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-12-25T00:34:39+01:00
Commit Message:
DEVTOOLS: CREATE_PROJECT: Add support for components
We scan the configure file and enable all components
Changed paths:
devtools/create_project/create_project.cpp
devtools/create_project/create_project.h
diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index 7051c4157b3..5462a45fd32 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -132,6 +132,7 @@ int main(int argc, char *argv[]) {
}
setup.features = getAllFeatures();
+ setup.components = getAllComponents(setup.srcDir);
ProjectType projectType = kProjectNone;
const MSVCVersion *msvc = nullptr;
@@ -317,6 +318,11 @@ int main(int argc, char *argv[]) {
std::string libsDir = unifyPath(argv[++i]);
removeTrailingSlash(libsDir);
setup.libsDir = libsDir;
+ } else if (!std::strcmp(argv[i], "--list-components")) {
+ for (StringList::const_iterator j = setup.components.begin(); j != setup.components.end(); ++j)
+ cout << ' ' << *j << "\n";
+
+ return 0;
} else {
std::cerr << "ERROR: Unknown parameter \"" << argv[i] << "\"\n";
return -1;
@@ -435,6 +441,9 @@ int main(int argc, char *argv[]) {
StringList featureDefines = getFeatureDefines(setup.features);
setup.defines.splice(setup.defines.begin(), featureDefines);
+ // Add all components
+ setup.defines.splice(setup.defines.begin(), setup.components);
+
if (projectType == kProjectXcode) {
setup.defines.push_back("POSIX");
// Define both MACOSX, and IPHONE, but only one of them will be associated to the
@@ -1148,7 +1157,6 @@ const Feature s_features[] = {
{ "highres", "USE_HIGHRES", false, true, "high resolution" },
{ "imgui", "USE_IMGUI", false, true, "Dear ImGui based debugger" },
{ "mt32emu", "USE_MT32EMU", false, true, "integrated MT-32 emulator" },
- { "lua", "USE_LUA", false, true, "lua" },
{ "nasm", "USE_NASM", false, true, "IA-32 assembly support" }, // This feature is special in the regard, that it needs additional handling.
{ "tinygl", "USE_TINYGL", false, true, "TinyGL support" },
{ "opengl", "USE_OPENGL", false, true, "OpenGL support" },
@@ -1220,6 +1228,51 @@ FeatureList getAllFeatures() {
return features;
}
+StringList getAllComponents(const std::string &srcDir) {
+ std::string configureFile = srcDir + "/configure";
+
+ std::ifstream configure(configureFile.c_str());
+ if (!configure)
+ return StringList();
+
+ std::string line;
+ StringList components;
+ bool seenComponents = false;
+
+ for (;;) {
+ std::getline(configure, line);
+ if (configure.eof())
+ break;
+
+ if (configure.fail())
+ error("Failed while reading from " + configureFile);
+
+ TokenList tokens = tokenize(line);
+
+ if (tokens.size() < 4)
+ continue;
+
+ TokenList::const_iterator token = tokens.begin();
+
+ // add_component lua "lua" "USE_LUA"
+ if (*token != "add_component") {
+ if (seenComponents) // No need to read whole file
+ break;
+ else
+ continue;
+ }
+
+ seenComponents = true;
+ ++token;
+ ++token;
+ ++token;
+
+ components.push_back(*token);
+ }
+
+ return components;
+}
+
StringList getFeatureDefines(const FeatureList &features) {
StringList defines;
diff --git a/devtools/create_project/create_project.h b/devtools/create_project/create_project.h
index 7327434d8e1..e784453a2a4 100644
--- a/devtools/create_project/create_project.h
+++ b/devtools/create_project/create_project.h
@@ -188,6 +188,8 @@ typedef std::list<Tool> ToolList;
*/
FeatureList getAllFeatures();
+StringList getAllComponents(const std::string &srcDir);
+
/**
* Returns a list of all defines, according to the feature set
* passed.
@@ -238,6 +240,8 @@ struct BuildSetup {
EngineDescList engines; ///< Engine list for the build (this may contain engines, which are *not* enabled!).
FeatureList features; ///< Feature list for the build (this may contain features, which are *not* enabled!).
+ StringList components;
+
StringList defines; ///< List of all defines for the build.
StringList testDirs; ///< List of all folders containing tests
Commit: f93919b6e90e0bc92211297e44e4e73858f9a755
https://github.com/scummvm/scummvm/commit/f93919b6e90e0bc92211297e44e4e73858f9a755
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-12-25T00:34:39+01:00
Commit Message:
CONFIGURE: Re-add lua as a feature
Changed paths:
configure
diff --git a/configure b/configure
index ba52064eefa..5de9cea6019 100755
--- a/configure
+++ b/configure
@@ -198,6 +198,7 @@ _verbose_build=no
_werror_build=no
_text_console=no
_mt32emu=yes
+_lua=yes
_build_scalers=yes
_build_hq_scalers=yes
_build_edge_scalers=yes
@@ -310,6 +311,7 @@ add_feature tinygl "TinyGL" "_tinygl"
add_feature vpx "libvpx" "_vpx"
add_feature vorbis "Vorbis file support" "_vorbis _tremor"
add_feature zlib "zlib" "_zlib"
+add_feature lua "lua" "_lua"
add_feature fribidi "FriBidi" "_fribidi"
add_feature test_cxx11 "Test C++11" "_test_cxx11"
add_feature imgui "imgui" "_imgui"
@@ -956,6 +958,7 @@ Optional Features:
--enable-plugins enable the support for dynamic plugins
--default-dynamic make plugins dynamic by default
--disable-mt32emu don't enable the integrated MT-32 emulator
+ --disable-lua don't enable Lua support
--disable-nuked-opl don't build Nuked OPL driver
--disable-16bit don't enable 16bit color support
--disable-highres don't enable support for high resolution engines >320x240
@@ -1319,6 +1322,8 @@ for ac_option in $@; do
--default-dynamic) _plugins_default=dynamic;;
--enable-mt32emu) _mt32emu=yes ;;
--disable-mt32emu) _mt32emu=no ;;
+ --enable-lua) _lua=yes ;;
+ --disable-lua) _lua=no ;;
--enable-nuked-opl) _nuked_opl=yes ;;
--disable-nuked-opl) _nuked_opl=no ;;
--enable-translation) _translation=yes ;;
@@ -3610,6 +3615,7 @@ if test -n "$_host"; then
_nuked_opl=no
_tinygl=no
_bink=no
+ _lua=no
_png=no
_freetype2=no
_port_mk="backends/platform/ds/ds.mk"
@@ -4990,6 +4996,11 @@ echo "$_detection_features_full"
#
define_in_config_if_yes "$_mt32emu" 'USE_MT32EMU'
+#
+# Check whether Lua support is requested
+#
+define_in_config_if_yes "$_lua" 'USE_LUA'
+
#
# Check whether Nuked OPL emulator support is disabled
#
@@ -7173,6 +7184,10 @@ if test "$_mt32emu" = yes ; then
echo_n ", MT-32 emulator"
fi
+if test "$_lua" = yes ; then
+ echo_n ", Lua"
+fi
+
if test "$_nuked_opl" = yes ; then
echo_n ", Nuked OPL emulator"
fi
Commit: 0207a98c594860120c1c7d8f7959b73182f96d2f
https://github.com/scummvm/scummvm/commit/0207a98c594860120c1c7d8f7959b73182f96d2f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-12-25T00:34:39+01:00
Commit Message:
CONFIGURE: Implemented two passes for engine checking
THe first pass checks if there are features (deps) which are not
used by any enabled engine and schedules them for disabling
Changed paths:
configure
engines.awk
diff --git a/configure b/configure
index 5de9cea6019..9614065589c 100755
--- a/configure
+++ b/configure
@@ -4143,6 +4143,13 @@ esac
append_var MODULES "backends/platform/$_backend"
+#
+# Check if specific components are not used by enabled engines and disable them
+#
+echo "Checking for unused components..."
+awk -f "$_srcdir/engines.awk" -v _pass=pass1 < /dev/null
+echo "...check complete"
+
#
# Check for pkg-config
#
@@ -7387,7 +7394,7 @@ _engines_built_static=""
_engines_built_dynamic=""
_engines_skipped=""
-awk -f "$_srcdir/engines.awk" < /dev/null
+awk -f "$_srcdir/engines.awk" -v _pass=pass2 < /dev/null
echo "Creating config.h"
cat > config.h.new << EOF
diff --git a/engines.awk b/engines.awk
index f9facbd11b0..e255a149a59 100755
--- a/engines.awk
+++ b/engines.awk
@@ -59,6 +59,18 @@ function get_feature_state(feature) {
return "no"
}
+function have_feature(feature) {
+ if (length(ENVIRON["_feature_" feature "_settings"]) == 0)
+ return "no"
+
+ return "yes"
+}
+
+function disable_feature(feature) {
+ ENVIRON["_feature_" feature "_settings"] = "no"
+
+ ENVIRON["_features_disabled"] = ENVIRON["_features_disabled"] feature " "
+}
#
# Engine handling functions
@@ -289,17 +301,29 @@ function print_engines(headline, engines, count) {
BEGIN {
config_mk = "config.mk.engines"
config_h = "config.h.engines"
- # Clear previous contents if any
- printf("") > config_h
- printf("") > config_mk
+
+ if (_pass == "pass1")
+ pass = 1
+ else
+ pass = 2
+
+ if (pass == 2) {
+ # Clear previous contents if any
+ printf("") > config_h
+ printf("") > config_mk
+ }
}
END {
engine_count = get_values("_engines", engines)
for (e = 1; e <= engine_count; e++) {
engine = engines[e]
- check_engine_deps(engine)
+
+ if (pass == 2)
+ check_engine_deps(engine)
+
check_engine_components(engine)
+
if (get_engine_sub(engine) == "no") {
# It's a main engine
if (get_engine_build(engine) == "no") {
@@ -332,14 +356,34 @@ END {
isbuilt = "1"
}
- # Save the settings
- defname = "ENABLE_" toupper(engine)
- if (isbuilt == "no")
- add_line_to_config_mk("# " defname)
- else
- add_line_to_config_mk(defname " = " isbuilt)
+ if (pass == 2) {
+ # Save the settings
+ defname = "ENABLE_" toupper(engine)
+ if (isbuilt == "no")
+ add_line_to_config_mk("# " defname)
+ else
+ add_line_to_config_mk(defname " = " isbuilt)
+ }
}
+ if (pass == 1) {
+ components_count = get_values("_components", components)
+
+ for (c = 1; c <= components_count; c++) {
+ if (get_component_enabled(components[c]) != "yes") {
+ if (have_feature(components[c])) {
+ if (get_feature_state(components[c]) == "yes") {
+ disable_feature(components[c])
+ print(" Feature '" components[c] "' is disabled as unused")
+ }
+ }
+ }
+ }
+
+ exit 0
+ }
+
+
# Sort engines to place our headline engine at start...
# No technical reason, just historical convention
headline_engine = "scumm"
@@ -369,12 +413,6 @@ END {
}
}
- add_to_config_h_if_yes(_tainted_build, "#define TAINTED_BUILD")
- print_engines("Engines (builtin):", _engines_built_static, _static)
- print_engines("Engines (plugins):", _engines_built_dynamic, _dynamic)
- print_engines("Engines Skipped:", _engines_skipped, _skipped)
- print_engines("WARNING: This ScummVM build contains the following UNSTABLE engines:", _engines_built_wip, _wip)
-
#
# Process components
#
@@ -396,6 +434,13 @@ END {
add_line_to_config_h("/* end of components */")
add_line_to_config_mk("# end of components")
+
+ add_to_config_h_if_yes(_tainted_build, "#define TAINTED_BUILD")
+ print_engines("Engines (builtin):", _engines_built_static, _static)
+ print_engines("Engines (plugins):", _engines_built_dynamic, _dynamic)
+ print_engines("Engines Skipped:", _engines_skipped, _skipped)
+ print_engines("WARNING: This ScummVM build contains the following UNSTABLE engines:", _engines_built_wip, _wip)
+
if (comp_enabled == "")
comp_enabled = "<none>"
print("\nComponents Enabled: " comp_enabled)
Commit: 8f0cf59c73ff83c6cce61ce850d1bc98cfe73c5a
https://github.com/scummvm/scummvm/commit/8f0cf59c73ff83c6cce61ce850d1bc98cfe73c5a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-12-25T00:34:39+01:00
Commit Message:
CONFIGURE: Properly pass disabled features from the awk script
Changed paths:
configure
engines.awk
diff --git a/configure b/configure
index 9614065589c..7efba3af23d 100755
--- a/configure
+++ b/configure
@@ -4147,9 +4147,19 @@ append_var MODULES "backends/platform/$_backend"
# Check if specific components are not used by enabled engines and disable them
#
echo "Checking for unused components..."
+rm -f engines.awk.out
awk -f "$_srcdir/engines.awk" -v _pass=pass1 < /dev/null
echo "...check complete"
+eval "`. engines.awk.out`"
+
+for f in $_features_disabled; do
+ echo $f # XXXX
+ set_var $(get_var _feature_${f}_settings) "no"
+done
+
+rm -f engines.awk.out
+
#
# Check for pkg-config
#
diff --git a/engines.awk b/engines.awk
index e255a149a59..2676d08998d 100755
--- a/engines.awk
+++ b/engines.awk
@@ -69,7 +69,7 @@ function have_feature(feature) {
function disable_feature(feature) {
ENVIRON["_feature_" feature "_settings"] = "no"
- ENVIRON["_features_disabled"] = ENVIRON["_features_disabled"] feature " "
+ _features_disabled = _features_disabled feature " "
}
#
@@ -374,12 +374,14 @@ END {
if (have_feature(components[c])) {
if (get_feature_state(components[c]) == "yes") {
disable_feature(components[c])
- print(" Feature '" components[c] "' is disabled as unused")
+ print(" Feature '" components[c] "' is disabled as unused by enabled engines")
}
}
}
}
+ print("#!/bin/sh\necho _features_disabled='" _features_disabled "'") >> "engines.awk.out"
+
exit 0
}
Commit: daa3bd0abfe778bb31027273633634e654a47755
https://github.com/scummvm/scummvm/commit/daa3bd0abfe778bb31027273633634e654a47755
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-12-25T00:34:39+01:00
Commit Message:
CONFIGURE: Fix multiple component disabling. Add vpx component
Changed paths:
configure
engines.awk
diff --git a/configure b/configure
index 7efba3af23d..2915a8ba043 100755
--- a/configure
+++ b/configure
@@ -125,7 +125,7 @@ add_feature() {
# Add a component: id name settings-list
add_component() {
- _components="${_components} ${1}"
+ set_var _components "$(get_var _components) ${1}"
set_var _component_${1}_name "${2}"
set_var _component_${1}_settings "${3}"
@@ -317,6 +317,7 @@ add_feature test_cxx11 "Test C++11" "_test_cxx11"
add_feature imgui "imgui" "_imgui"
add_component lua "lua" "USE_LUA"
+add_component vpx "libvpx" "USE_VPX"
# Directories for installing ScummVM.
# This list is closely based on what GNU autoconf does,
@@ -4154,7 +4155,6 @@ echo "...check complete"
eval "`. engines.awk.out`"
for f in $_features_disabled; do
- echo $f # XXXX
set_var $(get_var _feature_${f}_settings) "no"
done
diff --git a/engines.awk b/engines.awk
index 2676d08998d..e3965300e6d 100755
--- a/engines.awk
+++ b/engines.awk
@@ -53,7 +53,7 @@ function get_feature_name(feature) {
function get_feature_state(feature) {
get_values("_feature_" feature "_settings", settings)
for (i in settings) {
- if (ENVIRON[settings[i]] == "yes")
+ if (ENVIRON[settings[i]] == "yes" || ENVIRON[settings[i]] == "auto")
return "yes"
}
return "no"
@@ -372,7 +372,7 @@ END {
for (c = 1; c <= components_count; c++) {
if (get_component_enabled(components[c]) != "yes") {
if (have_feature(components[c])) {
- if (get_feature_state(components[c]) == "yes") {
+ if (get_feature_state(components[c]) == "yes" || get_feature_state(components[c]) == "auto") {
disable_feature(components[c])
print(" Feature '" components[c] "' is disabled as unused by enabled engines")
}
@@ -380,7 +380,7 @@ END {
}
}
- print("#!/bin/sh\necho _features_disabled='" _features_disabled "'") >> "engines.awk.out"
+ print("#!/bin/sh\necho '_features_disabled=\"" _features_disabled "\"'") >> "engines.awk.out"
exit 0
}
Commit: fac386e025d12886b2fc67798e306793c43eca72
https://github.com/scummvm/scummvm/commit/fac386e025d12886b2fc67798e306793c43eca72
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-12-25T00:34:39+01:00
Commit Message:
SLUDGE: Mark engine as using vpx component
Changed paths:
engines/sludge/configure.engine
diff --git a/engines/sludge/configure.engine b/engines/sludge/configure.engine
index ebfaa0d75e0..5308e132735 100644
--- a/engines/sludge/configure.engine
+++ b/engines/sludge/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine sludge "Sludge" no "" "" "16bit png"
+add_engine sludge "Sludge" no "" "" "16bit png" "vpx"
Commit: aa43f4f5e7470f2a5366ef1e68cd8a6071ea1035
https://github.com/scummvm/scummvm/commit/aa43f4f5e7470f2a5366ef1e68cd8a6071ea1035
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-12-25T00:34:39+01:00
Commit Message:
CONFIGRE: Added theoradec component and marked all the relevant engines
Changed paths:
configure
engines/ags/configure.engine
engines/asylum/configure.engine
engines/grim/configure.engine
engines/pegasus/configure.engine
engines/sword25/configure.engine
engines/tetraedge/configure.engine
engines/wintermute/configure.engine
diff --git a/configure b/configure
index 2915a8ba043..7429da72207 100755
--- a/configure
+++ b/configure
@@ -318,6 +318,7 @@ add_feature imgui "imgui" "_imgui"
add_component lua "lua" "USE_LUA"
add_component vpx "libvpx" "USE_VPX"
+add_component theoradec "libtheoradec" "USE_THEORADEC"
# Directories for installing ScummVM.
# This list is closely based on what GNU autoconf does,
diff --git a/engines/ags/configure.engine b/engines/ags/configure.engine
index 8ad0af74249..f1b97dfb783 100644
--- a/engines/ags/configure.engine
+++ b/engines/ags/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine ags "Adventure Game Studio" yes "" "" "16bit mad"
+add_engine ags "Adventure Game Studio" yes "" "" "16bit mad" "theoradec"
diff --git a/engines/asylum/configure.engine b/engines/asylum/configure.engine
index b0c3f5768e3..6185cae3625 100644
--- a/engines/asylum/configure.engine
+++ b/engines/asylum/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine asylum "Sanitarium" yes "" "" "highres"
+add_engine asylum "Sanitarium" yes "" "" "highres" "theoradec"
diff --git a/engines/grim/configure.engine b/engines/grim/configure.engine
index 9a8c00991ca..dc1d14880a5 100644
--- a/engines/grim/configure.engine
+++ b/engines/grim/configure.engine
@@ -1,4 +1,4 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine grim "Grim" yes "monkey4" "Grim Fandango" "16bit 3d highres"
+add_engine grim "Grim" yes "monkey4" "Grim Fandango" "16bit 3d highres" "theoradec"
add_engine monkey4 "Escape from Monkey Island" no "" "" "bink"
diff --git a/engines/pegasus/configure.engine b/engines/pegasus/configure.engine
index a14415b988d..059d9f5aaf7 100644
--- a/engines/pegasus/configure.engine
+++ b/engines/pegasus/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine pegasus "The Journeyman Project: Pegasus Prime" yes "" "" "16bit highres"
+add_engine pegasus "The Journeyman Project: Pegasus Prime" yes "" "" "16bit highres" "theoradec"
diff --git a/engines/sword25/configure.engine b/engines/sword25/configure.engine
index 584ab41f935..e632b9e309d 100644
--- a/engines/sword25/configure.engine
+++ b/engines/sword25/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine sword25 "Broken Sword 2.5" yes "" "" "png 16bit highres theoradec" "lua"
+add_engine sword25 "Broken Sword 2.5" yes "" "" "png 16bit highres theoradec" "lua theoradec"
diff --git a/engines/tetraedge/configure.engine b/engines/tetraedge/configure.engine
index 31c8b38bb5c..fa481241396 100644
--- a/engines/tetraedge/configure.engine
+++ b/engines/tetraedge/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine tetraedge "Tetraedge" yes "" "" "highres 3d freetype2 vorbis png jpeg theoradec" "lua"
+add_engine tetraedge "Tetraedge" yes "" "" "highres 3d freetype2 vorbis png jpeg theoradec" "lua theoradec"
diff --git a/engines/wintermute/configure.engine b/engines/wintermute/configure.engine
index 1e7d00c751f..d9ce2efc704 100644
--- a/engines/wintermute/configure.engine
+++ b/engines/wintermute/configure.engine
@@ -1,6 +1,6 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine wintermute "Wintermute" yes "foxtail herocraft wme3d" "" "16bit highres jpeg png"
+add_engine wintermute "Wintermute" yes "foxtail herocraft wme3d" "" "16bit highres jpeg png" "theoradec"
add_engine wme3d "Wintermute3D" no "" "" "3d"
add_engine foxtail "FoxTail" yes
add_engine herocraft "HeroCraft" yes
Commit: 4079c8a85ac98f6461854e852da3f2f7e1762c21
https://github.com/scummvm/scummvm/commit/4079c8a85ac98f6461854e852da3f2f7e1762c21
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2024-12-25T00:34:39+01:00
Commit Message:
CONFIGURE: Slightly simplify the engines.awk.out generation
There is no need of the she-bang on sourced scripts and eval should be
avoided.
Using a single > allows to not remove the file before writing to it.
Changed paths:
configure
engines.awk
diff --git a/configure b/configure
index 7429da72207..5d839f9fe7c 100755
--- a/configure
+++ b/configure
@@ -4149,11 +4149,10 @@ append_var MODULES "backends/platform/$_backend"
# Check if specific components are not used by enabled engines and disable them
#
echo "Checking for unused components..."
-rm -f engines.awk.out
awk -f "$_srcdir/engines.awk" -v _pass=pass1 < /dev/null
echo "...check complete"
-eval "`. engines.awk.out`"
+. ./engines.awk.out
for f in $_features_disabled; do
set_var $(get_var _feature_${f}_settings) "no"
diff --git a/engines.awk b/engines.awk
index e3965300e6d..4cd1eaf4ad4 100755
--- a/engines.awk
+++ b/engines.awk
@@ -380,7 +380,7 @@ END {
}
}
- print("#!/bin/sh\necho '_features_disabled=\"" _features_disabled "\"'") >> "engines.awk.out"
+ print("_features_disabled=\"" _features_disabled "\"") > "engines.awk.out"
exit 0
}
Commit: d96d8bd3a54d558e907d0430591e4ae1def27e74
https://github.com/scummvm/scummvm/commit/d96d8bd3a54d558e907d0430591e4ae1def27e74
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-12-25T00:34:39+01:00
Commit Message:
CONFIGURE: Autoenable components for engine features with matching names
This makes the lists of hard/soft dependencies fully interchangeable
Changed paths:
engines.awk
diff --git a/engines.awk b/engines.awk
index 4cd1eaf4ad4..1528d2626cd 100755
--- a/engines.awk
+++ b/engines.awk
@@ -140,6 +140,13 @@ function get_component_settings(comp) {
return ENVIRON["_component_" comp "_settings"]
}
+function have_component(comp) {
+ if (length(ENVIRON["_component_" comp "_settings"]) == 0)
+ return "no"
+
+ return "yes"
+}
+
function check_engine_deps(engine) {
unmet_deps = ""
@@ -168,6 +175,13 @@ function check_engine_components(engine) {
for (c = 1; c <= compcount; c++) {
enable_component(components[c])
}
+
+ # And collect those features that also declared as components
+ depcount = get_engine_dependencies(engine, deps)
+ for (d = 1; d <= depcount; d++) {
+ if (have_component(deps[d]) == "yes")
+ enable_component(deps[d])
+ }
}
}
Commit: ebd5333634fff346ec4367aa3fb898a339f5d0e4
https://github.com/scummvm/scummvm/commit/ebd5333634fff346ec4367aa3fb898a339f5d0e4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-12-25T00:34:39+01:00
Commit Message:
SWORD25: Mark lua as hard dependency and theoradec as a soft one
Changed paths:
engines/sword25/configure.engine
diff --git a/engines/sword25/configure.engine b/engines/sword25/configure.engine
index e632b9e309d..758a91bcc65 100644
--- a/engines/sword25/configure.engine
+++ b/engines/sword25/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine sword25 "Broken Sword 2.5" yes "" "" "png 16bit highres theoradec" "lua theoradec"
+add_engine sword25 "Broken Sword 2.5" yes "" "" "png 16bit highres theoradec lua" ""
Commit: 9c9f30386293829a7928326a4880a7261cd474f3
https://github.com/scummvm/scummvm/commit/9c9f30386293829a7928326a4880a7261cd474f3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-12-25T00:34:39+01:00
Commit Message:
TETRAEDGE: Mark lua as a hard dependency
Changed paths:
engines/tetraedge/configure.engine
diff --git a/engines/tetraedge/configure.engine b/engines/tetraedge/configure.engine
index fa481241396..41940dfa86a 100644
--- a/engines/tetraedge/configure.engine
+++ b/engines/tetraedge/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine tetraedge "Tetraedge" yes "" "" "highres 3d freetype2 vorbis png jpeg theoradec" "lua theoradec"
+add_engine tetraedge "Tetraedge" yes "" "" "highres 3d freetype2 vorbis png jpeg lua theoradec" ""
Commit: 63f60562d0776b6945117ec4f32cd5fc00ff3af7
https://github.com/scummvm/scummvm/commit/63f60562d0776b6945117ec4f32cd5fc00ff3af7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-12-25T00:34:39+01:00
Commit Message:
CONFIGURE: Eliminate duplicate defines for features/components
Now the matching features are enabled via components
Changed paths:
configure
diff --git a/configure b/configure
index 5d839f9fe7c..c2f16944089 100755
--- a/configure
+++ b/configure
@@ -5013,11 +5013,6 @@ echo "$_detection_features_full"
#
define_in_config_if_yes "$_mt32emu" 'USE_MT32EMU'
-#
-# Check whether Lua support is requested
-#
-define_in_config_if_yes "$_lua" 'USE_LUA'
-
#
# Check whether Nuked OPL emulator support is disabled
#
@@ -5417,7 +5412,7 @@ if test "$_theoradec" = yes ; then
append_var LIBS "$THEORADEC_LIBS"
append_var INCLUDES "$THEORADEC_CFLAGS"
fi
-define_in_config_if_yes "$_theoradec" 'USE_THEORADEC'
+
if test ! "$_theoradec" = notsupported ; then
echo "$_theoradec"
fi
@@ -5467,7 +5462,7 @@ if test "$_vpx" = yes ; then
append_var LIBS "$VPX_LIBS -lvpx"
append_var INCLUDES "$VPX_CFLAGS"
fi
-define_in_config_if_yes "$_vpx" 'USE_VPX'
+
if test ! "$_vpx" = notsupported ; then
echo "$_vpx"
fi
Commit: 15d894ab9550243a55ef9c49454743c62f18435e
https://github.com/scummvm/scummvm/commit/15d894ab9550243a55ef9c49454743c62f18435e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-12-25T00:34:39+01:00
Commit Message:
CONFIGURE: Print list of disabled components as well
Changed paths:
engines.awk
diff --git a/engines.awk b/engines.awk
index 1528d2626cd..b283e972a64 100755
--- a/engines.awk
+++ b/engines.awk
@@ -436,6 +436,7 @@ END {
add_line_to_config_mk("\n# components")
components_count = get_values("_components", components)
comp_enabled = ""
+ comp_disabled = ""
for (c = 1; c <= components_count; c++) {
setting = get_component_settings(components[c])
add_to_config_h_if_yes(get_component_enabled(components[c]), "#define " setting)
@@ -445,6 +446,7 @@ END {
comp_enabled = comp_enabled components[c] " "
} else {
add_line_to_config_mk("# " setting)
+ comp_disabled = comp_disabled components[c] " "
}
}
add_line_to_config_h("/* end of components */")
@@ -460,6 +462,7 @@ END {
if (comp_enabled == "")
comp_enabled = "<none>"
print("\nComponents Enabled: " comp_enabled)
+ print("Components Disabled: " comp_disabled)
# Ensure engines folder exists prior to trying to generate
# files into it (used for out-of-tree-builds)
Commit: d780708c96eb011b3d7c1da2e7fcee158ffb5aee
https://github.com/scummvm/scummvm/commit/d780708c96eb011b3d7c1da2e7fcee158ffb5aee
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-12-25T00:34:39+01:00
Commit Message:
ENGINES: Add mt32emu as a feature and component
Add it to engines that have MIDI playback.
This essentially compiles the emulator only when an engine that
can potentially use it (e.g. MIDI) is enabled
Changed paths:
configure
engines/access/configure.engine
engines/agi/configure.engine
engines/agos/configure.engine
engines/ags/configure.engine
engines/bagel/configure.engine
engines/bladerunner/configure.engine
engines/cge/configure.engine
engines/cge2/configure.engine
engines/cine/configure.engine
engines/darkseed/configure.engine
engines/dgds/configure.engine
engines/draci/configure.engine
engines/dragons/configure.engine
engines/gnap/configure.engine
engines/gob/configure.engine
engines/groovie/configure.engine
engines/hugo/configure.engine
engines/illusions/configure.engine
engines/kyra/configure.engine
engines/lilliput/configure.engine
engines/lure/configure.engine
engines/m4/configure.engine
engines/made/configure.engine
engines/mm/configure.engine
engines/mohawk/configure.engine
engines/mtropolis/configure.engine
engines/parallaction/configure.engine
engines/prince/configure.engine
engines/queen/configure.engine
engines/saga/configure.engine
engines/saga2/configure.engine
engines/sci/configure.engine
engines/scumm/configure.engine
engines/sherlock/configure.engine
engines/sky/configure.engine
engines/startrek/configure.engine
engines/testbed/configure.engine
engines/tinsel/configure.engine
engines/toltecs/configure.engine
engines/touche/configure.engine
engines/twine/configure.engine
engines/ultima/configure.engine
engines/vcruise/configure.engine
engines/zvision/configure.engine
diff --git a/configure b/configure
index c2f16944089..47bc8d11d58 100755
--- a/configure
+++ b/configure
@@ -302,6 +302,7 @@ add_feature highres "high resolution" "_highres"
add_feature mad "MAD" "_mad"
add_feature jpeg "JPEG" "_jpeg"
add_feature mpeg2 "mpeg2" "_mpeg2"
+add_feature mt32emu "mt32emu" "_mt32emu"
add_feature opengl_game_classic "OpenGL (classic)" "_opengl_game_classic"
add_feature opengl_game_shaders "OpenGL with shaders" "_opengl_game_shaders"
add_feature png "PNG" "_png"
@@ -319,6 +320,7 @@ add_feature imgui "imgui" "_imgui"
add_component lua "lua" "USE_LUA"
add_component vpx "libvpx" "USE_VPX"
add_component theoradec "libtheoradec" "USE_THEORADEC"
+add_component mt32emu "mt32emu" "USE_MT32EMU"
# Directories for installing ScummVM.
# This list is closely based on what GNU autoconf does,
@@ -5008,11 +5010,6 @@ define_in_config_if_yes "$_detection_features_full" "DETECTION_FULL"
echo_n "Checking if building detection features for all engines... "
echo "$_detection_features_full"
-#
-# Check whether integrated MT-32 emulator support is requested
-#
-define_in_config_if_yes "$_mt32emu" 'USE_MT32EMU'
-
#
# Check whether Nuked OPL emulator support is disabled
#
diff --git a/engines/access/configure.engine b/engines/access/configure.engine
index 609ff94e287..8599134182c 100644
--- a/engines/access/configure.engine
+++ b/engines/access/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine access "Access" yes
+add_engine access "Access" yes "" "" "" "mt32emu"
diff --git a/engines/agi/configure.engine b/engines/agi/configure.engine
index c2e6e14aab7..8aa0d6ce786 100644
--- a/engines/agi/configure.engine
+++ b/engines/agi/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine agi "AGI" yes
+add_engine agi "AGI" yes "" "" "" "mt32emu"
diff --git a/engines/agos/configure.engine b/engines/agos/configure.engine
index 81ab8bd1c20..08724771b81 100644
--- a/engines/agos/configure.engine
+++ b/engines/agos/configure.engine
@@ -1,4 +1,4 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine agos "AGOS" yes "agos2" "AGOS 1 games"
+add_engine agos "AGOS" yes "agos2" "AGOS 1 games" "" "mt32emu"
add_engine agos2 "AGOS 2 games" yes "" "" "highres"
diff --git a/engines/ags/configure.engine b/engines/ags/configure.engine
index f1b97dfb783..c46627d4d35 100644
--- a/engines/ags/configure.engine
+++ b/engines/ags/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine ags "Adventure Game Studio" yes "" "" "16bit mad" "theoradec"
+add_engine ags "Adventure Game Studio" yes "" "" "16bit mad" "theoradec mt32emu"
diff --git a/engines/bagel/configure.engine b/engines/bagel/configure.engine
index 6ba1f726470..406f144b518 100644
--- a/engines/bagel/configure.engine
+++ b/engines/bagel/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine bagel "BAGEL" yes "" "" "16bit highres freetype2"
+add_engine bagel "BAGEL" yes "" "" "16bit highres freetype2" "mt32emu"
diff --git a/engines/bladerunner/configure.engine b/engines/bladerunner/configure.engine
index a4a6150a872..e53671ecde4 100644
--- a/engines/bladerunner/configure.engine
+++ b/engines/bladerunner/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine bladerunner "Blade Runner" yes "" "" "16bit highres"
+add_engine bladerunner "Blade Runner" yes "" "" "16bit highres mt32emu"
diff --git a/engines/cge/configure.engine b/engines/cge/configure.engine
index 719a74c9fc5..b302ad3fef4 100644
--- a/engines/cge/configure.engine
+++ b/engines/cge/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine cge "CGE" yes
+add_engine cge "CGE" yes "" "" "" "mt32emu"
diff --git a/engines/cge2/configure.engine b/engines/cge2/configure.engine
index b310c326bf7..616191d8300 100644
--- a/engines/cge2/configure.engine
+++ b/engines/cge2/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine cge2 "CGE2" yes
+add_engine cge2 "CGE2" yes "" "" "" "mt32emu"
diff --git a/engines/cine/configure.engine b/engines/cine/configure.engine
index 626fae3c45d..07b184c842f 100644
--- a/engines/cine/configure.engine
+++ b/engines/cine/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine cine "Cinematique evo 1" yes
+add_engine cine "Cinematique evo 1" yes "" "" "" "mt32emu"
diff --git a/engines/darkseed/configure.engine b/engines/darkseed/configure.engine
index 511d9722922..6e3a068adad 100644
--- a/engines/darkseed/configure.engine
+++ b/engines/darkseed/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine darkseed "Darkseed" yes "" "" "highres"
+add_engine darkseed "Darkseed" yes "" "" "highres" "mt32emu"
diff --git a/engines/dgds/configure.engine b/engines/dgds/configure.engine
index 1c7a5c8f44e..9e44608115c 100644
--- a/engines/dgds/configure.engine
+++ b/engines/dgds/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine dgds "Dynamix Game Development System" yes
+add_engine dgds "Dynamix Game Development System" yes "" "" "" "mt32emu"
diff --git a/engines/draci/configure.engine b/engines/draci/configure.engine
index cf104a46b3d..3769c7ce3a3 100644
--- a/engines/draci/configure.engine
+++ b/engines/draci/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine draci "Dragon History" yes
+add_engine draci "Dragon History" yes "" "" "" "mt32emu"
diff --git a/engines/dragons/configure.engine b/engines/dragons/configure.engine
index 9b482672a1a..ca347929adf 100644
--- a/engines/dragons/configure.engine
+++ b/engines/dragons/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine dragons "Blazing Dragons" yes "" "" "16bit"
+add_engine dragons "Blazing Dragons" yes "" "" "16bit" "mt32emu"
diff --git a/engines/gnap/configure.engine b/engines/gnap/configure.engine
index fb615f66815..77a294470b1 100644
--- a/engines/gnap/configure.engine
+++ b/engines/gnap/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine gnap "UFOs" yes "" "" "highres 16bit"
+add_engine gnap "UFOs" yes "" "" "highres 16bit" "mt32emu"
diff --git a/engines/gob/configure.engine b/engines/gob/configure.engine
index a12324c06cb..9532cf76640 100644
--- a/engines/gob/configure.engine
+++ b/engines/gob/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine gob "Gobli*ns" yes
+add_engine gob "Gobli*ns" yes "" "" "" "mt32emu"
diff --git a/engines/groovie/configure.engine b/engines/groovie/configure.engine
index 0cbf2501f49..210b63d2cb3 100644
--- a/engines/groovie/configure.engine
+++ b/engines/groovie/configure.engine
@@ -1,4 +1,4 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine groovie "Groovie" yes "groovie2" "7th Guest" "highres"
-add_engine groovie2 "Groovie 2 games" yes "" "" "jpeg 16bit"
+add_engine groovie2 "Groovie 2 games" yes "" "" "jpeg 16bit" "mt32emu"
diff --git a/engines/hugo/configure.engine b/engines/hugo/configure.engine
index 8eb3611f9f0..a55d8694824 100644
--- a/engines/hugo/configure.engine
+++ b/engines/hugo/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine hugo "Hugo Trilogy" yes
+add_engine hugo "Hugo Trilogy" yes "" "" "" "mt32emu"
diff --git a/engines/illusions/configure.engine b/engines/illusions/configure.engine
index f3e14a1345e..db2f57ec0ac 100644
--- a/engines/illusions/configure.engine
+++ b/engines/illusions/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine illusions "Illusions Engine" yes
+add_engine illusions "Illusions Engine" yes "" "" "" "mt32emu"
diff --git a/engines/kyra/configure.engine b/engines/kyra/configure.engine
index 6f49d3140d7..b1926148851 100644
--- a/engines/kyra/configure.engine
+++ b/engines/kyra/configure.engine
@@ -1,5 +1,5 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine kyra "Kyra" yes "lol eob" "Legend of Kyrandia 1-3"
+add_engine kyra "Kyra" yes "lol eob" "Legend of Kyrandia 1-3" "" "mt32emu"
add_engine lol "Lands of Lore" yes
add_engine eob "Eye of the Beholder" yes
diff --git a/engines/lilliput/configure.engine b/engines/lilliput/configure.engine
index 2c82685cfdd..c8bb24d190d 100644
--- a/engines/lilliput/configure.engine
+++ b/engines/lilliput/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine lilliput "Lilliput" no
+add_engine lilliput "Lilliput" no "" "" "" "mt32emu"
diff --git a/engines/lure/configure.engine b/engines/lure/configure.engine
index f198ab0085c..f3891a8fdb7 100644
--- a/engines/lure/configure.engine
+++ b/engines/lure/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine lure "Lure of the Temptress" yes
+add_engine lure "Lure of the Temptress" yes "" "" "" "mt32emu"
diff --git a/engines/m4/configure.engine b/engines/m4/configure.engine
index 67964f2d5d4..04eb539cad2 100644
--- a/engines/m4/configure.engine
+++ b/engines/m4/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine m4 "M4" yes "" "" "highres"
+add_engine m4 "M4" yes "" "" "highres" "mt32emu"
diff --git a/engines/made/configure.engine b/engines/made/configure.engine
index 53784d903a5..721c7d40a05 100644
--- a/engines/made/configure.engine
+++ b/engines/made/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine made "MADE" yes
+add_engine made "MADE" yes "" "" "" "mt32emu"
diff --git a/engines/mm/configure.engine b/engines/mm/configure.engine
index 5231ea9db1e..227726dd211 100644
--- a/engines/mm/configure.engine
+++ b/engines/mm/configure.engine
@@ -1,5 +1,5 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine mm "Might and Magic" yes "mm1 xeen"
+add_engine mm "Might and Magic" yes "mm1 xeen" "" "mt32emu"
add_engine mm1 "Might and Magic 1" yes
add_engine xeen "Might and Magic Xeen" yes
diff --git a/engines/mohawk/configure.engine b/engines/mohawk/configure.engine
index 9ab05d507bb..778b2b2538c 100644
--- a/engines/mohawk/configure.engine
+++ b/engines/mohawk/configure.engine
@@ -1,6 +1,6 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine mohawk "Mohawk" yes "cstime myst mystme riven" "Living Books" "highres"
+add_engine mohawk "Mohawk" yes "cstime myst mystme riven" "Living Books" "highres" "mt32emu"
add_engine cstime "Where in Time is Carmen Sandiego?" no
add_engine riven "Riven: The Sequel to Myst" yes "" "" "16bit"
add_engine myst "Myst" yes
diff --git a/engines/mtropolis/configure.engine b/engines/mtropolis/configure.engine
index 67b83dbec9c..282ec1d9230 100644
--- a/engines/mtropolis/configure.engine
+++ b/engines/mtropolis/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine mtropolis "mTropolis" yes "" "" "16bit highres"
+add_engine mtropolis "mTropolis" yes "" "" "16bit highres" "mt32emu"
diff --git a/engines/parallaction/configure.engine b/engines/parallaction/configure.engine
index 0a9a08d26e6..d5f83f1140d 100644
--- a/engines/parallaction/configure.engine
+++ b/engines/parallaction/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine parallaction "Parallaction" yes
+add_engine parallaction "Parallaction" yes "" "" "" "mt32emu"
diff --git a/engines/prince/configure.engine b/engines/prince/configure.engine
index 90378def816..85734d0ee8f 100644
--- a/engines/prince/configure.engine
+++ b/engines/prince/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine prince "The Prince and The Coward" yes "" "" "highres"
+add_engine prince "The Prince and The Coward" yes "" "" "highres" "mt32emu"
diff --git a/engines/queen/configure.engine b/engines/queen/configure.engine
index 2416dc8ca9f..f9a4e7edede 100644
--- a/engines/queen/configure.engine
+++ b/engines/queen/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine queen "Flight of the Amazon Queen" yes
+add_engine queen "Flight of the Amazon Queen" yes "" "" "" "mt32emu"
diff --git a/engines/saga/configure.engine b/engines/saga/configure.engine
index c9815f17291..06f10dcfa1a 100644
--- a/engines/saga/configure.engine
+++ b/engines/saga/configure.engine
@@ -1,4 +1,4 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine saga "SAGA" yes "ihnm" "ITE"
+add_engine saga "SAGA" yes "ihnm" "ITE" "" "mt32emu"
add_engine ihnm "IHNM" yes "" "" "highres"
diff --git a/engines/saga2/configure.engine b/engines/saga2/configure.engine
index e302bed8098..a90cde0f736 100644
--- a/engines/saga2/configure.engine
+++ b/engines/saga2/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine saga2 "SAGA2" yes "" "" "highres"
+add_engine saga2 "SAGA2" yes "" "" "highres" "mt32emu"
diff --git a/engines/sci/configure.engine b/engines/sci/configure.engine
index ef80ce1fa7c..64a106c17d0 100644
--- a/engines/sci/configure.engine
+++ b/engines/sci/configure.engine
@@ -1,4 +1,4 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine sci "SCI" yes "sci32" "SCI 0-1.1 games"
+add_engine sci "SCI" yes "sci32" "SCI 0-1.1 games" "" "mt32emu"
add_engine sci32 "SCI32 games" yes "" "" "highres"
diff --git a/engines/scumm/configure.engine b/engines/scumm/configure.engine
index ce6bbcbeb2b..cf60bf2b12a 100644
--- a/engines/scumm/configure.engine
+++ b/engines/scumm/configure.engine
@@ -1,5 +1,5 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine scumm "SCUMM" yes "scumm_7_8 he" "v0-v6 games"
+add_engine scumm "SCUMM" yes "scumm_7_8 he" "v0-v6 games" "" "mt32emu"
add_engine scumm_7_8 "v7 & v8 games" yes
add_engine he "HE71+ games" yes "" "" "highres bink"
diff --git a/engines/sherlock/configure.engine b/engines/sherlock/configure.engine
index 756ec27ecb2..c08e4aec79c 100644
--- a/engines/sherlock/configure.engine
+++ b/engines/sherlock/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine sherlock "The Lost Files of Sherlock Holmes" yes
+add_engine sherlock "The Lost Files of Sherlock Holmes" yes "" "" "" "mt32emu"
diff --git a/engines/sky/configure.engine b/engines/sky/configure.engine
index 99b39cae71c..a48f2fd540d 100644
--- a/engines/sky/configure.engine
+++ b/engines/sky/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine sky "Beneath a Steel Sky" yes
+add_engine sky "Beneath a Steel Sky" yes "" "" "" "mt32emu"
diff --git a/engines/startrek/configure.engine b/engines/startrek/configure.engine
index f7311d4d5fa..474ce69aeaa 100644
--- a/engines/startrek/configure.engine
+++ b/engines/startrek/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine startrek "Star Trek 25th Anniversary/Judgment Rites" no
+add_engine startrek "Star Trek 25th Anniversary/Judgment Rites" no "" "" "" "mt32emu"
diff --git a/engines/testbed/configure.engine b/engines/testbed/configure.engine
index 6eb5a3f26f0..b90c650dd9c 100644
--- a/engines/testbed/configure.engine
+++ b/engines/testbed/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine testbed "TestBed: the Testing framework" no
+add_engine testbed "TestBed: the Testing framework" no "" "" "" "mt32emu"
diff --git a/engines/tinsel/configure.engine b/engines/tinsel/configure.engine
index 0aacc91936f..4be8f25ab8f 100644
--- a/engines/tinsel/configure.engine
+++ b/engines/tinsel/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine tinsel "Tinsel" yes
+add_engine tinsel "Tinsel" yes "" "" "" "mt32emu"
diff --git a/engines/toltecs/configure.engine b/engines/toltecs/configure.engine
index 761410c55fa..56b7e019469 100644
--- a/engines/toltecs/configure.engine
+++ b/engines/toltecs/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine toltecs "3 Skulls of the Toltecs" yes "" "" "highres"
+add_engine toltecs "3 Skulls of the Toltecs" yes "" "" "highres" "mt32emu"
diff --git a/engines/touche/configure.engine b/engines/touche/configure.engine
index 857ddca1280..1a46ecc30e6 100644
--- a/engines/touche/configure.engine
+++ b/engines/touche/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine touche "Touche: The Adventures of the Fifth Musketeer" yes "" "" "highres"
+add_engine touche "Touche: The Adventures of the Fifth Musketeer" yes "" "" "highres" "mt32emu"
diff --git a/engines/twine/configure.engine b/engines/twine/configure.engine
index afe9bfaa64c..e1fd3dc3512 100644
--- a/engines/twine/configure.engine
+++ b/engines/twine/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine twine "Little Big Adventure" yes "" "" "highres"
+add_engine twine "Little Big Adventure" yes "" "" "highres" "mt32emu"
diff --git a/engines/ultima/configure.engine b/engines/ultima/configure.engine
index 883ca017306..3994170b2bb 100644
--- a/engines/ultima/configure.engine
+++ b/engines/ultima/configure.engine
@@ -1,6 +1,6 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine ultima "Ultima" yes "ultima1 ultima4 ultima6 ultima8"
+add_engine ultima "Ultima" yes "ultima1 ultima4 ultima6 ultima8" "" "mt32emu"
add_engine ultima1 "Ultima I - The First Age of Darkness" no "" "" ""
add_engine ultima4 "Ultima IV - Quest of the Avatar" yes "" "" "16bit"
add_engine ultima6 "Ultima VI = The False Prophet" yes "" "" "highres 16bit" "lua"
diff --git a/engines/vcruise/configure.engine b/engines/vcruise/configure.engine
index 7d1775d9918..f834aad6718 100644
--- a/engines/vcruise/configure.engine
+++ b/engines/vcruise/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine vcruise "V-Cruise" yes "" "" "16bit highres"
+add_engine vcruise "V-Cruise" yes "" "" "16bit highres" "mt32emu"
diff --git a/engines/zvision/configure.engine b/engines/zvision/configure.engine
index 44df4f6df83..50a6ab503b8 100644
--- a/engines/zvision/configure.engine
+++ b/engines/zvision/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine zvision "Z-Vision" yes "" "" "freetype2 16bit highres"
+add_engine zvision "Z-Vision" yes "" "" "freetype2 16bit highres" "mt32emu"
Commit: 2b41c7807d8659873f5264cdce00a08633e9661a
https://github.com/scummvm/scummvm/commit/2b41c7807d8659873f5264cdce00a08633e9661a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-12-25T00:34:39+01:00
Commit Message:
CONFIGURE: Added tinygl as a component
Changed paths:
configure
engines/freescape/configure.engine
engines/grim/configure.engine
engines/hpl1/configure.engine
engines/myst3/configure.engine
engines/playground3d/configure.engine
engines/stark/configure.engine
engines/tetraedge/configure.engine
engines/tinsel/configure.engine
diff --git a/configure b/configure
index 47bc8d11d58..3544d8dd708 100755
--- a/configure
+++ b/configure
@@ -321,6 +321,7 @@ add_component lua "lua" "USE_LUA"
add_component vpx "libvpx" "USE_VPX"
add_component theoradec "libtheoradec" "USE_THEORADEC"
add_component mt32emu "mt32emu" "USE_MT32EMU"
+add_component tinygl "TinyGL" "USE_TINYGL"
# Directories for installing ScummVM.
# This list is closely based on what GNU autoconf does,
@@ -6942,7 +6943,6 @@ echo_n "Building TinyGL support... "
if test "$_16bit" = "no"; then
_tinygl=no
fi
-define_in_config_if_yes $_tinygl 'USE_TINYGL'
echo "$_tinygl"
echo_n "Building any 3D game... "
diff --git a/engines/freescape/configure.engine b/engines/freescape/configure.engine
index d1988a77154..9398819cbcf 100644
--- a/engines/freescape/configure.engine
+++ b/engines/freescape/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine freescape "Freescape" yes "" "" "highres 16bit 3d"
+add_engine freescape "Freescape" yes "" "" "highres 16bit 3d" "tinygl"
diff --git a/engines/grim/configure.engine b/engines/grim/configure.engine
index dc1d14880a5..c63eb913e0e 100644
--- a/engines/grim/configure.engine
+++ b/engines/grim/configure.engine
@@ -1,4 +1,4 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine grim "Grim" yes "monkey4" "Grim Fandango" "16bit 3d highres" "theoradec"
+add_engine grim "Grim" yes "monkey4" "Grim Fandango" "16bit 3d highres" "theoradec tinygl"
add_engine monkey4 "Escape from Monkey Island" no "" "" "bink"
diff --git a/engines/hpl1/configure.engine b/engines/hpl1/configure.engine
index 62451ac44eb..1c5a773384e 100644
--- a/engines/hpl1/configure.engine
+++ b/engines/hpl1/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine hpl1 "Hpl1" no "" "" "16bit 3d highres jpeg gif png opengl_game_shaders"
+add_engine hpl1 "Hpl1" no "" "" "16bit 3d highres jpeg gif png opengl_game_shaders" "tinygl"
diff --git a/engines/myst3/configure.engine b/engines/myst3/configure.engine
index 5a6f8f212e1..54bdf9a56b8 100644
--- a/engines/myst3/configure.engine
+++ b/engines/myst3/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine myst3 "Myst 3" yes "" "" "16bit 3d highres jpeg bink"
+add_engine myst3 "Myst 3" yes "" "" "16bit 3d highres jpeg bink" "tinygl"
diff --git a/engines/playground3d/configure.engine b/engines/playground3d/configure.engine
index 8cd9ec8c952..1124cb7b9a2 100644
--- a/engines/playground3d/configure.engine
+++ b/engines/playground3d/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine playground3d "Playground 3d: the testing and playground environment for 3d renderers" no "" "" "16bit 3d highres"
+add_engine playground3d "Playground 3D: the testing and playground environment for 3d renderers" no "" "" "16bit 3d highres" "tinygl"
diff --git a/engines/stark/configure.engine b/engines/stark/configure.engine
index d77a1f5bbd0..c766be26e39 100644
--- a/engines/stark/configure.engine
+++ b/engines/stark/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine stark "The Longest Journey" yes "" "" "16bit 3d highres freetype2 vorbis bink"
+add_engine stark "The Longest Journey" yes "" "" "16bit 3d highres freetype2 vorbis bink" "tinygl"
diff --git a/engines/tetraedge/configure.engine b/engines/tetraedge/configure.engine
index 41940dfa86a..4e432386d9a 100644
--- a/engines/tetraedge/configure.engine
+++ b/engines/tetraedge/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine tetraedge "Tetraedge" yes "" "" "highres 3d freetype2 vorbis png jpeg lua theoradec" ""
+add_engine tetraedge "Tetraedge" yes "" "" "highres 3d freetype2 vorbis png jpeg lua theoradec" "tinygl"
diff --git a/engines/tinsel/configure.engine b/engines/tinsel/configure.engine
index 4be8f25ab8f..3424a3dc025 100644
--- a/engines/tinsel/configure.engine
+++ b/engines/tinsel/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine tinsel "Tinsel" yes "" "" "" "mt32emu"
+add_engine tinsel "Tinsel" yes "" "" "" "mt32emu tinygl"
Commit: eb60f2a16ac292a6976986fde75eedd9a9c08876
https://github.com/scummvm/scummvm/commit/eb60f2a16ac292a6976986fde75eedd9a9c08876
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-12-25T00:34:39+01:00
Commit Message:
ULTIMA: Lua is a hard dependency for ultima6
Changed paths:
engines/ultima/configure.engine
diff --git a/engines/ultima/configure.engine b/engines/ultima/configure.engine
index 3994170b2bb..1b4564b406a 100644
--- a/engines/ultima/configure.engine
+++ b/engines/ultima/configure.engine
@@ -3,5 +3,5 @@
add_engine ultima "Ultima" yes "ultima1 ultima4 ultima6 ultima8" "" "mt32emu"
add_engine ultima1 "Ultima I - The First Age of Darkness" no "" "" ""
add_engine ultima4 "Ultima IV - Quest of the Avatar" yes "" "" "16bit"
-add_engine ultima6 "Ultima VI = The False Prophet" yes "" "" "highres 16bit" "lua"
+add_engine ultima6 "Ultima VI = The False Prophet" yes "" "" "highres 16bit lua"
add_engine ultima8 "Ultima VIII - Pagan" yes "" "" "highres 16bit"
Commit: 481492eb89503427ba6b1b0119ed29fba35a8987
https://github.com/scummvm/scummvm/commit/481492eb89503427ba6b1b0119ed29fba35a8987
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-12-25T00:34:39+01:00
Commit Message:
BLADERUNNER: The engine does not really use mt32emu component
Changed paths:
engines/bladerunner/configure.engine
diff --git a/engines/bladerunner/configure.engine b/engines/bladerunner/configure.engine
index e53671ecde4..a4a6150a872 100644
--- a/engines/bladerunner/configure.engine
+++ b/engines/bladerunner/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine bladerunner "Blade Runner" yes "" "" "16bit highres mt32emu"
+add_engine bladerunner "Blade Runner" yes "" "" "16bit highres"
Commit: a2721371ca18b7327edd755fe4a68760f49fa862
https://github.com/scummvm/scummvm/commit/a2721371ca18b7327edd755fe4a68760f49fa862
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-12-25T00:34:39+01:00
Commit Message:
DRAGONS: The engine cannot truly use mt32emu component, switching off
Changed paths:
engines/dragons/configure.engine
diff --git a/engines/dragons/configure.engine b/engines/dragons/configure.engine
index ca347929adf..2c23415b967 100644
--- a/engines/dragons/configure.engine
+++ b/engines/dragons/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine dragons "Blazing Dragons" yes "" "" "16bit" "mt32emu"
+add_engine dragons "Blazing Dragons" yes "" "" "16bit" ""
Commit: 005d6caba61922a35b75d8fa8353644456f54ed1
https://github.com/scummvm/scummvm/commit/005d6caba61922a35b75d8fa8353644456f54ed1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-12-25T00:34:39+01:00
Commit Message:
HDB: Mark lua as hard engine dependency
Changed paths:
engines/hdb/configure.engine
diff --git a/engines/hdb/configure.engine b/engines/hdb/configure.engine
index 655af0028c0..e245b0fc8fb 100644
--- a/engines/hdb/configure.engine
+++ b/engines/hdb/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine hdb "Hyperspace Delivery Boy!" yes "" "" "16bit highres" "lua"
+add_engine hdb "Hyperspace Delivery Boy!" yes "" "" "16bit highres lua" ""
Commit: 2a69a0ff17183044c6b14790e1444f1f051a23c3
https://github.com/scummvm/scummvm/commit/2a69a0ff17183044c6b14790e1444f1f051a23c3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-12-25T00:34:39+01:00
Commit Message:
MOHAWK: The MIDI code is not used in the engine, thus, removing mt32emu as a component
Changed paths:
engines/mohawk/configure.engine
diff --git a/engines/mohawk/configure.engine b/engines/mohawk/configure.engine
index 778b2b2538c..7c023a12aab 100644
--- a/engines/mohawk/configure.engine
+++ b/engines/mohawk/configure.engine
@@ -1,6 +1,6 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine mohawk "Mohawk" yes "cstime myst mystme riven" "Living Books" "highres" "mt32emu"
+add_engine mohawk "Mohawk" yes "cstime myst mystme riven" "Living Books" "highres" ""
add_engine cstime "Where in Time is Carmen Sandiego?" no
add_engine riven "Riven: The Sequel to Myst" yes "" "" "16bit"
add_engine myst "Myst" yes
Commit: eae088d18ef91522d4efb0239d2db083dc834469
https://github.com/scummvm/scummvm/commit/eae088d18ef91522d4efb0239d2db083dc834469
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2024-12-25T00:34:39+01:00
Commit Message:
CONFIGURE: Don't duplicate features and components
Make a component a specialized feature.
This avoids repeating ourselves.
Changed paths:
configure
diff --git a/configure b/configure
index 3544d8dd708..1bc6dc0d31c 100755
--- a/configure
+++ b/configure
@@ -123,12 +123,14 @@ add_feature() {
set_var _feature_${1}_settings "${3}"
}
-# Add a component: id name settings-list
+# Add a component: id name settings-list use-define
add_component() {
+ add_feature "$1" "$2" "$3"
+
set_var _components "$(get_var _components) ${1}"
set_var _component_${1}_name "${2}"
- set_var _component_${1}_settings "${3}"
+ set_var _component_${1}_settings "${4}"
}
_srcdir=`dirname $0`
@@ -302,26 +304,22 @@ add_feature highres "high resolution" "_highres"
add_feature mad "MAD" "_mad"
add_feature jpeg "JPEG" "_jpeg"
add_feature mpeg2 "mpeg2" "_mpeg2"
-add_feature mt32emu "mt32emu" "_mt32emu"
add_feature opengl_game_classic "OpenGL (classic)" "_opengl_game_classic"
add_feature opengl_game_shaders "OpenGL with shaders" "_opengl_game_shaders"
add_feature png "PNG" "_png"
add_feature gif "GIF" "_gif"
-add_feature theoradec "libtheoradec" "_theoradec"
-add_feature tinygl "TinyGL" "_tinygl"
-add_feature vpx "libvpx" "_vpx"
add_feature vorbis "Vorbis file support" "_vorbis _tremor"
add_feature zlib "zlib" "_zlib"
-add_feature lua "lua" "_lua"
add_feature fribidi "FriBidi" "_fribidi"
add_feature test_cxx11 "Test C++11" "_test_cxx11"
add_feature imgui "imgui" "_imgui"
-add_component lua "lua" "USE_LUA"
-add_component vpx "libvpx" "USE_VPX"
-add_component theoradec "libtheoradec" "USE_THEORADEC"
-add_component mt32emu "mt32emu" "USE_MT32EMU"
-add_component tinygl "TinyGL" "USE_TINYGL"
+# Components are features which may be disabled if unused by the engines
+add_component lua "lua" "_lua" "USE_LUA"
+add_component vpx "libvpx" "_vpx" "USE_VPX"
+add_component theoradec "libtheoradec" "_theoradec" "USE_THEORADEC"
+add_component mt32emu "mt32emu" "_mt32emu" "USE_MT32EMU"
+add_component tinygl "TinyGL" "_tinygl" "USE_TINYGL"
# Directories for installing ScummVM.
# This list is closely based on what GNU autoconf does,
Commit: 38032921b8f85cffe28ad8563977dd00598c809e
https://github.com/scummvm/scummvm/commit/38032921b8f85cffe28ad8563977dd00598c809e
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2024-12-25T00:34:39+01:00
Commit Message:
CONFIGURE: Don't enable component when the related feature is disabled
Changed paths:
engines.awk
diff --git a/engines.awk b/engines.awk
index b283e972a64..5839ed356e9 100755
--- a/engines.awk
+++ b/engines.awk
@@ -173,7 +173,8 @@ function check_engine_components(engine) {
# Collect components
compcount = get_engine_components(engine, components)
for (c = 1; c <= compcount; c++) {
- enable_component(components[c])
+ if (get_feature_state(components[c]) != "no")
+ enable_component(components[c])
}
# And collect those features that also declared as components
Commit: f7a881b1148c4ec19bc3c05f96122945b79ef3ee
https://github.com/scummvm/scummvm/commit/f7a881b1148c4ec19bc3c05f96122945b79ef3ee
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2024-12-25T00:34:39+01:00
Commit Message:
CONFIGURE: Component settings are really a define
Rename the variable.
In addition, remove the useless component name (as it's a feature, we
can get the name from the fitting feature).
Changed paths:
configure
engines.awk
diff --git a/configure b/configure
index 1bc6dc0d31c..218627cd738 100755
--- a/configure
+++ b/configure
@@ -129,8 +129,7 @@ add_component() {
set_var _components "$(get_var _components) ${1}"
- set_var _component_${1}_name "${2}"
- set_var _component_${1}_settings "${4}"
+ set_var _component_${1}_define "${4}"
}
_srcdir=`dirname $0`
diff --git a/engines.awk b/engines.awk
index 5839ed356e9..431cffe9690 100755
--- a/engines.awk
+++ b/engines.awk
@@ -136,12 +136,12 @@ function get_component_enabled(comp) {
return ENVIRON["_component_" comp "_enabled"]
}
-function get_component_settings(comp) {
- return ENVIRON["_component_" comp "_settings"]
+function get_component_define(comp) {
+ return ENVIRON["_component_" comp "_define"]
}
function have_component(comp) {
- if (length(ENVIRON["_component_" comp "_settings"]) == 0)
+ if (length(ENVIRON["_component_" comp "_define"]) == 0)
return "no"
return "yes"
@@ -439,14 +439,14 @@ END {
comp_enabled = ""
comp_disabled = ""
for (c = 1; c <= components_count; c++) {
- setting = get_component_settings(components[c])
- add_to_config_h_if_yes(get_component_enabled(components[c]), "#define " setting)
+ define = get_component_define(components[c])
+ add_to_config_h_if_yes(get_component_enabled(components[c]), "#define " define)
if (get_component_enabled(components[c]) == "yes") {
- add_line_to_config_mk(setting "=1")
+ add_line_to_config_mk(define "=1")
comp_enabled = comp_enabled components[c] " "
} else {
- add_line_to_config_mk("# " setting)
+ add_line_to_config_mk("# " define)
comp_disabled = comp_disabled components[c] " "
}
}
Commit: 8e4ae65f8e749645cc65cb03f2565358fb94e113
https://github.com/scummvm/scummvm/commit/8e4ae65f8e749645cc65cb03f2565358fb94e113
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2024-12-25T00:34:39+01:00
Commit Message:
CONFIGURE: Pretty print enabled and disabled components
Changed paths:
engines.awk
diff --git a/engines.awk b/engines.awk
index 431cffe9690..4672448d18a 100755
--- a/engines.awk
+++ b/engines.awk
@@ -313,6 +313,14 @@ function print_engines(headline, engines, count) {
print(" " engines[e])
}
+function print_components(headline, components, count) {
+ if (!count)
+ return
+ print("\n" headline)
+ for (c = 1; c <= count; c++)
+ print(" " get_feature_name(components[c]))
+}
+
BEGIN {
config_mk = "config.mk.engines"
config_h = "config.h.engines"
@@ -389,7 +397,7 @@ END {
if (have_feature(components[c])) {
if (get_feature_state(components[c]) == "yes" || get_feature_state(components[c]) == "auto") {
disable_feature(components[c])
- print(" Feature '" components[c] "' is disabled as unused by enabled engines")
+ print(" Feature " get_feature_name(components[c]) " is disabled as unused by enabled engines")
}
}
}
@@ -436,18 +444,16 @@ END {
add_line_to_config_h("\n/* components */")
add_line_to_config_mk("\n# components")
components_count = get_values("_components", components)
- comp_enabled = ""
- comp_disabled = ""
for (c = 1; c <= components_count; c++) {
define = get_component_define(components[c])
add_to_config_h_if_yes(get_component_enabled(components[c]), "#define " define)
if (get_component_enabled(components[c]) == "yes") {
add_line_to_config_mk(define "=1")
- comp_enabled = comp_enabled components[c] " "
+ _comp_enabled[++_comp_enabled_count] = components[c]
} else {
add_line_to_config_mk("# " define)
- comp_disabled = comp_disabled components[c] " "
+ _comp_disabled[++_comp_disabled_count] = components[c]
}
}
add_line_to_config_h("/* end of components */")
@@ -460,10 +466,8 @@ END {
print_engines("Engines Skipped:", _engines_skipped, _skipped)
print_engines("WARNING: This ScummVM build contains the following UNSTABLE engines:", _engines_built_wip, _wip)
- if (comp_enabled == "")
- comp_enabled = "<none>"
- print("\nComponents Enabled: " comp_enabled)
- print("Components Disabled: " comp_disabled)
+ print_components("Components Enabled: ", _comp_enabled, _comp_enabled_count)
+ print_components("Components Disabled: ", _comp_disabled, _comp_disabled_count)
# Ensure engines folder exists prior to trying to generate
# files into it (used for out-of-tree-builds)
Commit: 22e235f4d47dd3f18a1b8c2ad633c2ec520b1060
https://github.com/scummvm/scummvm/commit/22e235f4d47dd3f18a1b8c2ad633c2ec520b1060
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2024-12-25T00:34:39+01:00
Commit Message:
CREATE_PROJECT: Add Lua feature
This repairs build
Changed paths:
devtools/create_project/create_project.cpp
diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index 5462a45fd32..54b6bea41fd 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -1156,6 +1156,7 @@ const Feature s_features[] = {
{ "3d", "", false, true, "3D rendering" },
{ "highres", "USE_HIGHRES", false, true, "high resolution" },
{ "imgui", "USE_IMGUI", false, true, "Dear ImGui based debugger" },
+ { "lua", "USE_LUA", false, true, "Lua" },
{ "mt32emu", "USE_MT32EMU", false, true, "integrated MT-32 emulator" },
{ "nasm", "USE_NASM", false, true, "IA-32 assembly support" }, // This feature is special in the regard, that it needs additional handling.
{ "tinygl", "USE_TINYGL", false, true, "TinyGL support" },
Commit: aeec3e9a8e9eacdd2f4110d8360d78eb0cef06aa
https://github.com/scummvm/scummvm/commit/aeec3e9a8e9eacdd2f4110d8360d78eb0cef06aa
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2024-12-25T00:34:39+01:00
Commit Message:
CREATE_PROJECT: Use std::find to search the feature
This matches the other implementations
Changed paths:
devtools/create_project/create_project.cpp
diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index 54b6bea41fd..0500396a1c3 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -2570,10 +2570,10 @@ bool BuildSetup::featureEnabled(const std::string &feature) const {
}
Feature BuildSetup::getFeature(const std::string &feature) const {
- for (FeatureList::const_iterator itr = features.begin(); itr != features.end(); ++itr) {
- if (itr->name != feature)
- continue;
- return *itr;
+ FeatureList::const_iterator itr = std::find(features.begin(), features.end(), feature);
+ if (itr == features.end()) {
+ error("invalid feature request: " + feature);
}
- error("invalid feature request: " + feature);
+
+ return *itr;
}
Commit: 60104f33116e5357b8e870d928f84e389e89c852
https://github.com/scummvm/scummvm/commit/60104f33116e5357b8e870d928f84e389e89c852
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2024-12-25T00:34:39+01:00
Commit Message:
CREATE_PROJECT: Disable components when they are not needed
Changed paths:
devtools/create_project/create_project.cpp
devtools/create_project/create_project.h
diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index 0500396a1c3..98edbeaf499 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -132,7 +132,7 @@ int main(int argc, char *argv[]) {
}
setup.features = getAllFeatures();
- setup.components = getAllComponents(setup.srcDir);
+ setup.components = getAllComponents(setup.srcDir, setup.features);
ProjectType projectType = kProjectNone;
const MSVCVersion *msvc = nullptr;
@@ -319,8 +319,8 @@ int main(int argc, char *argv[]) {
removeTrailingSlash(libsDir);
setup.libsDir = libsDir;
} else if (!std::strcmp(argv[i], "--list-components")) {
- for (StringList::const_iterator j = setup.components.begin(); j != setup.components.end(); ++j)
- cout << ' ' << *j << "\n";
+ for (ComponentList::const_iterator j = setup.components.begin(); j != setup.components.end(); ++j)
+ cout << ' ' << j->description << "\n";
return 0;
} else {
@@ -386,9 +386,10 @@ int main(int argc, char *argv[]) {
getFeatureBuildState("opengl_game_classic", setup.features) ||
getFeatureBuildState("opengl_game_shaders", setup.features));
- // Disable engines for which we are missing dependencies
+ // Disable engines for which we are missing dependencies and mark components as needed
for (EngineDescList::const_iterator i = setup.engines.begin(); i != setup.engines.end(); ++i) {
if (i->enable) {
+ bool enabled = true;
for (StringList::const_iterator ef = i->requiredFeatures.begin(); ef != i->requiredFeatures.end(); ++ef) {
FeatureList::iterator feature = std::find(setup.features.begin(), setup.features.end(), *ef);
if (feature == setup.features.end()) {
@@ -396,13 +397,36 @@ int main(int argc, char *argv[]) {
return -1;
} else if (!feature->enable) {
setEngineBuildState(i->name, setup.engines, false);
+ enabled = false;
break;
}
}
- isEngineEnabled[i->name] = true;
+ isEngineEnabled[i->name] = enabled;
+ if (!enabled) {
+ continue;
+ }
+ // Mark components as needed now the engine is definitely enabled
+ for (StringList::const_iterator ef = i->requiredFeatures.begin(); ef != i->requiredFeatures.end(); ++ef) {
+ ComponentList::iterator component = std::find(setup.components.begin(), setup.components.end(), *ef);
+ if (component == setup.components.end()) {
+ continue;
+ }
+ component->needed = true;
+ }
+ for (StringList::const_iterator ef = i->wishedComponents.begin(); ef != i->wishedComponents.end(); ++ef) {
+ ComponentList::iterator component = std::find(setup.components.begin(), setup.components.end(), *ef);
+ if (component == setup.components.end()) {
+ std::cerr << "ERROR: Missing component " << *ef << " from engine " << i->name << '\n';
+ return -1;
+ }
+ component->needed = true;
+ }
}
}
+ // Disable unused features / components
+ disableComponents(setup.components);
+
// Print status
cout << "Enabled engines:\n\n";
for (EngineDescList::const_iterator i = setup.engines.begin(); i != setup.engines.end(); ++i) {
@@ -441,9 +465,6 @@ int main(int argc, char *argv[]) {
StringList featureDefines = getFeatureDefines(setup.features);
setup.defines.splice(setup.defines.begin(), featureDefines);
- // Add all components
- setup.defines.splice(setup.defines.begin(), setup.components);
-
if (projectType == kProjectXcode) {
setup.defines.push_back("POSIX");
// Define both MACOSX, and IPHONE, but only one of them will be associated to the
@@ -1011,7 +1032,7 @@ namespace {
*/
bool parseEngine(const std::string &line, EngineDesc &engine) {
// Format:
- // add_engine engine_name "Readable Description" enable_default ["SubEngineList"] ["base games"] ["dependencies"]
+ // add_engine engine_name "Readable Description" enable_default ["SubEngineList"] ["base games"] ["dependencies"] ["components"]
TokenList tokens = tokenize(line);
if (tokens.size() < 4)
@@ -1034,8 +1055,12 @@ bool parseEngine(const std::string &line, EngineDesc &engine) {
++token;
if (token != tokens.end())
++token;
- if (token != tokens.end())
+ if (token != tokens.end()) {
engine.requiredFeatures = tokenize(*token);
+ ++token;
+ }
+ if (token != tokens.end())
+ engine.wishedComponents = tokenize(*token);
}
return true;
@@ -1229,15 +1254,15 @@ FeatureList getAllFeatures() {
return features;
}
-StringList getAllComponents(const std::string &srcDir) {
+ComponentList getAllComponents(const std::string &srcDir, FeatureList &features) {
std::string configureFile = srcDir + "/configure";
std::ifstream configure(configureFile.c_str());
if (!configure)
- return StringList();
+ return ComponentList();
std::string line;
- StringList components;
+ ComponentList components;
bool seenComponents = false;
for (;;) {
@@ -1255,7 +1280,7 @@ StringList getAllComponents(const std::string &srcDir) {
TokenList::const_iterator token = tokens.begin();
- // add_component lua "lua" "USE_LUA"
+ // add_component lua "lua" "_lua" "USE_LUA"
if (*token != "add_component") {
if (seenComponents) // No need to read whole file
break;
@@ -1265,15 +1290,32 @@ StringList getAllComponents(const std::string &srcDir) {
seenComponents = true;
++token;
+ std::string name = *token;
+ ++token;
+ std::string description = *token;
++token;
++token;
+ std::string define = *token;
- components.push_back(*token);
+ FeatureList::iterator itr = std::find(features.begin(), features.end(), name);
+ if (itr == features.end()) {
+ error("Missing matching feature for component " + name);
+ }
+
+ Component comp = { name, define, *itr, description, false };
+ components.push_back(comp);
}
return components;
}
+void disableComponents(const ComponentList &components) {
+ for (ComponentList::const_iterator i = components.begin(); i != components.end(); ++i) {
+ if (!i->needed)
+ i->feature.enable = false;
+ }
+}
+
StringList getFeatureDefines(const FeatureList &features) {
StringList defines;
diff --git a/devtools/create_project/create_project.h b/devtools/create_project/create_project.h
index e784453a2a4..9e9c378d4c0 100644
--- a/devtools/create_project/create_project.h
+++ b/devtools/create_project/create_project.h
@@ -97,6 +97,11 @@ struct EngineDesc {
*/
StringList requiredFeatures;
+ /**
+ * Components wished for this engine.
+ */
+ StringList wishedComponents;
+
/**
* A list of all available sub engine names. Sub engines are engines
* which are built on top of an existing engines and can be only
@@ -175,6 +180,22 @@ struct Feature {
};
typedef std::list<Feature> FeatureList;
+struct Component {
+ std::string name; ///< Name of the component
+ std::string define; ///< Define of the component
+
+ Feature &feature; ///< Associated feature
+
+ std::string description; ///< Human readable description of the component
+
+ bool needed;
+
+ bool operator==(const std::string &n) const {
+ return (name == n);
+ }
+};
+typedef std::list<Component> ComponentList;
+
struct Tool {
const char *name; ///< Name of the tools
bool enable; ///< Whether the tools is enabled or not
@@ -188,7 +209,22 @@ typedef std::list<Tool> ToolList;
*/
FeatureList getAllFeatures();
-StringList getAllComponents(const std::string &srcDir);
+/**
+ * Creates a list of all components.
+ *
+ * @param srcDir The source directory containing the configure script
+ * @param features The features list used to link the component to its feature
+ *
+ * @return A list including all components available linked to its features.
+ */
+ComponentList getAllComponents(const std::string &srcDir, FeatureList &features);
+
+/**
+ * Disable the features for the unused components.
+ *
+ * @param components List of components for the build
+ */
+void disableComponents(const ComponentList &components);
/**
* Returns a list of all defines, according to the feature set
@@ -240,7 +276,7 @@ struct BuildSetup {
EngineDescList engines; ///< Engine list for the build (this may contain engines, which are *not* enabled!).
FeatureList features; ///< Feature list for the build (this may contain features, which are *not* enabled!).
- StringList components;
+ ComponentList components;
StringList defines; ///< List of all defines for the build.
StringList testDirs; ///< List of all folders containing tests
Commit: 3ad09d8999878725144a78563bb1fe2f864f9aa0
https://github.com/scummvm/scummvm/commit/3ad09d8999878725144a78563bb1fe2f864f9aa0
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2024-12-25T00:34:39+01:00
Commit Message:
CREATE_PROJECT: Make unused components disabling verbose
Changed paths:
devtools/create_project/create_project.cpp
diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index 98edbeaf499..beb92399fc9 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -1310,9 +1310,16 @@ ComponentList getAllComponents(const std::string &srcDir, FeatureList &features)
}
void disableComponents(const ComponentList &components) {
+ bool disabled = false;
for (ComponentList::const_iterator i = components.begin(); i != components.end(); ++i) {
- if (!i->needed)
+ if (!i->needed) {
i->feature.enable = false;
+ disabled = true;
+ std::cout << "Feature " << i->feature.description << " is disabled as unused by enabled engines\n";
+ }
+ }
+ if (disabled) {
+ std::cout << "\n";
}
}
Commit: 46b62be40473159dd6457f723746d8a6ef2480fd
https://github.com/scummvm/scummvm/commit/46b62be40473159dd6457f723746d8a6ef2480fd
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2024-12-25T00:34:39+01:00
Commit Message:
CREATE_PROJECT: Explain why an engine is disabled
Changed paths:
devtools/create_project/create_project.cpp
diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index beb92399fc9..948ad50bf54 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -388,39 +388,47 @@ int main(int argc, char *argv[]) {
// Disable engines for which we are missing dependencies and mark components as needed
for (EngineDescList::const_iterator i = setup.engines.begin(); i != setup.engines.end(); ++i) {
- if (i->enable) {
- bool enabled = true;
- for (StringList::const_iterator ef = i->requiredFeatures.begin(); ef != i->requiredFeatures.end(); ++ef) {
- FeatureList::iterator feature = std::find(setup.features.begin(), setup.features.end(), *ef);
- if (feature == setup.features.end()) {
- std::cerr << "ERROR: Missing feature " << *ef << " from engine " << i->name << '\n';
- return -1;
- } else if (!feature->enable) {
- setEngineBuildState(i->name, setup.engines, false);
- enabled = false;
- break;
- }
+ if (!i->enable) {
+ continue;
+ }
+
+ bool enabled = true;
+ std::list<FeatureList::iterator> missingFeatures;
+ for (StringList::const_iterator ef = i->requiredFeatures.begin(); ef != i->requiredFeatures.end(); ++ef) {
+ FeatureList::iterator feature = std::find(setup.features.begin(), setup.features.end(), *ef);
+ if (feature == setup.features.end()) {
+ std::cerr << "ERROR: Missing feature " << *ef << " from engine " << i->name << '\n';
+ return -1;
+ } else if (!feature->enable) {
+ enabled = false;
+ missingFeatures.push_back(feature);
}
- isEngineEnabled[i->name] = enabled;
- if (!enabled) {
- continue;
+ }
+ isEngineEnabled[i->name] = enabled;
+ if (!enabled) {
+ setEngineBuildState(i->name, setup.engines, false);
+ std::cout << "WARNING: Disabling engine " << i->desc << " because the following dependencies are unmet:";
+ for (std::list<FeatureList::iterator>::iterator itr = missingFeatures.begin(); itr != missingFeatures.end(); itr++) {
+ std::cout << " " << (*itr)->description;
}
- // Mark components as needed now the engine is definitely enabled
- for (StringList::const_iterator ef = i->requiredFeatures.begin(); ef != i->requiredFeatures.end(); ++ef) {
- ComponentList::iterator component = std::find(setup.components.begin(), setup.components.end(), *ef);
- if (component == setup.components.end()) {
- continue;
- }
- component->needed = true;
+ std::cout << "\n";
+ continue;
+ }
+ // Mark components as needed now the engine is definitely enabled
+ for (StringList::const_iterator ef = i->requiredFeatures.begin(); ef != i->requiredFeatures.end(); ++ef) {
+ ComponentList::iterator component = std::find(setup.components.begin(), setup.components.end(), *ef);
+ if (component == setup.components.end()) {
+ continue;
}
- for (StringList::const_iterator ef = i->wishedComponents.begin(); ef != i->wishedComponents.end(); ++ef) {
- ComponentList::iterator component = std::find(setup.components.begin(), setup.components.end(), *ef);
- if (component == setup.components.end()) {
- std::cerr << "ERROR: Missing component " << *ef << " from engine " << i->name << '\n';
- return -1;
- }
- component->needed = true;
+ component->needed = true;
+ }
+ for (StringList::const_iterator ef = i->wishedComponents.begin(); ef != i->wishedComponents.end(); ++ef) {
+ ComponentList::iterator component = std::find(setup.components.begin(), setup.components.end(), *ef);
+ if (component == setup.components.end()) {
+ std::cerr << "ERROR: Missing component " << *ef << " from engine " << i->name << '\n';
+ return -1;
}
+ component->needed = true;
}
}
Commit: d33ec239faf3f0e2d3f209e5d580667e0139e8f3
https://github.com/scummvm/scummvm/commit/d33ec239faf3f0e2d3f209e5d580667e0139e8f3
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2024-12-25T00:34:39+01:00
Commit Message:
CONFIGURE: Added imgui component and marked all the relevant engines
Changed paths:
configure
engines/director/configure.engine
engines/qdengine/configure.engine
engines/testbed/configure.engine
engines/twine/configure.engine
engines/twp/configure.engine
diff --git a/configure b/configure
index 218627cd738..92357986c63 100755
--- a/configure
+++ b/configure
@@ -311,9 +311,9 @@ add_feature vorbis "Vorbis file support" "_vorbis _tremor"
add_feature zlib "zlib" "_zlib"
add_feature fribidi "FriBidi" "_fribidi"
add_feature test_cxx11 "Test C++11" "_test_cxx11"
-add_feature imgui "imgui" "_imgui"
# Components are features which may be disabled if unused by the engines
+add_component imgui "ImGui" "_imgui" "USE_IMGUI"
add_component lua "lua" "_lua" "USE_LUA"
add_component vpx "libvpx" "_vpx" "USE_VPX"
add_component theoradec "libtheoradec" "_theoradec" "USE_THEORADEC"
@@ -6804,7 +6804,6 @@ EOF
else
echo "$_imgui"
fi
-define_in_config_if_yes "$_imgui" 'USE_IMGUI'
#
# Enable vkeybd / event recorder
diff --git a/engines/director/configure.engine b/engines/director/configure.engine
index a93609f9fb2..bbad175047d 100644
--- a/engines/director/configure.engine
+++ b/engines/director/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine director "Macromedia Director" yes "" "" "highres"
+add_engine director "Macromedia Director" yes "" "" "highres" "imgui"
diff --git a/engines/qdengine/configure.engine b/engines/qdengine/configure.engine
index 76ef4d033b1..dc5239cb6a4 100644
--- a/engines/qdengine/configure.engine
+++ b/engines/qdengine/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine qdengine "QD Engine" yes "" "" "vorbis 16bit highres mpeg2"
+add_engine qdengine "QD Engine" yes "" "" "vorbis 16bit highres mpeg2" "imgui"
diff --git a/engines/testbed/configure.engine b/engines/testbed/configure.engine
index b90c650dd9c..3ab2b501951 100644
--- a/engines/testbed/configure.engine
+++ b/engines/testbed/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine testbed "TestBed: the Testing framework" no "" "" "" "mt32emu"
+add_engine testbed "TestBed: the Testing framework" no "" "" "" "imgui mt32emu"
diff --git a/engines/twine/configure.engine b/engines/twine/configure.engine
index e1fd3dc3512..6faedfac00c 100644
--- a/engines/twine/configure.engine
+++ b/engines/twine/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine twine "Little Big Adventure" yes "" "" "highres" "mt32emu"
+add_engine twine "Little Big Adventure" yes "" "" "highres" "imgui mt32emu"
diff --git a/engines/twp/configure.engine b/engines/twp/configure.engine
index c2cb7fbb481..ee3442a3cf7 100644
--- a/engines/twp/configure.engine
+++ b/engines/twp/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine twp "Thimbleweed Park" yes "" "" "16bit 3d highres vorbis png opengl_game_shaders"
+add_engine twp "Thimbleweed Park" yes "" "" "16bit 3d highres vorbis png opengl_game_shaders" "imgui"
Commit: 4954e7879fd8c060994e3b89bf9e21e75878a451
https://github.com/scummvm/scummvm/commit/4954e7879fd8c060994e3b89bf9e21e75878a451
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2024-12-25T00:34:39+01:00
Commit Message:
CONFIGURE: Document features that can't be components
And reorder the features declaration list.
Changed paths:
configure
diff --git a/configure b/configure
index 92357986c63..55692e82ef7 100755
--- a/configure
+++ b/configure
@@ -298,18 +298,18 @@ add_feature bink "Bink" "_bink"
add_feature cloud "cloud" "_cloud"
add_feature faad "libfaad" "_faad"
add_feature flac "FLAC" "_flac"
+add_feature fribidi "FriBidi" "_fribidi"
add_feature freetype2 "FreeType2" "_freetype2"
+add_feature gif "GIF" "_gif"
add_feature highres "high resolution" "_highres"
-add_feature mad "MAD" "_mad"
add_feature jpeg "JPEG" "_jpeg"
+add_feature mad "MAD" "_mad"
add_feature mpeg2 "mpeg2" "_mpeg2"
add_feature opengl_game_classic "OpenGL (classic)" "_opengl_game_classic"
add_feature opengl_game_shaders "OpenGL with shaders" "_opengl_game_shaders"
add_feature png "PNG" "_png"
-add_feature gif "GIF" "_gif"
add_feature vorbis "Vorbis file support" "_vorbis _tremor"
add_feature zlib "zlib" "_zlib"
-add_feature fribidi "FriBidi" "_fribidi"
add_feature test_cxx11 "Test C++11" "_test_cxx11"
# Components are features which may be disabled if unused by the engines
@@ -320,6 +320,21 @@ add_component theoradec "libtheoradec" "_theoradec" "USE_THEORADEC"
add_component mt32emu "mt32emu" "_mt32emu" "USE_MT32EMU"
add_component tinygl "TinyGL" "_tinygl" "USE_TINYGL"
+# The following list of features cannot be declared as components
+# because they are used in the common code:
+# 16bit: used by the GUI
+# 3d: not a real feature
+# cloud: used by the GUI
+# flac: used by DefaultAudioCDManager
+# fribidi: used by the GUI
+# freetype2: used by the GUI
+# highres: not a real feature
+# mad: used by DefaultAudioCDManager
+# png: used by the GUI
+# vorbis: used by DefaultAudioCDManager
+# zlib: used by the GUI
+# test_cxx11: used by the build system
+
# Directories for installing ScummVM.
# This list is closely based on what GNU autoconf does,
# although the default value for datadir differs.
More information about the Scummvm-git-logs
mailing list