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 /target | |
parent | 41dfc0dc55f0b338ab3c1d29a1721441b76ebd03 (diff) | |
parent | 96400a148b3e1337e2c451e95bc3c3c69a05b67c (diff) | |
download | qemu-4ee02f53be79f21602ace1ff4057c45bbf86ca64.zip qemu-4ee02f53be79f21602ace1ff4057c45bbf86ca64.tar.gz qemu-4ee02f53be79f21602ace1ff4057c45bbf86ca64.tar.bz2 |
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 'target')
-rw-r--r-- | target/unicore32/Makefile.objs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/target/unicore32/Makefile.objs b/target/unicore32/Makefile.objs index 6b41b1e..35d8bf5 100644 --- a/target/unicore32/Makefile.objs +++ b/target/unicore32/Makefile.objs @@ -2,3 +2,7 @@ obj-y += translate.o op_helper.o helper.o cpu.o obj-y += ucf64_helper.o obj-$(CONFIG_SOFTMMU) += softmmu.o + +# Huh? Uses curses directly instead of using ui/console.h interfaces ... +helper.o-cflags := $(CURSES_CFLAGS) +helper.o-libs := $(CURSES_LIBS) |