diff options
| author | Peter Maydell | 2019-02-01 14:15:10 +0100 |
|---|---|---|
| committer | Peter Maydell | 2019-02-01 14:15:10 +0100 |
| commit | a1bc3e7dc8f89facee6d3c25fb8465f8feccef1f (patch) | |
| tree | 58e842b2a9f750412abb05190b7fd1709bbded5d /hw/display/Makefile.objs | |
| parent | Merge remote-tracking branch 'remotes/xanclic/tags/pull-block-2019-01-31' int... (diff) | |
| parent | ui: remove support for SDL1.2 in favour of SDL2 (diff) | |
| download | qemu-a1bc3e7dc8f89facee6d3c25fb8465f8feccef1f.tar.gz qemu-a1bc3e7dc8f89facee6d3c25fb8465f8feccef1f.tar.xz qemu-a1bc3e7dc8f89facee6d3c25fb8465f8feccef1f.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20190201-pull-request' into staging
ui: fix build with SDL disabled, drop SDL1 support.
# gpg: Signature made Fri 01 Feb 2019 12:30:47 GMT
# gpg: using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/ui-20190201-pull-request:
ui: remove support for SDL1.2 in favour of SDL2
hw/display/milkymist-tmu2: Move inlined code from header to source
hw/display/milkymist-tmu2: Explicit the dependency to both X11 / OpenGL
configure: LM32 Milkymist Texture Mapping Unit (tmu2) also depends of X11
hw/display: Move Milkymist specific hardware out of common-obj list
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/display/Makefile.objs')
| -rw-r--r-- | hw/display/Makefile.objs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs index 97acd5b6cb..7c4ae9a0fd 100644 --- a/hw/display/Makefile.objs +++ b/hw/display/Makefile.objs @@ -25,12 +25,12 @@ common-obj-$(CONFIG_BOCHS_DISPLAY) += edid-region.o common-obj-$(CONFIG_BLIZZARD) += blizzard.o common-obj-$(CONFIG_EXYNOS4) += exynos4210_fimd.o common-obj-$(CONFIG_FRAMEBUFFER) += framebuffer.o -common-obj-$(CONFIG_MILKYMIST) += milkymist-vgafb.o +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_MILKYMIST_TMU2) += milkymist-tmu2.o +milkymist-tmu2.o-cflags := $(X11_CFLAGS) $(OPENGL_CFLAGS) +milkymist-tmu2.o-libs := $(X11_LIBS) $(OPENGL_LIBS) obj-$(CONFIG_OMAP) += omap_dss.o obj-$(CONFIG_OMAP) += omap_lcdc.o |