thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CONFIGURE: Do not even try to build Nuked OPL when disabled

Browse source
This commit is contained in:
Eugene Sandulenko 2018-04-07 12:21:43 +02:00
parent 00e8bc1945
commit 52fc7e34d8
3 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
audio/module.mk
View file

@ -46,7 +46,6 @@ MODULE_OBJS := \
softsynth/opl/dbopl.o \ softsynth/opl/dbopl.o \
softsynth/opl/dosbox.o \ softsynth/opl/dosbox.o \
softsynth/opl/mame.o \ softsynth/opl/mame.o \
softsynth/opl/nuked.o \
softsynth/fmtowns_pc98/towns_audio.o \ softsynth/fmtowns_pc98/towns_audio.o \
softsynth/fmtowns_pc98/towns_euphony.o \ softsynth/fmtowns_pc98/towns_euphony.o \
softsynth/fmtowns_pc98/towns_midi.o \ softsynth/fmtowns_pc98/towns_midi.o \
@ -61,6 +60,13 @@ MODULE_OBJS := \
softsynth/sid.o \ softsynth/sid.o \
softsynth/wave6581.o softsynth/wave6581.o
ifndef DISABLE_NUKED_OPL
MODULE_OBJS += \
softsynth/opl/nuked.o
endif
ifdef USE_ALSA ifdef USE_ALSA
MODULE_OBJS += \ MODULE_OBJS += \
alsa_opl.o alsa_opl.o

21
configure vendored
View file

@ -368,14 +368,6 @@ define_in_config_h_if_yes() {
fi 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: # 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 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. # the line "#define $2" is added to config.h and "$2 = 1" to config.mk.
@ -390,6 +382,16 @@ define_in_config_if_yes() {
fi fi
} }
define_in_config_if_no() {
if test "$1" = no ; then
add_line_to_config_h "#define $2"
add_line_to_config_mk "$2 = 1"
else
add_line_to_config_h "#undef $2"
add_line_to_config_mk "# $2 = 1"
fi
}
# #
# Determine sdl-config # Determine sdl-config
# #
@ -2338,6 +2340,7 @@ case $_host_os in
append_var CXXFLAGS "-Wno-format" append_var CXXFLAGS "-Wno-format"
add_line_to_config_mk 'AMIGAOS = 1' add_line_to_config_mk 'AMIGAOS = 1'
_port_mk="backends/platform/sdl/amigaos/amigaos.mk" _port_mk="backends/platform/sdl/amigaos/amigaos.mk"
_nuked_opl=no
;; ;;
android) android)
case $_host in case $_host in
@ -3901,7 +3904,7 @@ define_in_config_if_yes "$_mt32emu" 'USE_MT32EMU'
# #
# Check whether Nuked OPL emulator support is disabled # Check whether Nuked OPL emulator support is disabled
# #
define_in_config_h_if_no "$_nuked_opl" 'DISABLE_NUKED_OPL' define_in_config_if_no "$_nuked_opl" 'DISABLE_NUKED_OPL'
# #
# Check whether 16bit color support is requested # Check whether 16bit color support is requested