diff options
| author | Max Horn | 2009-03-18 21:51:56 +0000 |
|---|---|---|
| committer | Max Horn | 2009-03-18 21:51:56 +0000 |
| commit | 55eb3b0b261c0d5db6ac492f431e047808bf7069 (patch) | |
| tree | c74521e3b3c49aab98d3d24b3966aa0a4b63a4e0 /configure | |
| parent | e47e0242c994ff50da4e8a4e3039b5c2c37af511 (diff) | |
| download | scummvm-rg350-55eb3b0b261c0d5db6ac492f431e047808bf7069.tar.gz scummvm-rg350-55eb3b0b261c0d5db6ac492f431e047808bf7069.tar.bz2 scummvm-rg350-55eb3b0b261c0d5db6ac492f431e047808bf7069.zip | |
configure: We don't use tail anymore, so don't check for it; move (hq) scaler check from the middle to nowhere to a more appropriate spot
svn-id: r39522
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 25 |
1 files changed, 7 insertions, 18 deletions
@@ -918,22 +918,9 @@ fi # # Determine the compiler version - +# echocheck "compiler version" -case $_host_os in - # On Solaris, use Unix-compliant tail - solaris*) - tail=/usr/xpg4/bin/tail - ;; - - # All other OSes: use the tail in PATH - *) - tail=tail - ;; -esac - - cxx_version=`( $CXX -dumpversion ) 2>&1` if test "$?" -gt 0; then cxx_version="not found" @@ -978,7 +965,6 @@ fi # # Do CXXFLAGS now we know the compiler version # - if test "$_cxx_major" -ge "3" ; then case $_host_os in mingw* | cygwin*) @@ -1309,9 +1295,6 @@ add_to_config_h_if_yes $_have_x86 '#define HAVE_X86' add_to_config_h_if_yes $_need_memalign '#define SCUMM_NEED_ALIGNMENT' -add_to_config_mk_if_no $_build_hq_scalers 'DISABLE_HQ_SCALERS = 1' -add_to_config_mk_if_no $_build_scalers 'DISABLE_SCALERS = 1' - # # Check whether plugin support is requested and possible # @@ -1412,6 +1395,12 @@ fi add_to_config_mk_if_yes "$_mt32emu" 'USE_MT32EMU = 1' # +# Check whether to enable the (hq) scalers +# +add_to_config_mk_if_no $_build_hq_scalers 'DISABLE_HQ_SCALERS = 1' +add_to_config_mk_if_no $_build_scalers 'DISABLE_SCALERS = 1' + +# # Check for math lib # cat > $TMPC << EOF |