diff options
| author | Andre Heider | 2010-05-10 17:25:12 +0000 |
|---|---|---|
| committer | Andre Heider | 2010-05-10 17:25:12 +0000 |
| commit | be0885e9d1edd6963a3060a41fa3b705c84c41f1 (patch) | |
| tree | 1c4c44325ee66e9da29062f4a86c2e330b00d9aa /configure | |
| parent | cdf30ecc5acf689a44156b7afdab7571d519d220 (diff) | |
| download | scummvm-rg350-be0885e9d1edd6963a3060a41fa3b705c84c41f1.tar.gz scummvm-rg350-be0885e9d1edd6963a3060a41fa3b705c84c41f1.tar.bz2 scummvm-rg350-be0885e9d1edd6963a3060a41fa3b705c84c41f1.zip | |
Revert r48979. Instead, make the HQ scalers depend on the normal ones. Configure reflects that now.
svn-id: r48996
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 18 |
1 files changed, 6 insertions, 12 deletions
@@ -1436,7 +1436,6 @@ if test -n "$_host"; then _need_memalign=yes _backend="dc" _build_scalers="no" - _build_hq_scalers="no" _mad="yes" _zlib="yes" add_line_to_config_mk 'ronindir = /usr/local/ronin' @@ -1447,7 +1446,6 @@ if test -n "$_host"; then _need_memalign=yes _backend="wii" _build_scalers="no" - _build_hq_scalers="no" _mt32emu="no" _port_mk="backends/platform/wii/wii.mk" add_line_to_config_mk 'GAMECUBE = 1' @@ -1574,7 +1572,6 @@ if test -n "$_host"; then _need_memalign=yes _backend="ps2" _build_scalers="no" - _build_hq_scalers="no" _mt32emu="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 @@ -1602,7 +1599,6 @@ if test -n "$_host"; then _need_memalign=yes _backend="psp" _build_scalers="no" - _build_hq_scalers="no" _mt32emu="no" _port_mk="backends/platform/psp/psp.mk" ;; @@ -1618,8 +1614,6 @@ if test -n "$_host"; then add_line_to_config_mk 'USE_ARM_SCALER_ASM = 1' _backend="samsungtv" _mt32emu="no" - _build_scalers="yes" - _build_hq_scalers="yes" _vkeybd="yes" ;; wii) @@ -1627,7 +1621,6 @@ if test -n "$_host"; then _need_memalign=yes _backend="wii" _build_scalers="no" - _build_hq_scalers="no" _port_mk="backends/platform/wii/wii.mk" add_line_to_config_mk 'GAMECUBE = 0' add_line_to_config_h "#define DEBUG_WII_USBGECKO" @@ -1913,6 +1906,7 @@ add_to_config_mk_if_yes "$_16bit" 'USE_RGB_COLOR = 1' # Check whether to enable the (hq) scalers # if test "$_build_scalers" = no ; then + _build_hq_scalers=no _def_scalers='#undef USE_SCALERS' else _def_scalers='#define USE_SCALERS' @@ -2318,11 +2312,11 @@ if test "$_16bit" = yes ; then fi if test "$_build_scalers" = yes ; then - echo_n ", scalers" -fi - -if test "$_build_hq_scalers" = yes ; then - echo_n ", HQ scalers" + if test "$_build_hq_scalers" = yes ; then + echo_n ", HQ scalers" + else + echo_n ", scalers" + fi fi if test "$_mt32emu" = yes ; then |