[Scummvm-git-logs] scummvm master -> 89febd4230f42f84b9994cafaac0ed6657b7f136

sev- noreply at scummvm.org
Thu Dec 26 18:32:56 UTC 2024 

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

Summary:
4a70b3507f CONFIGURE: Added fmtowns_pc98_audio as a component
89febd4230 CONFIGURE: Turned sid_audio into a component


Commit: 4a70b3507fa9247e25bf9d72d401b69dbfa2e933
    https://github.com/scummvm/scummvm/commit/4a70b3507fa9247e25bf9d72d401b69dbfa2e933
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-12-26T19:18:49+01:00

Commit Message:
CONFIGURE: Added fmtowns_pc98_audio as a component

Changed paths:
    audio/module.mk
    base/plugins.cpp
    configure
    engines/agos/configure.engine
    engines/dgds/configure.engine
    engines/kyra/configure.engine
    engines/saga/configure.engine
    engines/sci/configure.engine
    engines/scumm/configure.engine


diff --git a/audio/module.mk b/audio/module.mk
index 8f09e585b7d..21db1f8e477 100644
--- a/audio/module.mk
+++ b/audio/module.mk
@@ -61,14 +61,6 @@ MODULE_OBJS := \
 	softsynth/opl/dbopl.o \
 	softsynth/opl/dosbox.o \
 	softsynth/opl/mame.o \
-	softsynth/fmtowns_pc98/pc98_audio.o \
-	softsynth/fmtowns_pc98/pcm_common.o \
-	softsynth/fmtowns_pc98/sega_audio.o \
-	softsynth/fmtowns_pc98/towns_audio.o \
-	softsynth/fmtowns_pc98/towns_euphony.o \
-	softsynth/fmtowns_pc98/towns_pc98_driver.o \
-	softsynth/fmtowns_pc98/towns_pc98_fmsynth.o \
-	softsynth/fmtowns_pc98/towns_pc98_plugins.o \
 	softsynth/appleiigs.o \
 	softsynth/fluidsynth.o \
 	softsynth/mt32.o \
@@ -102,6 +94,18 @@ MODULE_OBJS += \
 	alsa_opl.o
 endif
 
+ifdef USE_FMTOWNS_PC98_AUDIO
+MODULE_OBJS += \
+	softsynth/fmtowns_pc98/pc98_audio.o \
+	softsynth/fmtowns_pc98/pcm_common.o \
+	softsynth/fmtowns_pc98/sega_audio.o \
+	softsynth/fmtowns_pc98/towns_audio.o \
+	softsynth/fmtowns_pc98/towns_euphony.o \
+	softsynth/fmtowns_pc98/towns_pc98_driver.o \
+	softsynth/fmtowns_pc98/towns_pc98_fmsynth.o \
+	softsynth/fmtowns_pc98/towns_pc98_plugins.o
+endif
+
 ifdef ENABLE_OPL2LPT
 MODULE_OBJS += \
 	opl2lpt.o
diff --git a/base/plugins.cpp b/base/plugins.cpp
index 5bef09fbc19..ba6dddf9104 100644
--- a/base/plugins.cpp
+++ b/base/plugins.cpp
@@ -148,9 +148,11 @@ public:
 		LINK_PLUGIN(AMIGA)
 		LINK_PLUGIN(APPLEIIGS)
 		LINK_PLUGIN(MACINTOSH)
+		#if defined(USE_FMTOWNS_PC98_AUDIO)
 		LINK_PLUGIN(TOWNS)
 		LINK_PLUGIN(PC98)
 		LINK_PLUGIN(SEGACD)
+		#endif
 		#if defined(USE_TIMIDITY)
 		LINK_PLUGIN(TIMIDITY)
 		#endif
diff --git a/configure b/configure
index 8fc6bf40eb5..0fbbf2a4efe 100755
--- a/configure
+++ b/configure
@@ -292,6 +292,7 @@ _have_amd64=no
 _imgui=yes
 _indeo=auto
 _hnm=auto
+_fmtowns_pc98_audio=auto
 
 # Add (virtual) features
 add_feature 16bit "16bit color" "_16bit"
@@ -315,6 +316,7 @@ add_feature zlib "zlib" "_zlib"
 add_feature test_cxx11 "Test C++11" "_test_cxx11"
 
 # Components are features which may be disabled if unused by the engines
+add_component fmtowns_pc98_audio "FM-TOWNS/PC98 audio" "_fmtowns_pc98_audio" "USE_FMTOWNS_PC98_AUDIO"
 add_component hnm "HNM" "_hnm" "USE_HNM"
 add_component imgui "Dear ImGui based debugger" "_imgui" "USE_IMGUI"
 add_component indeo "Indeo" "_indeo" "USE_INDEO"
diff --git a/engines/agos/configure.engine b/engines/agos/configure.engine
index 08724771b81..76c740d1cbb 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"
+add_engine agos "AGOS" yes "agos2" "AGOS 1 games" "" "mt32emu fmtowns_pc98_audio"
 add_engine agos2 "AGOS 2 games" yes "" "" "highres"
diff --git a/engines/dgds/configure.engine b/engines/dgds/configure.engine
index 9e44608115c..62e192debee 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"
+add_engine dgds "Dynamix Game Development System" yes "" "" "" "mt32emu fmtowns_pc98_audio"
diff --git a/engines/kyra/configure.engine b/engines/kyra/configure.engine
index b1926148851..f44ba870a54 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"
+add_engine kyra "Kyra" yes "lol eob" "Legend of Kyrandia 1-3" "" "mt32emu fmtowns_pc98_audio"
 add_engine lol "Lands of Lore" yes
 add_engine eob "Eye of the Beholder" yes
diff --git a/engines/saga/configure.engine b/engines/saga/configure.engine
index 06f10dcfa1a..dd3b17f6b93 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"
+add_engine saga "SAGA" yes "ihnm" "ITE" "" "mt32emu fmtowns_pc98_audio"
 add_engine ihnm "IHNM" yes "" "" "highres"
diff --git a/engines/sci/configure.engine b/engines/sci/configure.engine
index 64a106c17d0..ca1bafeb57a 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"
+add_engine sci "SCI" yes "sci32" "SCI 0-1.1 games" "" "mt32emu fmtowns_pc98_audio"
 add_engine sci32 "SCI32 games" yes "" "" "highres"
diff --git a/engines/scumm/configure.engine b/engines/scumm/configure.engine
index cf60bf2b12a..d2671e69fa0 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"
+add_engine scumm "SCUMM" yes "scumm_7_8 he" "v0-v6 games" "" "mt32emu fmtowns_pc98_audio"
 add_engine scumm_7_8 "v7 & v8 games" yes
 add_engine he "HE71+ games" yes "" "" "highres bink"


Commit: 89febd4230f42f84b9994cafaac0ed6657b7f136
    https://github.com/scummvm/scummvm/commit/89febd4230f42f84b9994cafaac0ed6657b7f136
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-12-26T19:30:48+01:00

Commit Message:
CONFIGURE: Turned sid_audio into a component

Changed paths:
    audio/module.mk
    audio/softsynth/sid.cpp
    audio/softsynth/wave6581.cpp
    base/plugins.cpp
    configure
    engines/scumm/configure.engine
    engines/scumm/players/player_sid.cpp
    engines/scumm/scumm.cpp


diff --git a/audio/module.mk b/audio/module.mk
index 21db1f8e477..b9216b75ead 100644
--- a/audio/module.mk
+++ b/audio/module.mk
@@ -66,8 +66,6 @@ MODULE_OBJS := \
 	softsynth/mt32.o \
 	softsynth/eas.o \
 	softsynth/pcspk.o \
-	softsynth/sid.o \
-	softsynth/wave6581.o \
 	soundfont/rawfile.o \
 	soundfont/rifffile.o \
 	soundfont/sf2file.o \
@@ -106,6 +104,12 @@ MODULE_OBJS += \
 	softsynth/fmtowns_pc98/towns_pc98_plugins.o
 endif
 
+ifdef USE_SID_AUDIO
+MODULE_OBJS += \
+	softsynth/sid.o \
+	softsynth/wave6581.o
+endif
+
 ifdef ENABLE_OPL2LPT
 MODULE_OBJS += \
 	opl2lpt.o
diff --git a/audio/softsynth/sid.cpp b/audio/softsynth/sid.cpp
index 20cfb19e808..73c65b1e9c6 100644
--- a/audio/softsynth/sid.cpp
+++ b/audio/softsynth/sid.cpp
@@ -24,13 +24,13 @@
  *  Copyright (C) 2004  Dag Lem <resid at nimrod.no>
  */
 
-#ifndef DISABLE_SID
-
 #include "common/translation.h"
 
 #include "audio/softsynth/sid.h"
 #include "audio/null.h"
 
+#ifdef USE_SID_AUDIO
+
 namespace Resid {
 
 // Fixpoint constants (16.16 bits).
@@ -1454,4 +1454,4 @@ MusicDevices C64MusicPlugin::getDevices() const {
 	REGISTER_PLUGIN_STATIC(C64, PLUGIN_TYPE_MUSIC, C64MusicPlugin);
 //#endif
 
-#endif
+#endif // USE_SID_AUDIO
diff --git a/audio/softsynth/wave6581.cpp b/audio/softsynth/wave6581.cpp
index 45db3827b71..2158c95ecd1 100644
--- a/audio/softsynth/wave6581.cpp
+++ b/audio/softsynth/wave6581.cpp
@@ -24,10 +24,10 @@
  *  Copyright (C) 2004  Dag Lem <resid at nimrod.no>
  */
 
-#ifndef DISABLE_SID
-
 #include "audio/softsynth/sid.h"
 
+#ifdef USE_SID_AUDIO
+
 namespace Resid {
 
 const data8 WaveformGenerator::wave6581__ST[] = {
@@ -2091,4 +2091,4 @@ const data8 WaveformGenerator::wave6581_PST[] = {
 };
 
 }
-#endif
+#endif // USE_SID_AUDIO
diff --git a/base/plugins.cpp b/base/plugins.cpp
index ba6dddf9104..7e93aea1f11 100644
--- a/base/plugins.cpp
+++ b/base/plugins.cpp
@@ -142,7 +142,7 @@ public:
 		LINK_PLUGIN(PCSPK)
 		LINK_PLUGIN(PCJR)
 		LINK_PLUGIN(CMS)
-		#ifndef DISABLE_SID
+		#if defined(USE_SID_AUDIO)
 		LINK_PLUGIN(C64)
 		#endif
 		LINK_PLUGIN(AMIGA)
diff --git a/configure b/configure
index 0fbbf2a4efe..2d8d098cf55 100755
--- a/configure
+++ b/configure
@@ -293,6 +293,7 @@ _imgui=yes
 _indeo=auto
 _hnm=auto
 _fmtowns_pc98_audio=auto
+_sid_audio=auto
 
 # Add (virtual) features
 add_feature 16bit "16bit color" "_16bit"
@@ -324,6 +325,7 @@ 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 sid_audio "SID audio" "_sid_audio" "USE_SID_AUDIO"
 add_component tinygl "TinyGL" "_tinygl" "USE_TINYGL"
 
 # The following list of features cannot be declared as components
@@ -3344,11 +3346,11 @@ EOF
 		append_var DEFINES "-DDISABLE_DOSBOX_OPL"
 		append_var DEFINES "-DDISABLE_FANCY_THEMES"
 		append_var DEFINES "-DDISABLE_NES_APU"
-		append_var DEFINES "-DDISABLE_SID"
 		append_var DEFINES "-DREDUCE_MEMORY_USAGE"
 		add_line_to_config_mk 'N64 = 1'
 		_detection_features_full=no
 		_nuked_opl=no
+		_sid_audio=no
 		;;
 	openbsd*)
 		append_var LDFLAGS "-L/usr/local/lib"
@@ -4030,10 +4032,10 @@ case $_backend in
 	atari)
 		define_in_config_if_yes yes "ATARI"
 		append_var DEFINES "-DDISABLE_LAUNCHERDISPLAY_GRID"
-		append_var DEFINES "-DDISABLE_SID"
 		append_var DEFINES "-DDISABLE_NES_APU"
 		#append_var DEFINES "-DDISABLE_DOSBOX_OPL"
 		append_var LIBS "-lgem"
+		_sid_audio=no
 		;;
 	dc)
 		append_var INCLUDES '-I$(srcdir)/backends/platform/dc'
diff --git a/engines/scumm/configure.engine b/engines/scumm/configure.engine
index d2671e69fa0..98828f1dcaa 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"
+add_engine scumm "SCUMM" yes "scumm_7_8 he" "v0-v6 games" "" "mt32emu 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/scumm/players/player_sid.cpp b/engines/scumm/players/player_sid.cpp
index cc6e8b7e4ce..b6a818d199b 100644
--- a/engines/scumm/players/player_sid.cpp
+++ b/engines/scumm/players/player_sid.cpp
@@ -19,13 +19,13 @@
  *
  */
 
-#ifndef DISABLE_SID
-
 #include "engines/engine.h"
 #include "scumm/players/player_sid.h"
 #include "scumm/scumm.h"
 #include "audio/mixer.h"
 
+#ifdef USE_SID_AUDIO
+
 namespace Scumm {
 
 /*
@@ -1381,4 +1381,4 @@ int Player_SID::getMusicTimer() {
 
 } // End of namespace Scumm
 
-#endif
+#endif // USE_SID_AUDIO
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index dd51b67327a..7c0b84162cf 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -975,7 +975,7 @@ Common::Error ScummEngine::init() {
 		// This is for the Amiga version of Indy3/Loom/Maniac/Zak
 		SearchMan.addSubDirectoryMatching(gameDataDir, "rooms");
 	}
-	
+
 	if ((_game.id == GID_MONKEY || _game.id == GID_MONKEY2) && (_game.features & GF_DOUBLEFINE_PAK)) {
 		// This is for the DoubleFine SE versions of Monkey Island 1 and 2
 		SearchMan.addSubDirectoryMatching(gameDataDir, "audio");
@@ -2306,7 +2306,7 @@ void ScummEngine::setupMusic(int midi) {
 	} else if (_game.platform == Common::kPlatformApple2GS && _game.version == 0){
 		_musicEngine = new Player_AppleII(this, _mixer);
 	} else if (_game.platform == Common::kPlatformC64 && _game.version <= 1) {
-#ifndef DISABLE_SID
+#ifdef USE_SID_AUDIO
 		_musicEngine = new Player_SID(this, _mixer);
 #endif
 	} else if (_game.platform == Common::kPlatformNES && _game.version == 1) {

More information about the Scummvm-git-logs mailing list