diff options
| author | Michael Walle | 2013-03-06 20:23:32 +0100 |
|---|---|---|
| committer | Michael Walle | 2013-03-18 19:40:34 +0100 |
| commit | b1e5fff4afd0c47148b0d9f9341887ae2c3eb9af (patch) | |
| tree | 0605eea9250cd853b700e849930936103e9e2c80 /hw | |
| parent | configure: proper OpenGL/GLX probe (diff) | |
| download | qemu-b1e5fff4afd0c47148b0d9f9341887ae2c3eb9af.tar.gz qemu-b1e5fff4afd0c47148b0d9f9341887ae2c3eb9af.tar.xz qemu-b1e5fff4afd0c47148b0d9f9341887ae2c3eb9af.zip | |
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.objs | 2 | ||||
| -rw-r--r-- | hw/milkymist-hw.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/hw/lm32/Makefile.objs b/hw/lm32/Makefile.objs index 4592fe5fc8..68ca90a3e2 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 ced1c5f54e..c047a70a9f 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; |