Commit 8281db4d authored by Thiemo Seufer's avatar Thiemo Seufer
Browse files

Add -m64 to OS_LDFLAGS for Solaris/x86_64. Use OS_CFLAGS when looking for 

libSDL. Patch by Ben Taylor.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3695 c046a42c-6fe2-441c-8c8c-71466251a162
parent d5db4246

configure

+3 −2
Original line number Diff line number Diff line
@@ -364,6 +364,7 @@ esac 
if [ "$solaris" = "yes" -a  "$cpu" = "x86_64" ] ; then

    CFLAGS="${CFLAGS} -m64"

    OS_CFLAGS="${OS_CFLAGS} -m64"

    OS_LDFLAGS="${OS_LDFLAGS} -m64"

fi



if [ "$solaris" = "yes" -a  "$cpu" = "i386" ] ; then
@@ -599,7 +600,7 @@ cat > $TMPC << EOF 
#undef main /* We don't want SDL to override our main() */

int main( void ) { return SDL_Init (SDL_INIT_VIDEO); }

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

        if $cc -o $TMPE ${OS_CFLAGS} `$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
@@ -618,7 +619,7 @@ EOF 
                    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

                if $cc -o $TMPE ${OS_CFLAGS} `$sdl_config --cflags 2> /dev/null` $TMPC $sdl_static_libs 2> /dev/null; then

                    sdl_static=yes

                fi

            fi # static link