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>
Showing
- Makefile.objs 1 addition, 0 deletionsMakefile.objs
- audio/Makefile.objs 6 additions, 6 deletionsaudio/Makefile.objs
- audio/audio_int.h 1 addition, 1 deletionaudio/audio_int.h
- configure 18 additions, 13 deletionsconfigure
- include/qemu/module.h 1 addition, 0 deletionsinclude/qemu/module.h
- include/ui/console.h 11 additions, 64 deletionsinclude/ui/console.h
- target/unicore32/Makefile.objs 4 additions, 0 deletionstarget/unicore32/Makefile.objs
- ui/Makefile.objs 20 additions, 11 deletionsui/Makefile.objs
- ui/cocoa.m 13 additions, 1 deletionui/cocoa.m
- ui/console.c 59 additions, 0 deletionsui/console.c
- ui/curses.c 13 additions, 1 deletionui/curses.c
- ui/egl-headless.c 19 additions, 1 deletionui/egl-headless.c
- ui/gtk.c 15 additions, 2 deletionsui/gtk.c
- ui/sdl.c 13 additions, 11 deletionsui/sdl.c
- ui/sdl2.c 15 additions, 2 deletionsui/sdl2.c
- vl.c 11 additions, 63 deletionsvl.c
Loading
Please register or sign in to comment