aboutsummaryrefslogtreecommitdiff
path: root/hw/display
diff options
context:
space:
mode:
authorJeremy White <jwhite@codeweavers.com>2015-01-09 13:08:49 -0600
committerGerd Hoffmann <kraxel@redhat.com>2015-03-12 15:50:11 +0100
commitf676c67e4be3d4687ca67f35432b8ea4c1d4cc38 (patch)
treece2a2288f134a5219acba6f3e5b73b0f11fe9c7d /hw/display
parentda076ffed6b9a9cb6b1afce78a4de743212db36e (diff)
downloadqemu-f676c67e4be3d4687ca67f35432b8ea4c1d4cc38.zip
qemu-f676c67e4be3d4687ca67f35432b8ea4c1d4cc38.tar.gz
qemu-f676c67e4be3d4687ca67f35432b8ea4c1d4cc38.tar.bz2
Allow the use of X11 from a non standard location.
Signed-off-by: Jeremy White <jwhite@codeweavers.com> [ kraxel: solve opengl patch conflicts ] Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Reviewed-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'hw/display')
-rw-r--r--hw/display/Makefile.objs1
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs
index e18ea57..e73cb7d 100644
--- a/hw/display/Makefile.objs
+++ b/hw/display/Makefile.objs
@@ -20,6 +20,7 @@ common-obj-$(CONFIG_ZAURUS) += tc6393xb.o
ifeq ($(CONFIG_MILKYMIST_TMU2),y)
common-obj-y += milkymist-tmu2.o
+milkymist-tmu2.o-cflags := $(OPENGL_CFLAGS)
libs_softmmu += $(OPENGL_LIBS)
endif