[Scummvm-cvs-logs] CVS: scummvm configure,1.27,1.28
Jonathan Gray
khalek at users.sourceforge.net
Sat Jul 5 23:22:09 CEST 2003
Update of /cvsroot/scummvm/scummvm
In directory sc8-pr-cvs1:/tmp/cvs-serv25722
Modified Files:
configure
Log Message:
check through list of different sdl-configs, this should make fbsd work out of the box, still need to do an sdl code test though
Index: configure
===================================================================
RCS file: /cvsroot/scummvm/scummvm/configure,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- configure 6 Jul 2003 05:50:49 -0000 1.27
+++ configure 6 Jul 2003 06:21:17 -0000 1.28
@@ -72,6 +72,27 @@
}
#
+# Determine sdl-config
+#
+# TODO: small bit of code to test sdl useability
+find_sdlconfig()
+{
+printf "Looking for sdl-config... "
+sdlconfigs="$_sdlconfig sdl-config sdl11-config sdl12-config"
+CXX=
+for sdlconfig in $sdlconfigs; do
+ if test "-e $sdlconfig" ; then
+ _sdlconfig=$sdlconfig
+ echo $_sdlconfig
+ break
+ else
+ echo "none found!"
+ exit 1
+ fi
+done
+}
+
+#
# Determine a data type with the given length
#
find_type_with_size ()
@@ -428,19 +449,20 @@
echo -n "Backend... "
echo "$_backend"
-echo
#
# Backend related stuff
#
case $_backend in
sdl)
+ find_sdlconfig
INCLUDES="$INCLUDES `$_sdlconfig --cflags`"
LIBS="$LIBS `$_sdlconfig --libs`"
OBJS="$OBJS backends/sdl/sdl-common.o backends/sdl/sdl.o"
MODULES="$MODULES backends/sdl"
;;
sdlgl)
+ find_sdlconfig
INCLUDES="$INCLUDES `$_sdlconfig --cflags`"
LIBS="$LIBS `$_sdlconfig --libs` -lGL"
OBJS="$OBJS backends/sdl/sdl-common.o backends/sdl/sdl_gl.o"
@@ -460,6 +482,7 @@
;;
esac
+echo
echo "Creating config.h"
cat > config.h << EOF
/* This file is automatically generated by configure */
More information about the Scummvm-git-logs
mailing list