[Scummvm-git-logs] scummvm master -> 8d48420dde2f91b0b5d6152694a2385ff6f3dc0c
bluegr
noreply at scummvm.org
Tue Apr 21 19:16:24 UTC 2026
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
182ad45eae AUDIO: Introduce DISABLE_MAME_OPL
8d48420dde BACKENDS: ATARI: Lite build doesn't need MAME OPL
Commit: 182ad45eae0db5e469f2e61e238eedad30dfa248
https://github.com/scummvm/scummvm/commit/182ad45eae0db5e469f2e61e238eedad30dfa248
Author: Miro Kropacek (miro.kropacek at gmail.com)
Date: 2026-04-21T22:16:19+03:00
Commit Message:
AUDIO: Introduce DISABLE_MAME_OPL
Similar to DISABLE_DOSBOX_OPL and DISABLE_NUKED_OPL. Now with the null
driver available, weaker backends can be completely OPL emulation free.
Changed paths:
audio/fmopl.cpp
audio/softsynth/opl/mame.cpp
audio/softsynth/opl/mame.h
base/commandLine.cpp
diff --git a/audio/fmopl.cpp b/audio/fmopl.cpp
index e24cfff6642..8eba28c3cea 100644
--- a/audio/fmopl.cpp
+++ b/audio/fmopl.cpp
@@ -81,7 +81,9 @@ OPL::OPL() {
const Config::EmulatorDescription Config::_drivers[] = {
{ "auto", "<default>", kAuto, kFlagOpl2 | kFlagDualOpl2 | kFlagOpl3 },
{ "null", _s("None"), kNull, kFlagOpl2 | kFlagDualOpl2 | kFlagOpl3 },
+#ifndef DISABLE_MAME_OPL
{ "mame", _s("MAME OPL emulator"), kMame, kFlagOpl2 },
+#endif
#ifndef DISABLE_DOSBOX_OPL
{ "db", _s("DOSBox OPL emulator"), kDOSBox, kFlagOpl2 | kFlagDualOpl2 | kFlagOpl3 },
#endif
@@ -201,12 +203,14 @@ OPL *Config::create(DriverId driver, OplType type) {
}
switch (driver) {
+#ifndef DISABLE_MAME_OPL
case kMame:
if (type == kOpl2)
return new MAME::OPL();
else
warning("MAME OPL emulator only supports OPL2 emulation");
return nullptr;
+#endif
#ifndef DISABLE_DOSBOX_OPL
case kDOSBox:
diff --git a/audio/softsynth/opl/mame.cpp b/audio/softsynth/opl/mame.cpp
index e2ac8891b4b..59a5dde5fd5 100644
--- a/audio/softsynth/opl/mame.cpp
+++ b/audio/softsynth/opl/mame.cpp
@@ -22,6 +22,8 @@
*
*/
+#ifndef DISABLE_MAME_OPL
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -1253,3 +1255,5 @@ FM_OPL *makeAdLibOPL(int rate) {
} // End of namespace MAME
} // End of namespace OPL
+
+#endif // !DISABLE_MAME_OPL
diff --git a/audio/softsynth/opl/mame.h b/audio/softsynth/opl/mame.h
index b0968f965ad..c313564a732 100644
--- a/audio/softsynth/opl/mame.h
+++ b/audio/softsynth/opl/mame.h
@@ -26,6 +26,8 @@
#ifndef AUDIO_SOFTSYNTH_OPL_MAME_H
#define AUDIO_SOFTSYNTH_OPL_MAME_H
+#ifndef DISABLE_MAME_OPL
+
#include "common/scummsys.h"
#include "common/random.h"
@@ -196,4 +198,6 @@ protected:
} // End of namespace MAME
} // End of namespace OPL
+#endif // !DISABLE_MAME_OPL
+
#endif
diff --git a/base/commandLine.cpp b/base/commandLine.cpp
index c6255f22648..1f5ae0583c6 100644
--- a/base/commandLine.cpp
+++ b/base/commandLine.cpp
@@ -180,7 +180,13 @@ static const char HELP_STRING4[] =
" --enable-gs Enable Roland GS mode for MIDI playback\n"
" --output-channels=CHANNELS Select output channel count (e.g. 2 for stereo)\n"
" --output-rate=RATE Select output sample rate in Hz (e.g. 22050)\n"
- " --opl-driver=DRIVER Select AdLib (OPL) emulator (db, mame"
+ " --opl-driver=DRIVER Select AdLib (OPL) emulator ("
+#ifndef DISABLE_MAME_OPL
+ "mame"
+#endif
+#ifndef DISABLE_DOSBOX_OPL
+ ", db"
+#endif
#ifndef DISABLE_NUKED_OPL
", nuked"
#endif
Commit: 8d48420dde2f91b0b5d6152694a2385ff6f3dc0c
https://github.com/scummvm/scummvm/commit/8d48420dde2f91b0b5d6152694a2385ff6f3dc0c
Author: Miro Kropacek (miro.kropacek at gmail.com)
Date: 2026-04-21T22:16:19+03:00
Commit Message:
BACKENDS: ATARI: Lite build doesn't need MAME OPL
The OPL driver is set to null by default and there is no point in
offering it on a <50 MHz CPU.
Changed paths:
backends/platform/atari/build-release030.sh
backends/platform/atari/readme.txt
backends/platform/atari/readme.txt.in
configure
diff --git a/backends/platform/atari/build-release030.sh b/backends/platform/atari/build-release030.sh
index 446d09b9740..df3c8edefa0 100755
--- a/backends/platform/atari/build-release030.sh
+++ b/backends/platform/atari/build-release030.sh
@@ -9,7 +9,7 @@ cd build-release030
PLATFORM=m68k-atari-mintelf
FASTCALL=false
export ASFLAGS="-m68030"
-export CXXFLAGS="-m68030 -DDISABLE_FANCY_THEMES -DDISABLE_DOSBOX_OPL"
+export CXXFLAGS="-m68030 -DDISABLE_FANCY_THEMES -DDISABLE_DOSBOX_OPL -DDISABLE_MAME_OPL"
export LDFLAGS="-m68030"
export PKG_CONFIG_LIBDIR="$(${PLATFORM}-gcc -print-sysroot)/usr/lib/m68020-60/pkgconfig"
diff --git a/backends/platform/atari/readme.txt b/backends/platform/atari/readme.txt
index cd640f9d230..60d9f745b79 100644
--- a/backends/platform/atari/readme.txt
+++ b/backends/platform/atari/readme.txt
@@ -105,7 +105,7 @@ executable size.
- "null" music driver is automatically enabled (i.e. OPL emulation is never
used but still allows playing speech/sfx samples and/or CD audio).
-- DOSBox OPL emulator is disabled => smaller executable size.
+- DOSBox and MAME OPL emulator is disabled => smaller executable size.
FireBee package
~~~~~~~~~~~~~~~
diff --git a/backends/platform/atari/readme.txt.in b/backends/platform/atari/readme.txt.in
index ef5bec0c5b0..4f0f69eaf26 100644
--- a/backends/platform/atari/readme.txt.in
+++ b/backends/platform/atari/readme.txt.in
@@ -105,7 +105,7 @@ executable size.
- "null" music driver is automatically enabled (i.e. OPL emulation is never
used but still allows playing speech/sfx samples and/or CD audio).
-- DOSBox OPL emulator is disabled => smaller executable size.
+- DOSBox and MAME OPL emulator is disabled => smaller executable size.
FireBee package
~~~~~~~~~~~~~~~
diff --git a/configure b/configure
index 5fabcb57136..97c8097738a 100755
--- a/configure
+++ b/configure
@@ -4230,7 +4230,6 @@ case $_backend in
atari)
append_var DEFINES "-DATARI"
append_var DEFINES "-DDISABLE_NES_APU"
- #append_var DEFINES "-DDISABLE_DOSBOX_OPL"
append_var LIBS "-lgem"
_ogg=no
_vorbis=no
More information about the Scummvm-git-logs
mailing list