diff options
| author | Max Horn | 2009-01-21 16:15:07 +0000 |
|---|---|---|
| committer | Max Horn | 2009-01-21 16:15:07 +0000 |
| commit | b50f5ebe9cfa4ede9500b98fbf769cff738dacee (patch) | |
| tree | ac18e5fc610465d28f139d6b00a4a35dc3fc7792 | |
| parent | d3fb5c1ecc9407c1ed70e2e54192a69189e92a4c (diff) | |
| download | scummvm-rg350-b50f5ebe9cfa4ede9500b98fbf769cff738dacee.tar.gz scummvm-rg350-b50f5ebe9cfa4ede9500b98fbf769cff738dacee.tar.bz2 scummvm-rg350-b50f5ebe9cfa4ede9500b98fbf769cff738dacee.zip | |
configure: changed order of backend detection and engine listing (backend detection may fail, e.g. when sdl-config is not found, while engine 'detection' never fails)
svn-id: r35982
| -rwxr-xr-x | configure | 119 |
1 files changed, 60 insertions, 59 deletions
@@ -1640,6 +1640,66 @@ DEFINES="$DEFINES -DDATA_PATH=\\\"$_datadir/scummvm\\\"" DEFINES="$DEFINES -DPLUGIN_DIRECTORY=\\\"$_libdir/scummvm\\\"" +echo_n "Backend... " +echo_n "$_backend" + +if test "$_nasm" = yes ; then + echo_n ", assembly routines" +fi + +if test "$_build_hq_scalers" = yes ; then + echo_n ", HQ scalers" +fi + +if test "$_mt32emu" = yes ; then + echo_n ", MT-32 emu" +fi + +if test "$_vkeybd" = yes ; then + echo_n ", virtual keyboard" +fi + +if test "$_keymapper" = yes ; then + echo ", keymapper" +else + echo +fi + +# +# Backend related stuff +# +case $_backend in + null) + DEFINES="$DEFINES -DUSE_NULL_DRIVER" + MODULES="$MODULES backends/platform/null" + ;; + sdl) + find_sdlconfig + INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`" + LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`" + DEFINES="$DEFINES -DSDL_BACKEND" + MODULES="$MODULES backends/platform/sdl" + ;; + gp2x) + find_sdlconfig + INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`" + LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`" + LDFLAGS="$LDFLAGS -static" + CXXFLAGS="$CXXFLAGS -march=armv4t" + MODULES="$MODULES backends/platform/gp2x" + ;; + iphone) + OBJCFLAGS="$OBJCFLAGS --std=c99" + LIBS="$LIBS -lobjc -framework UIKit -framework CoreGraphics -framework CoreSurface -framework LayerKit -framework GraphicsServices -framework CoreFoundation -framework Foundation -framework AudioToolbox -framework CoreAudio" + DEFINES="$DEFINES -DIPHONE_BACKEND" + MODULES="$MODULES backends/platform/iphone" + ;; + *) + echo "support for $_backend backend not implemented in configure script yet" + exit 1 + ;; +esac + # # Engine selection # @@ -1719,65 +1779,6 @@ if test -n "$_engines_skipped" ; then s/#/ /g' fi -echo_n "Backend... " -echo_n "$_backend" - -if test "$_nasm" = yes ; then - echo_n ", assembly routines" -fi - -if test "$_build_hq_scalers" = yes ; then - echo_n ", HQ scalers" -fi - -if test "$_mt32emu" = yes ; then - echo_n ", MT-32 emu" -fi - -if test "$_vkeybd" = yes ; then - echo_n ", virtual keyboard" -fi - -if test "$_keymapper" = yes ; then - echo ", keymapper" -else - echo -fi - -# -# Backend related stuff -# -case $_backend in - null) - DEFINES="$DEFINES -DUSE_NULL_DRIVER" - MODULES="$MODULES backends/platform/null" - ;; - sdl) - find_sdlconfig - INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`" - LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`" - DEFINES="$DEFINES -DSDL_BACKEND" - MODULES="$MODULES backends/platform/sdl" - ;; - gp2x) - find_sdlconfig - INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`" - LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`" - LDFLAGS="$LDFLAGS -static" - CXXFLAGS="$CXXFLAGS -march=armv4t" - MODULES="$MODULES backends/platform/gp2x" - ;; - iphone) - OBJCFLAGS="$OBJCFLAGS --std=c99" - LIBS="$LIBS -lobjc -framework UIKit -framework CoreGraphics -framework CoreSurface -framework LayerKit -framework GraphicsServices -framework CoreFoundation -framework Foundation -framework AudioToolbox -framework CoreAudio" - DEFINES="$DEFINES -DIPHONE_BACKEND" - MODULES="$MODULES backends/platform/iphone" - ;; - *) - echo "support for $_backend backend not implemented in configure script yet" - exit 1 - ;; -esac echo echo "Creating config.h" |