[Scummvm-cvs-logs] SF.net SVN: scummvm:[35982] scummvm/trunk/configure

[fingolfin at users.sourceforge.net]

Revision: 35982
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35982&view=rev
Author:   fingolfin
Date:     2009-01-21 16:15:07 +0000 (Wed, 21 Jan 2009)

Log Message:
-----------
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)

Modified Paths:
--------------
    scummvm/trunk/configure

Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure	2009-01-21 15:38:29 UTC (rev 35981)
+++ scummvm/trunk/configure	2009-01-21 16:15:07 UTC (rev 35982)
@@ -1640,7 +1640,67 @@
 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
 #
 _engines_built_static=""
@@ -1719,66 +1779,7 @@
 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"
 cat > config.h << EOF


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.