| Message ID | 1439565052-3457-1-git-send-email-peter.maydell@linaro.org |
|---|---|
| State | Accepted |
| Commit | a30878e708c2149ce07d709a8b62edd944628449 |
| Headers | show |
On 14 August 2015 at 16:10, Peter Maydell <peter.maydell@linaro.org> wrote: > The cocoa GUI frontend assumes it is the only GUI (it redefines > main() so it always gets control before the rest of QEMU), so > it does not play well with other UIs like SDL or GTK. (Mostly > people building QEMU on OSX don't have the necessary dependencies > available for configure to build those other front ends, so > mostly this problem goes unnoticed.) > > Make configure automatically disable the SDL and GTK front ends > if the cocoa front end is enabled. (We were sort of attempting > to do this for SDL before, but not in a way that worked very well.) > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Applied to master, thanks. -- PMM
diff --git a/configure b/configure index cd219d8..826858e 100755 --- a/configure +++ b/configure @@ -956,7 +956,6 @@ for opt do ;; --enable-cocoa) cocoa="yes" ; - sdl="no" ; audio_drv_list="coreaudio `echo $audio_drv_list | sed s,coreaudio,,g`" ;; --disable-system) softmmu="no" @@ -1711,6 +1710,21 @@ else fi ########################################## +# cocoa implies not SDL or GTK +# (the cocoa UI code currently assumes it is always the active UI +# and doesn't interact well with other UI frontend code) +if test "$cocoa" = "yes"; then + if test "$sdl" = "yes"; then + error_exit "Cocoa and SDL UIs cannot both be enabled at once" + fi + if test "$gtk" = "yes"; then + error_exit "Cocoa and GTK UIs cannot both be enabled at once" + fi + gtk=no + sdl=no +fi + +########################################## # L2TPV3 probe cat > $TMPC <<EOF @@ -2287,9 +2301,7 @@ EOF if test "$_sdlversion" -lt 121 ; then sdl_too_old=yes else - if test "$cocoa" = "no" ; then - sdl=yes - fi + sdl=yes fi # static link with sdl ? (note: sdl.pc's --static --libs is broken)
The cocoa GUI frontend assumes it is the only GUI (it redefines main() so it always gets control before the rest of QEMU), so it does not play well with other UIs like SDL or GTK. (Mostly people building QEMU on OSX don't have the necessary dependencies available for configure to build those other front ends, so mostly this problem goes unnoticed.) Make configure automatically disable the SDL and GTK front ends if the cocoa front end is enabled. (We were sort of attempting to do this for SDL before, but not in a way that worked very well.) Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- In an ideal world, we'd fix the Cocoa UI front end to play nicely with others, but in the meantime, let's at least give a helpful message to users if they try to select combinations of configure options that won't work. configure | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-)