Nicer script formatting, by Ben Taylor.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3072 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
parent
5b2849688e
commit
069b0bda72
|
@ -536,58 +536,52 @@ EOF
|
||||||
sdl_too_old=no
|
sdl_too_old=no
|
||||||
|
|
||||||
if test -z "$sdl" ; then
|
if test -z "$sdl" ; then
|
||||||
|
sdl_config="sdl-config"
|
||||||
|
sdl=no
|
||||||
|
sdl_static=no
|
||||||
|
|
||||||
sdl_config="sdl-config"
|
if test "$mingw32" = "yes" -a ! -z "$cross_prefix" ; then
|
||||||
sdl=no
|
# win32 cross compilation case
|
||||||
sdl_static=no
|
sdl_config="i386-mingw32msvc-sdl-config"
|
||||||
|
sdl=yes
|
||||||
if test "$mingw32" = "yes" -a ! -z "$cross_prefix" ; then
|
else
|
||||||
# win32 cross compilation case
|
# normal SDL probe
|
||||||
sdl_config="i386-mingw32msvc-sdl-config"
|
|
||||||
sdl=yes
|
|
||||||
else
|
|
||||||
# normal SDL probe
|
|
||||||
cat > $TMPC << EOF
|
cat > $TMPC << EOF
|
||||||
#include <SDL.h>
|
#include <SDL.h>
|
||||||
#undef main /* We don't want SDL to override our main() */
|
#undef main /* We don't want SDL to override our main() */
|
||||||
int main( void ) { return SDL_Init (SDL_INIT_VIDEO); }
|
int main( void ) { return SDL_Init (SDL_INIT_VIDEO); }
|
||||||
EOF
|
EOF
|
||||||
|
if $cc -o $TMPE `$sdl_config --cflags 2> /dev/null` $TMPC `$sdl_config --libs 2> /dev/null` 2> /tmp/qemu-$$-sdl-config.log ; then
|
||||||
|
_sdlversion=`$sdl_config --version | sed 's/[^0-9]//g'`
|
||||||
|
if test "$_sdlversion" -lt 121 ; then
|
||||||
|
sdl_too_old=yes
|
||||||
|
else
|
||||||
|
if test "$cocoa" = "no" ; then
|
||||||
|
sdl=yes
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
if $cc -o $TMPE `$sdl_config --cflags 2> /dev/null` $TMPC `$sdl_config --libs 2> /dev/null` 2> /tmp/qemu-$$-sdl-config.log ; then
|
# static link with sdl ?
|
||||||
_sdlversion=`$sdl_config --version | sed 's/[^0-9]//g'`
|
if test "$sdl" = "yes" ; then
|
||||||
if test "$_sdlversion" -lt 121 ; then
|
aa="no"
|
||||||
sdl_too_old=yes
|
`$sdl_config --static-libs 2>/dev/null | grep \\\-laa > /dev/null` && aa="yes"
|
||||||
|
sdl_static_libs=`$sdl_config --static-libs 2>/dev/null`
|
||||||
|
if [ "$aa" = "yes" ] ; then
|
||||||
|
sdl_static_libs="$sdl_static_libs `aalib-config --static-libs`"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if $cc -o $TMPE `$sdl_config --cflags 2> /dev/null` $TMPC $sdl_static_libs 2> /dev/null; then
|
||||||
|
sdl_static=yes
|
||||||
|
fi
|
||||||
|
fi # static link
|
||||||
|
fi # sdl compile test
|
||||||
|
fi # cross compilation
|
||||||
else
|
else
|
||||||
if test "$cocoa" = "no" ; then
|
# Make sure to disable cocoa if sdl was set
|
||||||
sdl=yes
|
if test "$sdl" = "yes" ; then
|
||||||
fi
|
cocoa="no"
|
||||||
fi
|
coreaudio="no"
|
||||||
|
fi
|
||||||
# static link with sdl ?
|
|
||||||
if test "$sdl" = "yes" ; then
|
|
||||||
aa="no"
|
|
||||||
`$sdl_config --static-libs 2>/dev/null | grep \\\-laa > /dev/null` && aa="yes"
|
|
||||||
sdl_static_libs=`$sdl_config --static-libs 2>/dev/null`
|
|
||||||
if [ "$aa" = "yes" ] ; then
|
|
||||||
sdl_static_libs="$sdl_static_libs `aalib-config --static-libs`"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if $cc -o $TMPE `$sdl_config --cflags 2> /dev/null` $TMPC $sdl_static_libs 2> /dev/null; then
|
|
||||||
sdl_static=yes
|
|
||||||
fi
|
|
||||||
|
|
||||||
fi # static link
|
|
||||||
|
|
||||||
fi # sdl compile test
|
|
||||||
|
|
||||||
fi # cross compilation
|
|
||||||
|
|
||||||
else
|
|
||||||
# Make sure to disable cocoa if sdl was set
|
|
||||||
if test "$sdl" = "yes" ; then
|
|
||||||
cocoa="no"
|
|
||||||
coreaudio="no"
|
|
||||||
fi
|
|
||||||
fi # -z $sdl
|
fi # -z $sdl
|
||||||
|
|
||||||
##########################################
|
##########################################
|
||||||
|
|
Loading…
Reference in New Issue