diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-03-05 15:16:30 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-03-05 15:16:30 +0000 |
| commit | 4ee02f53be79f21602ace1ff4057c45bbf86ca64 (patch) | |
| tree | 82bd6c34d73ce7ed8ae0ec582aa9940abc42ce8a /Makefile.objs | |
| parent | 41dfc0dc55f0b338ab3c1d29a1721441b76ebd03 (diff) | |
| parent | 96400a148b3e1337e2c451e95bc3c3c69a05b67c (diff) | |
| download | qemu-4ee02f53be79f21602ace1ff4057c45bbf86ca64.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20180305-pull-request' into staging
ui: build curses, gtk and sdl as modules.
# gpg: Signature made Mon 05 Mar 2018 08:48:24 GMT
# gpg: using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/ui-20180305-pull-request:
ui/sdl: build as module
audio: rename CONFIG_* to CONFIG_AUDIO_*
ui/curses: build as module
ui/gtk: build as module
configure: opengl doesn't depend on x11
configure: add X11 vars to config-host.mak
console: add ui module loading support
console: add and use qemu_display_find_default
egl-headless: switch over to new display registry
curses: switch over to new display registry
cocoa: switch over to new display registry
sdl: switch over to new display registry
console: add qemu display registry, add gtk
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'Makefile.objs')
| -rw-r--r-- | Makefile.objs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.objs b/Makefile.objs index d741134cc7..69413d33b1 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -109,6 +109,7 @@ common-obj-y += hw/ common-obj-y += replay/ common-obj-y += ui/ +common-obj-m += ui/ common-obj-y += bt-host.o bt-vhci.o bt-host.o-cflags := $(BLUEZ_CFLAGS) |