diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2011-06-15 18:31:56 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2011-06-15 18:31:56 +0000 |
| commit | 22e1e729600dad1639329185614d094243409359 (patch) | |
| tree | addcd6c187e2aed6deec88d20b0df99ca3559eec /Makefile.objs | |
| parent | c235d7387c850857ec6b0ba8ee28c7e1548f68c0 (diff) | |
| parent | f97742d0d36810ea72a2bd40b3abb890589ea3b8 (diff) | |
Merge branch 'cocoa-for-upstream' of git://repo.or.cz/qemu/afaerber
* 'cocoa-for-upstream' of git://repo.or.cz/qemu/afaerber:
Darwin: Fix compilation warning regarding the deprecated daemon() function
cocoa: Avoid warning related to multiple handleEvent: definitions
cocoa: Revert dependency on VNC
cocoa: Provide central qemu_main() prototype
Fix libfdt warnings on Darwin
configure: Fix check for fdatasync()
Remove warning in printf due to type mismatch
Cocoa: avoid displaying window when command-line contains '-h' or '-help'
Fix compilation warning due to incorrectly specified type
cocoa: do not create a spurious window for -version
Diffstat (limited to 'Makefile.objs')
| -rw-r--r-- | Makefile.objs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.objs b/Makefile.objs index f617ed5b7e..cea15e4a82 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -128,6 +128,7 @@ common-obj-y += $(addprefix audio/, $(audio-obj-y)) ui-obj-y += keymaps.o ui-obj-$(CONFIG_SDL) += sdl.o sdl_zoom.o x_keymap.o +ui-obj-$(CONFIG_COCOA) += cocoa.o ui-obj-$(CONFIG_CURSES) += curses.o vnc-obj-y += vnc.o d3des.o vnc-obj-y += vnc-enc-zlib.o vnc-enc-hextile.o @@ -135,7 +136,6 @@ vnc-obj-y += vnc-enc-tight.o vnc-palette.o vnc-obj-y += vnc-enc-zrle.o vnc-obj-$(CONFIG_VNC_TLS) += vnc-tls.o vnc-auth-vencrypt.o vnc-obj-$(CONFIG_VNC_SASL) += vnc-auth-sasl.o -vnc-obj-$(CONFIG_COCOA) += cocoa.o ifdef CONFIG_VNC_THREAD vnc-obj-y += vnc-jobs-async.o else |