[Scummvm-git-logs] scummvm master -> 7f6d431fe301d52d927f4c5b00bc43701c41a2de
sev-
sev at scummvm.org
Sat Apr 7 09:54:28 CEST 2018
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
e0968df671 BASE: Show nuked audio driver only when compiled
ca73d36dc8 CONFIGURE: Add option to disable Nuked OPL and disable it on low-end platforms
7f6d431fe3 JANITORIAL: Add missing endline
Commit: e0968df671229463f7938a7ebea796eb698d0573
https://github.com/scummvm/scummvm/commit/e0968df671229463f7938a7ebea796eb698d0573
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-04-07T09:37:58+02:00
Commit Message:
BASE: Show nuked audio driver only when compiled
Changed paths:
base/commandLine.cpp
diff --git a/base/commandLine.cpp b/base/commandLine.cpp
index a2573d3..10ded95 100644
--- a/base/commandLine.cpp
+++ b/base/commandLine.cpp
@@ -131,7 +131,11 @@ static const char HELP_STRING[] =
" --native-mt32 True Roland MT-32 (disable GM emulation)\n"
" --enable-gs Enable Roland GS mode for MIDI playback\n"
" --output-rate=RATE Select output sample rate in Hz (e.g. 22050)\n"
- " --opl-driver=DRIVER Select AdLib (OPL) emulator (db, mame, nuked)\n"
+ " --opl-driver=DRIVER Select AdLib (OPL) emulator (db, mame"
+#ifndef DISABLE_NUKED_OPL
+ ", nuked"
+#endif
+ ")\n"
" --aspect-ratio Enable aspect ratio correction\n"
" --render-mode=MODE Enable additional render modes (hercGreen, hercAmber,\n"
" cga, ega, vga, amiga, fmtowns, pc9821, pc9801, 2gs,\n"
Commit: ca73d36dc8ab8de48aa33485e5a38901c20fa7a8
https://github.com/scummvm/scummvm/commit/ca73d36dc8ab8de48aa33485e5a38901c20fa7a8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-04-07T09:52:44+02:00
Commit Message:
CONFIGURE: Add option to disable Nuked OPL and disable it on low-end platforms
Changed paths:
configure
diff --git a/configure b/configure
index fbb1372..a6dd166 100755
--- a/configure
+++ b/configure
@@ -187,6 +187,7 @@ _plugin_suffix=
_nasm=auto
_optimization_level=
_default_optimization_level=-O2
+_nuked_opl=yes
# Default commands
_ranlib=ranlib
_strip=strip
@@ -367,6 +368,14 @@ define_in_config_h_if_yes() {
fi
}
+define_in_config_h_if_no() {
+ if test "$1" = no ; then
+ add_line_to_config_h "#define $2"
+ else
+ add_line_to_config_h "#undef $2"
+ fi
+}
+
# Conditionally add definitions to config.h and config.mk. Takes two parameters:
# The first one can be set to 'yes' or 'no'. If 'yes' is used, then
# the line "#define $2" is added to config.h and "$2 = 1" to config.mk.
@@ -969,6 +978,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-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
--disable-savegame-timestamp don't use timestamps for blank savegame descriptions
@@ -1171,6 +1181,8 @@ for ac_option in $@; do
--default-dynamic) _plugins_default=dynamic ;;
--enable-mt32emu) _mt32emu=yes ;;
--disable-mt32emu) _mt32emu=no ;;
+ --enable-nuked-opl) _nuked_opl=yes ;;
+ --disable-nuked-opl) _nuked_opl=no ;;
--enable-translation) _translation=yes ;;
--disable-translation) _translation=no ;;
--enable-vkeybd) _vkeybd=yes ;;
@@ -2655,6 +2667,7 @@ case $_host_os in
append_var DEFINES "-DDISABLE_SID"
append_var DEFINES "-DREDUCE_MEMORY_USAGE"
add_line_to_config_mk 'N64 = 1'
+ _nuked_opl=no
;;
ps2)
append_var CXXFLAGS "-G2"
@@ -2883,6 +2896,7 @@ if test -n "$_host"; then
append_var CXXFLAGS "-mips32"
_backend="dingux"
_mt32emu=no
+ _nuked_opl=no
_optimization_level=-O3
# Disable alsa midi to get the port build on OpenDingux toolchain
_alsa=no
@@ -2964,6 +2978,7 @@ if test -n "$_host"; then
_backend="ds"
_build_scalers=no
_mt32emu=no
+ _nuked_opl=no
_port_mk="backends/platform/ds/ds.mk"
;;
gamecube)
@@ -3187,6 +3202,7 @@ if test -n "$_host"; then
_backend="ps2"
_build_scalers=no
_mt32emu=no
+ _nuked_opl=no
# HACK to enable mad & zlib (they are not properly detected due to linker issues).
# This trick doesn't work for tremor right now, as the PS2 port the resulting library
# libtremor, while our code later on expects it to be called libvorbisidec.
@@ -3404,6 +3420,7 @@ case $_backend in
append_var DEFINES "-DDISABLE_DOSBOX_OPL"
append_var LIBS "-lpng"
append_var LIBS "-Wl,-Map,mapfile.txt"
+ _nuked_opl=no
;;
psp2)
append_var LIBS "-lvitashaders -lSDL2 -lvita2d_fbo -lSceCommonDialog_stub"
@@ -3882,6 +3899,11 @@ fi
define_in_config_if_yes "$_mt32emu" 'USE_MT32EMU'
#
+# Check whether Nuked OPL emulator support is disabled
+#
+define_in_config_h_if_no "$_nuked_opl" 'DISABLE_NUKED_OPL'
+
+#
# Check whether 16bit color support is requested
#
define_in_config_if_yes "$_16bit" 'USE_RGB_COLOR'
@@ -5020,6 +5042,10 @@ if test "$_mt32emu" = yes ; then
echo_n ", MT-32 emulator"
fi
+if test "$_nuked_opl" = yes ; then
+ echo_n ", Nuked OPL emulator"
+fi
+
if test "$_text_console" = yes ; then
echo_n ", text console"
fi
Commit: 7f6d431fe301d52d927f4c5b00bc43701c41a2de
https://github.com/scummvm/scummvm/commit/7f6d431fe301d52d927f4c5b00bc43701c41a2de
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-04-07T09:53:46+02:00
Commit Message:
JANITORIAL: Add missing endline
Changed paths:
audio/softsynth/opl/nuked.cpp
diff --git a/audio/softsynth/opl/nuked.cpp b/audio/softsynth/opl/nuked.cpp
index f65b53e..7e1e9f2 100644
--- a/audio/softsynth/opl/nuked.cpp
+++ b/audio/softsynth/opl/nuked.cpp
@@ -1485,4 +1485,4 @@ void OPL::generateSamples(int16*buffer, int length) {
}
}
-#endif // !DISABLE_NUKED_OPL
\ No newline at end of file
+#endif // !DISABLE_NUKED_OPL
More information about the Scummvm-git-logs
mailing list