diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-03-13 14:03:31 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-03-13 14:03:31 +0000 |
| commit | dea46359989121b43924cd89acd03795383f54f6 (patch) | |
| tree | f3967613648e7a67988bf3aa36bec09394fc22d1 /hw | |
| parent | f3dd251de1f87c1d7492fca742924f004b7091cd (diff) | |
| parent | 43db7c3d484943f62019434d919367c9e3e4402a (diff) | |
| download | qemu-dea46359989121b43924cd89acd03795383f54f6.zip qemu-dea46359989121b43924cd89acd03795383f54f6.tar.gz qemu-dea46359989121b43924cd89acd03795383f54f6.tar.bz2 | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-sdl-20150312-2' into staging
misc ui patches, mostly sdl related.
# gpg: Signature made Thu Mar 12 14:51:07 2015 GMT using RSA key ID D3E87138
# 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>"
* remotes/kraxel/tags/pull-sdl-20150312-2:
pixman: add a bunch of PIXMAN_BE_* defines for 32bpp
Allow the use of X11 from a non standard location.
configure: opengl overhaul
sdl: Fix crash when calling sdl_switch() with NULL surface
sdl: Refresh debug statements
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/display/Makefile.objs | 3 | ||||
| -rw-r--r-- | hw/lm32/milkymist-hw.h | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs index 7ed76a9..e73cb7d 100644 --- a/hw/display/Makefile.objs +++ b/hw/display/Makefile.objs @@ -20,7 +20,8 @@ common-obj-$(CONFIG_ZAURUS) += tc6393xb.o ifeq ($(CONFIG_MILKYMIST_TMU2),y) common-obj-y += milkymist-tmu2.o -libs_softmmu += $(GLX_LIBS) +milkymist-tmu2.o-cflags := $(OPENGL_CFLAGS) +libs_softmmu += $(OPENGL_LIBS) endif obj-$(CONFIG_OMAP) += omap_dss.o diff --git a/hw/lm32/milkymist-hw.h b/hw/lm32/milkymist-hw.h index 5317ce6..8d20cac 100644 --- a/hw/lm32/milkymist-hw.h +++ b/hw/lm32/milkymist-hw.h @@ -86,7 +86,7 @@ static inline DeviceState *milkymist_pfpu_create(hwaddr base, return dev; } -#ifdef CONFIG_GLX +#ifdef CONFIG_OPENGL #include <X11/Xlib.h> #include <GL/glx.h> static const int glx_fbconfig_attr[] = { @@ -100,7 +100,7 @@ static const int glx_fbconfig_attr[] = { static inline DeviceState *milkymist_tmu2_create(hwaddr base, qemu_irq irq) { -#ifdef CONFIG_GLX +#ifdef CONFIG_OPENGL DeviceState *dev; Display *d; GLXFBConfig *configs; |