Commit dbb2c92142346306dc132e441ffb7bc14f423cff
1 parent
0d1a29f9
SDL config fix
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1123 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
1 changed file
with
14 additions
and
13 deletions
configure
| ... | ... | @@ -510,23 +510,24 @@ fi |
| 510 | 510 | |
| 511 | 511 | if test "$target_user_only" = "no"; then |
| 512 | 512 | if test "$target_softmmu" = "no" -o "$static" = "yes"; then |
| 513 | - if test "$sdl_static" = "yes" ; then | |
| 514 | - echo "#define CONFIG_SDL 1" >> $config_h | |
| 515 | - echo "CONFIG_SDL=yes" >> $config_mak | |
| 516 | - echo "SDL_LIBS=$sdl_static_libs" >> $config_mak | |
| 517 | - fi | |
| 513 | + sdl1=$sdl_static | |
| 518 | 514 | else |
| 519 | - if test "$sdl" = "yes" ; then | |
| 520 | - echo "#define CONFIG_SDL 1" >> $config_h | |
| 521 | - echo "CONFIG_SDL=yes" >> $config_mak | |
| 515 | + sdl1=$sdl | |
| 516 | + fi | |
| 517 | + if test "$sdl1" = "yes" ; then | |
| 518 | + echo "#define CONFIG_SDL 1" >> $config_h | |
| 519 | + echo "CONFIG_SDL=yes" >> $config_mak | |
| 520 | + if test "$target_softmmu" = "no" -o "$static" = "yes"; then | |
| 521 | + echo "SDL_LIBS=$sdl_static_libs" >> $config_mak | |
| 522 | + else | |
| 522 | 523 | echo "SDL_LIBS=`$sdl_config --libs`" >> $config_mak |
| 523 | 524 | fi |
| 525 | + echo -n "SDL_CFLAGS=`$sdl_config --cflags`" >> $config_mak | |
| 526 | + if [ "${aa}" = "yes" ] ; then | |
| 527 | + echo -n " `aalib-config --cflags`" >> $config_mak ; | |
| 528 | + fi | |
| 529 | + echo "" >> $config_mak | |
| 524 | 530 | fi |
| 525 | - echo -n "SDL_CFLAGS=`$sdl_config --cflags`" >> $config_mak | |
| 526 | - if [ "${aa}" = "yes" ] ; then | |
| 527 | - echo -n " `aalib-config --cflags`" >> $config_mak ; | |
| 528 | - fi | |
| 529 | - echo "" >> $config_mak | |
| 530 | 531 | fi |
| 531 | 532 | |
| 532 | 533 | done # for target in $targets | ... | ... |