diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2014-11-20 09:49:44 +0100 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2015-03-12 15:49:57 +0100 |
| commit | da076ffed6b9a9cb6b1afce78a4de743212db36e (patch) | |
| tree | 52e2baee8dff269166497351543d2ec2766025b8 /hw | |
| parent | d28d6505bd72f0d6e3e7a968c60c27f893da976e (diff) | |
configure: opengl overhaul
Rename config option from "glx" to "opengl", glx will not be the only
option for opengl in near future. Also switch over to pkg-config for
opengl support detection.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/display/Makefile.objs | 2 | ||||
| -rw-r--r-- | hw/lm32/milkymist-hw.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs index 7ed76a9c24..e18ea57d1f 100644 --- a/hw/display/Makefile.objs +++ b/hw/display/Makefile.objs @@ -20,7 +20,7 @@ common-obj-$(CONFIG_ZAURUS) += tc6393xb.o ifeq ($(CONFIG_MILKYMIST_TMU2),y) common-obj-y += milkymist-tmu2.o -libs_softmmu += $(GLX_LIBS) +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 5317ce6e2d..8d20cac1db 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; |