diff options
| author | OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> | 2015-10-27 02:45:48 +0900 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2015-11-03 10:13:42 +0100 |
| commit | fb719563676f8958141a5c984e876a9a1b18f48b (patch) | |
| tree | c6929b06939767f8156cb74de7b0f63193b94c82 /hw | |
| parent | e72df72a558cc189bb8681df8059b3a8cff281fc (diff) | |
| download | qemu-fb719563676f8958141a5c984e876a9a1b18f48b.tar.gz qemu-fb719563676f8958141a5c984e876a9a1b18f48b.tar.bz2 qemu-fb719563676f8958141a5c984e876a9a1b18f48b.zip | |
ui/opengl: Reduce build required libraries for opengl
We now use epoxy to load opengl libraries. This means we don't need to
link opengl libraries directly if interfaces handled by epoxy. With
this, we just need epoxy headers and epoxy's *.so to build.
Tested with epoxy-1.3.1.
- sdl2/gtk/console egl stuff doesn't require other than epoxy
- milkymist-tmu2 glx stuff doesn't require other than epoxy
(lm32 test is limited, because can't find mmone-bios.bin, so just test
to load libGL with "./lm32-softmmu/qemu-system-lm32 -M milkymist,accel=qtest")
Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
[ lm32 tested by kraxel ]
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
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, |