thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use sdl-config --prefix to enable better detection of include paths.

Browse source 
svn-id: r30815
This commit is contained in:
Jordi Vilalta Prat 2008-02-07 15:15:10 +00:00
parent 58d58d5100
commit 0657ef6a80
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
configure vendored
View file

@ -238,6 +238,11 @@ find_sdlconfig()
if test -x "$path_dir/$sdlconfig" ; then if test -x "$path_dir/$sdlconfig" ; then
_sdlconfig="$path_dir/$sdlconfig" _sdlconfig="$path_dir/$sdlconfig"
echo $_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 at first sdl-config found in path
break 2 break 2
fi fi
@ -1572,15 +1577,15 @@ case $_backend in
;; ;;
sdl) sdl)
find_sdlconfig find_sdlconfig
INCLUDES="$INCLUDES `$_sdlconfig --cflags`" INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
LIBS="$LIBS `$_sdlconfig --libs`" LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
DEFINES="$DEFINES -DSDL_BACKEND" DEFINES="$DEFINES -DSDL_BACKEND"
MODULES="$MODULES backends/platform/sdl" MODULES="$MODULES backends/platform/sdl"
;; ;;
gp2x) gp2x)
find_sdlconfig find_sdlconfig
INCLUDES="$INCLUDES `$_sdlconfig --cflags`" INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
LIBS="$LIBS `$_sdlconfig --libs`" LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
LDFLAGS="$LDFLAGS -static" LDFLAGS="$LDFLAGS -static"
CXXFLAGS="$CXXFLAGS -march=armv4t" CXXFLAGS="$CXXFLAGS -march=armv4t"
MODULES="$MODULES backends/platform/gp2x" MODULES="$MODULES backends/platform/gp2x"