[Scummvm-git-logs] scummvm master -> 74c2cb0c13ee43c5dda181920ed242e1631172a5

sev- noreply at scummvm.org
Thu Dec 26 22:05:38 UTC 2024 

This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
c0f635ba38 CONFIGURE: Added VGMTrans Soundfont audio as a component
879eba5c32 CONFIGURE: Replace mt32emu component with 'midi'
be4ac56d3b CONFIGURE: Turned MPC into a component
74c2cb0c13 CONFIGURE: Added universaltracker as a meta-component


Commit: c0f635ba38b2d9afdaccb0c9fac124d4c74df35c
    https://github.com/scummvm/scummvm/commit/c0f635ba38b2d9afdaccb0c9fac124d4c74df35c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-12-26T22:54:56+01:00

Commit Message:
CONFIGURE: Added VGMTrans Soundfont audio as a component

Changed paths:
    audio/module.mk
    configure
    engines/dragons/configure.engine


diff --git a/audio/module.mk b/audio/module.mk
index aaf8e1a684a..dc97b834126 100644
--- a/audio/module.mk
+++ b/audio/module.mk
@@ -64,17 +64,7 @@ MODULE_OBJS := \
 	softsynth/appleiigs.o \
 	softsynth/fluidsynth.o \
 	softsynth/eas.o \
-	softsynth/pcspk.o \
-	soundfont/rawfile.o \
-	soundfont/rifffile.o \
-	soundfont/sf2file.o \
-	soundfont/synthfile.o \
-	soundfont/vgmcoll.o \
-	soundfont/vgminstrset.o \
-	soundfont/vgmitem.o \
-	soundfont/vgmsamp.o \
-	soundfont/vab/psxspu.o \
-	soundfont/vab/vab.o
+	softsynth/pcspk.o
 
 ifndef DISABLE_NUKED_OPL
 MODULE_OBJS += \
@@ -124,5 +114,19 @@ MODULE_OBJS += \
 	rwopl3.o
 endif
 
+ifdef USE_VGMTRANS_AUDIO
+MODULE_OBJS += \
+	soundfont/rawfile.o \
+	soundfont/rifffile.o \
+	soundfont/sf2file.o \
+	soundfont/synthfile.o \
+	soundfont/vgmcoll.o \
+	soundfont/vgminstrset.o \
+	soundfont/vgmitem.o \
+	soundfont/vgmsamp.o \
+	soundfont/vab/psxspu.o \
+	soundfont/vab/vab.o
+endif
+
 # Include common rules
 include $(srcdir)/rules.mk
diff --git a/configure b/configure
index 07be3a1bd18..6dcf8180f9b 100755
--- a/configure
+++ b/configure
@@ -294,6 +294,7 @@ _indeo=auto
 _hnm=auto
 _fmtowns_pc98_audio=auto
 _sid_audio=auto
+_vgmtrans_audio=auto
 
 # Add (virtual) features
 add_feature 16bit "16bit color" "_16bit"
@@ -327,6 +328,7 @@ add_component theoradec "libtheoradec" "_theoradec" "USE_THEORADEC"
 add_component mt32emu "Integrated MT-32 emulator" "_mt32emu" "USE_MT32EMU"
 add_component sid_audio "SID audio" "_sid_audio" "USE_SID_AUDIO"
 add_component tinygl "TinyGL" "_tinygl" "USE_TINYGL"
+add_component vgmtrans_audio "VGMTrans Soundfont audio" "_vgmtrans_audio" "USE_VGMTRANS_AUDIO"
 
 # The following list of features cannot be declared as components
 # because they are used in the common code:
diff --git a/engines/dragons/configure.engine b/engines/dragons/configure.engine
index 2c23415b967..cfedecc67dd 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 vgmtrans_audio" ""


Commit: 879eba5c32481500789d932d3b88b0cf918cdec3
    https://github.com/scummvm/scummvm/commit/879eba5c32481500789d932d3b88b0cf918cdec3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-12-26T22:54:56+01:00

Commit Message:
CONFIGURE: Replace mt32emu component with 'midi'

This component disables all MIDI-related things when unused,
including MT-32 emulator, Fluidsynth, TiMidity and Sonivox

Changed paths:
    configure
    engines/access/configure.engine
    engines/agi/configure.engine
    engines/agos/configure.engine
    engines/ags/configure.engine
    engines/bagel/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/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/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 6dcf8180f9b..84a1bcc9d54 100755
--- a/configure
+++ b/configure
@@ -295,6 +295,7 @@ _hnm=auto
 _fmtowns_pc98_audio=auto
 _sid_audio=auto
 _vgmtrans_audio=auto
+_midi=auto
 
 # Add (virtual) features
 add_feature 16bit "16bit color" "_16bit"
@@ -325,7 +326,7 @@ add_component indeo "Indeo" "_indeo" "USE_INDEO"
 add_component lua "Lua" "_lua" "USE_LUA"
 add_component vpx "libvpx" "_vpx" "USE_VPX"
 add_component theoradec "libtheoradec" "_theoradec" "USE_THEORADEC"
-add_component mt32emu "Integrated MT-32 emulator" "_mt32emu" "USE_MT32EMU"
+add_component midi "MIDI synthesis" "_midi" "USE_MIDI"
 add_component sid_audio "SID audio" "_sid_audio" "USE_SID_AUDIO"
 add_component tinygl "TinyGL" "_tinygl" "USE_TINYGL"
 add_component vgmtrans_audio "VGMTrans Soundfont audio" "_vgmtrans_audio" "USE_VGMTRANS_AUDIO"
@@ -4175,7 +4176,6 @@ append_var MODULES "backends/platform/$_backend"
 #
 echo "Checking for unused components..."
 awk -f "$_srcdir/engines.awk" -v _pass=pass1 < /dev/null
-echo "...check complete"
 
 . ./engines.awk.out
 
@@ -4183,8 +4183,21 @@ for f in $_features_disabled; do
     set_var $(get_var _feature_${f}_settings) "no"
 done
 
+# Special cases for pseudo-components
+if test "$_midi" = no ; then
+	_mt32emu=no
+	_fluidsynth=no
+	_fluidlite=no
+	_timidity=no
+	_sonivox=no
+
+	echo "   Disabling mt32emu, fluidsynth, fluidlite, timidity and sonivox because MIDI is unused by enabled engines"
+fi
+
 rm -f engines.awk.out
 
+echo "...check complete"
+
 #
 # Check for pkg-config
 #
@@ -5033,6 +5046,11 @@ 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 8599134182c..845745cb7ef 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 "" "" "" "mt32emu"
+add_engine access "Access" yes "" "" "" "midi"
diff --git a/engines/agi/configure.engine b/engines/agi/configure.engine
index 8aa0d6ce786..a6844af9e55 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 "" "" "" "mt32emu"
+add_engine agi "AGI" yes "" "" "" "midi"
diff --git a/engines/agos/configure.engine b/engines/agos/configure.engine
index 76c740d1cbb..ee712257d83 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" "" "mt32emu fmtowns_pc98_audio"
+add_engine agos "AGOS" yes "agos2" "AGOS 1 games" "" "midi fmtowns_pc98_audio"
 add_engine agos2 "AGOS 2 games" yes "" "" "highres"
diff --git a/engines/ags/configure.engine b/engines/ags/configure.engine
index c46627d4d35..00ad34776c4 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 mt32emu"
+add_engine ags "Adventure Game Studio" yes "" "" "16bit mad" "theoradec midi"
diff --git a/engines/bagel/configure.engine b/engines/bagel/configure.engine
index 406f144b518..cba8b1a335f 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" "mt32emu"
+add_engine bagel "BAGEL" yes "" "" "16bit highres freetype2" "midi"
diff --git a/engines/cge/configure.engine b/engines/cge/configure.engine
index b302ad3fef4..43d66bda56a 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 "" "" "" "mt32emu"
+add_engine cge "CGE" yes "" "" "" "midi"
diff --git a/engines/cge2/configure.engine b/engines/cge2/configure.engine
index 616191d8300..b8ba3b25949 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 "" "" "" "mt32emu"
+add_engine cge2 "CGE2" yes "" "" "" "midi"
diff --git a/engines/cine/configure.engine b/engines/cine/configure.engine
index 07b184c842f..d79a4c16402 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 "" "" "" "mt32emu"
+add_engine cine "Cinematique evo 1" yes "" "" "" "midi"
diff --git a/engines/darkseed/configure.engine b/engines/darkseed/configure.engine
index 6e3a068adad..9053058ef09 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" "mt32emu"
+add_engine darkseed "Darkseed" yes "" "" "highres" "midi"
diff --git a/engines/dgds/configure.engine b/engines/dgds/configure.engine
index 62e192debee..027baa446fd 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 "" "" "" "mt32emu fmtowns_pc98_audio"
+add_engine dgds "Dynamix Game Development System" yes "" "" "" "midi fmtowns_pc98_audio"
diff --git a/engines/draci/configure.engine b/engines/draci/configure.engine
index 3769c7ce3a3..458c19f3fa9 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 "" "" "" "mt32emu"
+add_engine draci "Dragon History" yes "" "" "" "midi"
diff --git a/engines/gnap/configure.engine b/engines/gnap/configure.engine
index 77a294470b1..f6816f3a87f 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" "mt32emu"
+add_engine gnap "UFOs" yes "" "" "highres 16bit" "midi"
diff --git a/engines/gob/configure.engine b/engines/gob/configure.engine
index 91ccf31426b..5d73092aea7 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 "" "" "indeo" "mt32emu"
+add_engine gob "Gobli*ns" yes "" "" "indeo" "midi"
diff --git a/engines/groovie/configure.engine b/engines/groovie/configure.engine
index 210b63d2cb3..267d6df5914 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" "mt32emu"
+add_engine groovie2 "Groovie 2 games" yes "" "" "jpeg 16bit" "midi"
diff --git a/engines/hugo/configure.engine b/engines/hugo/configure.engine
index a55d8694824..2245e3d02c0 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 "" "" "" "mt32emu"
+add_engine hugo "Hugo Trilogy" yes "" "" "" "midi"
diff --git a/engines/illusions/configure.engine b/engines/illusions/configure.engine
index db2f57ec0ac..cf504b8d620 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 "" "" "" "mt32emu"
+add_engine illusions "Illusions Engine" yes "" "" "" "midi"
diff --git a/engines/kyra/configure.engine b/engines/kyra/configure.engine
index f44ba870a54..3c757b1a450 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" "" "mt32emu fmtowns_pc98_audio"
+add_engine kyra "Kyra" yes "lol eob" "Legend of Kyrandia 1-3" "" "midi fmtowns_pc98_audio"
 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 c8bb24d190d..71146d40958 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 "" "" "" "mt32emu"
+add_engine lilliput "Lilliput" no "" "" "" "midi"
diff --git a/engines/lure/configure.engine b/engines/lure/configure.engine
index f3891a8fdb7..bc2acbba9c0 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 "" "" "" "mt32emu"
+add_engine lure "Lure of the Temptress" yes "" "" "" "midi"
diff --git a/engines/m4/configure.engine b/engines/m4/configure.engine
index 04eb539cad2..f26827601ee 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" "mt32emu"
+add_engine m4 "M4" yes "" "" "highres" "midi"
diff --git a/engines/made/configure.engine b/engines/made/configure.engine
index 721c7d40a05..1848529e76e 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 "" "" "" "mt32emu"
+add_engine made "MADE" yes "" "" "" "midi"
diff --git a/engines/mm/configure.engine b/engines/mm/configure.engine
index 227726dd211..3d24c1c1143 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" "" "mt32emu"
+add_engine mm "Might and Magic" yes "mm1 xeen" "" "midi"
 add_engine mm1 "Might and Magic 1" yes
 add_engine xeen "Might and Magic Xeen" yes
diff --git a/engines/mtropolis/configure.engine b/engines/mtropolis/configure.engine
index 282ec1d9230..36065a3cbcd 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" "mt32emu"
+add_engine mtropolis "mTropolis" yes "" "" "16bit highres" "midi"
diff --git a/engines/parallaction/configure.engine b/engines/parallaction/configure.engine
index d5f83f1140d..cc8f2f789b0 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 "" "" "" "mt32emu"
+add_engine parallaction "Parallaction" yes "" "" "" "midi"
diff --git a/engines/prince/configure.engine b/engines/prince/configure.engine
index 85734d0ee8f..cf90716bfeb 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" "mt32emu"
+add_engine prince "The Prince and The Coward" yes "" "" "highres" "midi"
diff --git a/engines/queen/configure.engine b/engines/queen/configure.engine
index f9a4e7edede..a99f4e1b282 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 "" "" "" "mt32emu"
+add_engine queen "Flight of the Amazon Queen" yes "" "" "" "midi"
diff --git a/engines/saga/configure.engine b/engines/saga/configure.engine
index dd3b17f6b93..fdce67fe555 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" "" "mt32emu fmtowns_pc98_audio"
+add_engine saga "SAGA" yes "ihnm" "ITE" "" "midi fmtowns_pc98_audio"
 add_engine ihnm "IHNM" yes "" "" "highres"
diff --git a/engines/saga2/configure.engine b/engines/saga2/configure.engine
index a90cde0f736..462deb6ad08 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" "mt32emu"
+add_engine saga2 "SAGA2" yes "" "" "highres" "midi"
diff --git a/engines/sci/configure.engine b/engines/sci/configure.engine
index ca1bafeb57a..fcdf9e2451a 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" "" "mt32emu fmtowns_pc98_audio"
+add_engine sci "SCI" yes "sci32" "SCI 0-1.1 games" "" "midi fmtowns_pc98_audio"
 add_engine sci32 "SCI32 games" yes "" "" "highres"
diff --git a/engines/scumm/configure.engine b/engines/scumm/configure.engine
index 98828f1dcaa..687f79e7c93 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" "" "mt32emu fmtowns_pc98_audio sid_audio"
+add_engine scumm "SCUMM" yes "scumm_7_8 he" "v0-v6 games" "" "midi fmtowns_pc98_audio sid_audio"
 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 c08e4aec79c..733a1f369c6 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 "" "" "" "mt32emu"
+add_engine sherlock "The Lost Files of Sherlock Holmes" yes "" "" "" "midi"
diff --git a/engines/sky/configure.engine b/engines/sky/configure.engine
index a48f2fd540d..1c0f32454b3 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 "" "" "" "mt32emu"
+add_engine sky "Beneath a Steel Sky" yes "" "" "" "midi"
diff --git a/engines/startrek/configure.engine b/engines/startrek/configure.engine
index 474ce69aeaa..eee74c09a56 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 "" "" "" "mt32emu"
+add_engine startrek "Star Trek 25th Anniversary/Judgment Rites" no "" "" "" "midi"
diff --git a/engines/testbed/configure.engine b/engines/testbed/configure.engine
index 3ab2b501951..a240201d1f3 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 "" "" "" "imgui mt32emu"
+add_engine testbed "TestBed: the Testing framework" no "" "" "" "imgui midi"
diff --git a/engines/tinsel/configure.engine b/engines/tinsel/configure.engine
index 3424a3dc025..98c7ee91daf 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 tinygl"
+add_engine tinsel "Tinsel" yes "" "" "" "midi tinygl"
diff --git a/engines/toltecs/configure.engine b/engines/toltecs/configure.engine
index 56b7e019469..66da4554c26 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" "mt32emu"
+add_engine toltecs "3 Skulls of the Toltecs" yes "" "" "highres" "midi"
diff --git a/engines/touche/configure.engine b/engines/touche/configure.engine
index 1a46ecc30e6..4dfded2b02c 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" "mt32emu"
+add_engine touche "Touche: The Adventures of the Fifth Musketeer" yes "" "" "highres" "midi"
diff --git a/engines/twine/configure.engine b/engines/twine/configure.engine
index 6faedfac00c..c2496a8d61e 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" "imgui mt32emu"
+add_engine twine "Little Big Adventure" yes "" "" "highres" "imgui midi"
diff --git a/engines/ultima/configure.engine b/engines/ultima/configure.engine
index 1b4564b406a..4476f77d2ae 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" "" "mt32emu"
+add_engine ultima "Ultima" yes "ultima1 ultima4 ultima6 ultima8" "" "midi"
 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 f834aad6718..371f4ff9b96 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" "mt32emu"
+add_engine vcruise "V-Cruise" yes "" "" "16bit highres" "midi"
diff --git a/engines/zvision/configure.engine b/engines/zvision/configure.engine
index 50a6ab503b8..9d681be3789 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" "mt32emu"
+add_engine zvision "Z-Vision" yes "" "" "freetype2 16bit highres" "midi"


Commit: be4ac56d3bf94a0cd9de1c16706689eb4db58279
    https://github.com/scummvm/scummvm/commit/be4ac56d3bf94a0cd9de1c16706689eb4db58279
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-12-26T22:57:11+01:00

Commit Message:
CONFIGURE: Turned MPC into a component

Changed paths:
    audio/module.mk
    configure
    engines/qdengine/configure.engine


diff --git a/audio/module.mk b/audio/module.mk
index dc97b834126..22a12529c1a 100644
--- a/audio/module.mk
+++ b/audio/module.mk
@@ -36,7 +36,6 @@ MODULE_OBJS := \
 	decoders/iff_sound.o \
 	decoders/mac_snd.o \
 	decoders/mp3.o \
-	decoders/mpc.o \
 	decoders/qdm2.o \
 	decoders/quicktime.o \
 	decoders/raw.o \
@@ -93,6 +92,11 @@ MODULE_OBJS += \
 	softsynth/fmtowns_pc98/towns_pc98_plugins.o
 endif
 
+ifdef USE_MPCDEC
+MODULE_OBJS += \
+	decoders/mpc.o
+endif
+
 ifdef USE_MT32EMU
 MODULE_OBJS += \
 	softsynth/mt32.o
diff --git a/configure b/configure
index 84a1bcc9d54..76b40668cfb 100755
--- a/configure
+++ b/configure
@@ -327,6 +327,7 @@ add_component lua "Lua" "_lua" "USE_LUA"
 add_component vpx "libvpx" "_vpx" "USE_VPX"
 add_component theoradec "libtheoradec" "_theoradec" "USE_THEORADEC"
 add_component midi "MIDI synthesis" "_midi" "USE_MIDI"
+add_component mpc "MPC" "_libmpcdec" "USE_MPCDEC"
 add_component sid_audio "SID audio" "_sid_audio" "USE_SID_AUDIO"
 add_component tinygl "TinyGL" "_tinygl" "USE_TINYGL"
 add_component vgmtrans_audio "VGMTrans Soundfont audio" "_vgmtrans_audio" "USE_VGMTRANS_AUDIO"
@@ -5941,7 +5942,6 @@ EOF
 	fi
 fi
 
-define_in_config_if_yes "$_libmpcdec" "USE_MPCDEC"
 echo "$_libmpcdec"
 
 #
diff --git a/engines/qdengine/configure.engine b/engines/qdengine/configure.engine
index dc5239cb6a4..c988b288866 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" "imgui"
+add_engine qdengine "QD Engine" yes "" "" "vorbis 16bit highres mpeg2" "imgui mpc"


Commit: 74c2cb0c13ee43c5dda181920ed242e1631172a5
    https://github.com/scummvm/scummvm/commit/74c2cb0c13ee43c5dda181920ed242e1631172a5
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-12-26T23:04:48+01:00

Commit Message:
CONFIGURE: Added universaltracker as a meta-component

This could disable both MikMod and OpenMPT as the universal tracker
libraries

Changed paths:
    configure
    engines/ags/configure.engine
    engines/sludge/configure.engine
    engines/testbed/configure.engine


diff --git a/configure b/configure
index 76b40668cfb..1ce6f89a884 100755
--- a/configure
+++ b/configure
@@ -296,6 +296,7 @@ _fmtowns_pc98_audio=auto
 _sid_audio=auto
 _vgmtrans_audio=auto
 _midi=auto
+_universaltracker=auto
 
 # Add (virtual) features
 add_feature 16bit "16bit color" "_16bit"
@@ -330,6 +331,7 @@ add_component midi "MIDI synthesis" "_midi" "USE_MIDI"
 add_component mpc "MPC" "_libmpcdec" "USE_MPCDEC"
 add_component sid_audio "SID audio" "_sid_audio" "USE_SID_AUDIO"
 add_component tinygl "TinyGL" "_tinygl" "USE_TINYGL"
+add_component universaltracker "External Tracker Libraries" "_universaltracker" "USE_UNIVERSALTRACKER"
 add_component vgmtrans_audio "VGMTrans Soundfont audio" "_vgmtrans_audio" "USE_VGMTRANS_AUDIO"
 
 # The following list of features cannot be declared as components
@@ -4195,6 +4197,13 @@ if test "$_midi" = no ; then
 	echo "   Disabling mt32emu, fluidsynth, fluidlite, timidity and sonivox because MIDI is unused by enabled engines"
 fi
 
+if test "$_universaltracker" = no ; then
+	_libmikmod=no
+	_libopenmpt=no
+
+	echo "   Disabling MikMod and OpenMPT because Universal Tracker playback is unused by enabled engines"
+fi
+
 rm -f engines.awk.out
 
 echo "...check complete"
diff --git a/engines/ags/configure.engine b/engines/ags/configure.engine
index 00ad34776c4..d840bd5396f 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 midi"
+add_engine ags "Adventure Game Studio" yes "" "" "16bit mad" "theoradec midi universaltracker"
diff --git a/engines/sludge/configure.engine b/engines/sludge/configure.engine
index 5308e132735..fe8362d09df 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" "vpx"
+add_engine sludge "Sludge" no "" "" "16bit png" "vpx universaltracker"
diff --git a/engines/testbed/configure.engine b/engines/testbed/configure.engine
index a240201d1f3..eca82ae5d4d 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 "" "" "" "imgui midi"
+add_engine testbed "TestBed: the Testing framework" no "" "" "" "imgui midi universaltracker"

More information about the Scummvm-git-logs mailing list