diff options
author | Eugene Sandulenko | 2018-04-07 12:21:43 +0200 |
---|---|---|
committer | Eugene Sandulenko | 2018-04-07 12:22:18 +0200 |
commit | 52fc7e34d87883c65ed99d8b8bdcc8269a0a9122 (patch) | |
tree | 75b48d81410455efc2b437978cc3d114cfeb4ea5 /configure | |
parent | 00e8bc1945ee0727bb77a8e48f8a20edb0619068 (diff) | |
download | scummvm-rg350-52fc7e34d87883c65ed99d8b8bdcc8269a0a9122.tar.gz scummvm-rg350-52fc7e34d87883c65ed99d8b8bdcc8269a0a9122.tar.bz2 scummvm-rg350-52fc7e34d87883c65ed99d8b8bdcc8269a0a9122.zip |
CONFIGURE: Do not even try to build Nuked OPL when disabled
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 21 |
1 files changed, 12 insertions, 9 deletions
@@ -368,14 +368,6 @@ 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. @@ -390,6 +382,16 @@ define_in_config_if_yes() { 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 # @@ -2338,6 +2340,7 @@ case $_host_os in append_var CXXFLAGS "-Wno-format" add_line_to_config_mk 'AMIGAOS = 1' _port_mk="backends/platform/sdl/amigaos/amigaos.mk" + _nuked_opl=no ;; android) case $_host in @@ -3901,7 +3904,7 @@ 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' +define_in_config_if_no "$_nuked_opl" 'DISABLE_NUKED_OPL' # # Check whether 16bit color support is requested |