aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJordi Vilalta Prat2008-02-07 15:15:10 +0000
committerJordi Vilalta Prat2008-02-07 15:15:10 +0000
commit0657ef6a80d921afcc48b67853f5efffa4ea8f21 (patch)
tree03cefc83702e3ea9ff255dc9d181b39aa65395a1
parent58d58d5100b5b2433192da03b2aa8a993cece605 (diff)
downloadscummvm-rg350-0657ef6a80d921afcc48b67853f5efffa4ea8f21.tar.gz
scummvm-rg350-0657ef6a80d921afcc48b67853f5efffa4ea8f21.tar.bz2
scummvm-rg350-0657ef6a80d921afcc48b67853f5efffa4ea8f21.zip
Use sdl-config --prefix to enable better detection of include paths.
svn-id: r30815
-rwxr-xr-xconfigure13
1 files changed, 9 insertions, 4 deletions
diff --git a/configure b/configure
index 6bff714d9a..906d4bf1c2 100755
--- a/configure
+++ b/configure
@@ -238,6 +238,11 @@ find_sdlconfig()
if test -x "$path_dir/$sdlconfig" ; then
_sdlconfig="$path_dir/$sdlconfig"
echo $_sdlconfig
+ # Save the prefix
+ _sdlpath=$path_dir
+ if test `basename $path_dir` = bin ; then
+ _sdlpath=`dirname $path_dir`
+ fi
# break at first sdl-config found in path
break 2
fi
@@ -1572,15 +1577,15 @@ case $_backend in
;;
sdl)
find_sdlconfig
- INCLUDES="$INCLUDES `$_sdlconfig --cflags`"
- LIBS="$LIBS `$_sdlconfig --libs`"
+ 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 --cflags`"
- LIBS="$LIBS `$_sdlconfig --libs`"
+ INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
+ LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
LDFLAGS="$LDFLAGS -static"
CXXFLAGS="$CXXFLAGS -march=armv4t"
MODULES="$MODULES backends/platform/gp2x"