aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorMichael Walle <michael@walle.cc>2013-03-06 20:23:32 +0100
committerMichael Walle <michael@walle.cc>2013-03-18 19:40:34 +0100
commitb1e5fff4afd0c47148b0d9f9341887ae2c3eb9af (patch)
tree0605eea9250cd853b700e849930936103e9e2c80 /hw
parentd3fcbb16789c6f975ba6e22d8a2ba477519f51bc (diff)
downloadqemu-b1e5fff4afd0c47148b0d9f9341887ae2c3eb9af.zip
qemu-b1e5fff4afd0c47148b0d9f9341887ae2c3eb9af.tar.gz
qemu-b1e5fff4afd0c47148b0d9f9341887ae2c3eb9af.tar.bz2
configure: rename OpenGL feature to GLX
As the probe now actually checks for the availability of GLX, rename it accordingly. The only user of this feature is the milkymist-tmu2 model. Signed-off-by: Michael Walle <michael@walle.cc>
Diffstat (limited to 'hw')
-rw-r--r--hw/lm32/Makefile.objs2
-rw-r--r--hw/milkymist-hw.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/hw/lm32/Makefile.objs b/hw/lm32/Makefile.objs
index 4592fe5..68ca90a 100644
--- a/hw/lm32/Makefile.objs
+++ b/hw/lm32/Makefile.objs
@@ -11,7 +11,7 @@ obj-y += milkymist-minimac2.o
obj-y += milkymist-pfpu.o
obj-y += milkymist-softusb.o
obj-y += milkymist-sysctl.o
-obj-$(CONFIG_OPENGL) += milkymist-tmu2.o
+obj-$(CONFIG_GLX) += milkymist-tmu2.o
obj-y += milkymist-uart.o
obj-y += milkymist-vgafb.o
obj-y += framebuffer.o
diff --git a/hw/milkymist-hw.h b/hw/milkymist-hw.h
index ced1c5f..c047a70 100644
--- a/hw/milkymist-hw.h
+++ b/hw/milkymist-hw.h
@@ -87,7 +87,7 @@ static inline DeviceState *milkymist_pfpu_create(hwaddr base,
return dev;
}
-#ifdef CONFIG_OPENGL
+#ifdef CONFIG_GLX
#include <X11/Xlib.h>
#include <GL/glx.h>
static const int glx_fbconfig_attr[] = {
@@ -101,7 +101,7 @@ static const int glx_fbconfig_attr[] = {
static inline DeviceState *milkymist_tmu2_create(hwaddr base,
qemu_irq irq)
{
-#ifdef CONFIG_OPENGL
+#ifdef CONFIG_GLX
DeviceState *dev;
Display *d;
GLXFBConfig *configs;