diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-05-18 11:39:43 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-05-18 11:39:43 +0100 |
| commit | 30d9081d646cbcb37341738d19e29bf350f3dd66 (patch) | |
| tree | 5a4fb34fb447c09161144ba57c46c15d1536b6bc /hw/display | |
| parent | 681299482681bd56c9628c9a994ab16c6860c358 (diff) | |
| parent | e8dcb8ae5121965ac8c89e6b277ac127e9d08452 (diff) | |
| download | focaccia-qemu-30d9081d646cbcb37341738d19e29bf350f3dd66.tar.gz focaccia-qemu-30d9081d646cbcb37341738d19e29bf350f3dd66.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20180518-pull-request' into staging
ui: bugfixes, move x11 dependency to modules. # gpg: Signature made Fri 18 May 2018 08:40:41 BST # 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-20180518-pull-request: sdl: Move use of surface pointer below check for whether it is NULL ui: add x_keymap.o to modules console: Avoid segfault in screendump Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/display')
| -rw-r--r-- | hw/display/Makefile.objs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs index 3c7c75b94d..11321e466b 100644 --- a/hw/display/Makefile.objs +++ b/hw/display/Makefile.objs @@ -20,6 +20,8 @@ common-obj-$(CONFIG_MILKYMIST) += milkymist-vgafb.o common-obj-$(CONFIG_ZAURUS) += tc6393xb.o common-obj-$(CONFIG_MILKYMIST_TMU2) += milkymist-tmu2.o +milkymist-tmu2.o-cflags := $(X11_CFLAGS) +milkymist-tmu2.o-libs := $(X11_LIBS) obj-$(CONFIG_OMAP) += omap_dss.o obj-$(CONFIG_OMAP) += omap_lcdc.o |