diff options
| author | Peter Maydell | 2015-11-03 11:20:04 +0100 |
|---|---|---|
| committer | Peter Maydell | 2015-11-03 11:20:04 +0100 |
| commit | 130d0bc6594d0cc6591d00312841891b3c187b07 (patch) | |
| tree | a1082905a667d8aab9296beef46a9ce48f6b478e /hw | |
| parent | Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2015-11-02' into ... (diff) | |
| parent | vnc: fix bug: vnc server can't start when 'to' is specified (diff) | |
| download | qemu-130d0bc6594d0cc6591d00312841891b3c187b07.tar.gz qemu-130d0bc6594d0cc6591d00312841891b3c187b07.tar.xz qemu-130d0bc6594d0cc6591d00312841891b3c187b07.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20151103-1' into staging
ui: fixes for vnc, opengl and curses.
# gpg: Signature made Tue 03 Nov 2015 09:53:24 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-ui-20151103-1:
vnc: fix bug: vnc server can't start when 'to' is specified
vnc: allow fall back to RAW encoding
ui/opengl: Reduce build required libraries for opengl
ui/curses: Fix pageup/pagedown on -curses
ui/curses: Support line graphics chars on -curses mode
ui/curses: Fix monitor color with -curses when 256 colors
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/display/milkymist-tmu2.c | 4 | ||||
| -rw-r--r-- | hw/lm32/milkymist-hw.h | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/hw/display/milkymist-tmu2.c b/hw/display/milkymist-tmu2.c index 3e1d0b9c20..e2de281768 100644 --- a/hw/display/milkymist-tmu2.c +++ b/hw/display/milkymist-tmu2.c @@ -30,8 +30,8 @@ #include "qemu/error-report.h" #include <X11/Xlib.h> -#include <GL/gl.h> -#include <GL/glx.h> +#include <epoxy/gl.h> +#include <epoxy/glx.h> enum { R_CTL = 0, diff --git a/hw/lm32/milkymist-hw.h b/hw/lm32/milkymist-hw.h index 8d20cac1db..c8dfb4d2d4 100644 --- a/hw/lm32/milkymist-hw.h +++ b/hw/lm32/milkymist-hw.h @@ -88,7 +88,8 @@ static inline DeviceState *milkymist_pfpu_create(hwaddr base, #ifdef CONFIG_OPENGL #include <X11/Xlib.h> -#include <GL/glx.h> +#include <epoxy/gl.h> +#include <epoxy/glx.h> static const int glx_fbconfig_attr[] = { GLX_GREEN_SIZE, 5, GLX_GREEN_SIZE, 6, |