Commit fd6776422bb97e957f7771a84fd4f1399557b973
1 parent
46ea3397
Use Cocoa and CoreAudio backend by default on Darwin systems, by Pierre
d'Herbemont. git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2368 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
1 changed file
with
12 additions
and
1 deletions
configure
| ... | ... | @@ -128,6 +128,8 @@ Darwin) |
| 128 | 128 | bsd="yes" |
| 129 | 129 | darwin="yes" |
| 130 | 130 | darwin_user="yes" |
| 131 | +cocoa="yes" | |
| 132 | +coreaudio="yes" | |
| 131 | 133 | OS_CFLAGS="-mdynamic-no-pic" |
| 132 | 134 | ;; |
| 133 | 135 | SunOS) |
| ... | ... | @@ -503,7 +505,9 @@ _sdlversion=`$sdl_config --version | sed 's/[^0-9]//g'` |
| 503 | 505 | if test "$_sdlversion" -lt 121 ; then |
| 504 | 506 | sdl_too_old=yes |
| 505 | 507 | else |
| 506 | -sdl=yes | |
| 508 | + if test "$cocoa" = "no" ; then | |
| 509 | + sdl=yes | |
| 510 | + fi | |
| 507 | 511 | fi |
| 508 | 512 | |
| 509 | 513 | # static link with sdl ? |
| ... | ... | @@ -524,6 +528,13 @@ fi # static link |
| 524 | 528 | fi # sdl compile test |
| 525 | 529 | |
| 526 | 530 | fi # cross compilation |
| 531 | + | |
| 532 | +else | |
| 533 | + # Make sure to disable cocoa if sdl was set | |
| 534 | + if test "$sdl" = "yes" ; then | |
| 535 | + cocoa="no" | |
| 536 | + coreaudio="no" | |
| 537 | + fi | |
| 527 | 538 | fi # -z $sdl |
| 528 | 539 | |
| 529 | 540 | ########################################## | ... | ... |