[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/12] configure: rename OpenGL feature to GLX
From: |
Michael Walle |
Subject: |
[Qemu-devel] [PATCH 12/12] configure: rename OpenGL feature to GLX |
Date: |
Wed, 6 Mar 2013 23:00:09 +0100 |
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 <address@hidden>
---
configure | 30 +++++++++++++++---------------
hw/lm32/Makefile.objs | 2 +-
hw/milkymist-hw.h | 4 ++--
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/configure b/configure
index 4f0d011..f0c73da 100755
--- a/configure
+++ b/configure
@@ -217,7 +217,7 @@ spice=""
rbd=""
smartcard_nss=""
usb_redir=""
-opengl=""
+glx=""
zlib="yes"
guest_agent="yes"
want_tools="yes"
@@ -857,9 +857,9 @@ for opt do
;;
--enable-vhost-net) vhost_net="yes"
;;
- --disable-opengl) opengl="no"
+ --disable-glx) glx="no"
;;
- --enable-opengl) opengl="yes"
+ --enable-glx) glx="yes"
;;
--disable-rbd) rbd="no"
;;
@@ -2430,9 +2430,9 @@ EOF
fi
##########################################
-# opengl probe, used by milkymist-tmu2
-if test "$opengl" != "no" ; then
- opengl_libs="-lGL -lX11"
+# GLX probe, used by milkymist-tmu2
+if test "$glx" != "no" ; then
+ glx_libs="-lGL -lX11"
cat > $TMPC << EOF
#include <X11/Xlib.h>
#include <GL/gl.h>
@@ -2440,13 +2440,13 @@ if test "$opengl" != "no" ; then
int main(void) { glBegin(0); glXQueryVersion(0,0,0); return 0; }
EOF
if compile_prog "" "-lGL -lX11" ; then
- opengl=yes
+ glx=yes
else
- if test "$opengl" = "yes" ; then
- feature_not_found "opengl"
+ if test "$glx" = "yes" ; then
+ feature_not_found "glx"
fi
- opengl_libs=
- opengl=no
+ glx_libs=
+ glx=no
fi
fi
@@ -3404,7 +3404,7 @@ echo "rbd support $rbd"
echo "xfsctl support $xfs"
echo "nss used $smartcard_nss"
echo "usb net redir $usb_redir"
-echo "OpenGL support $opengl"
+echo "GLX support $glx"
echo "libiscsi support $libiscsi"
echo "build guest agent $guest_agent"
echo "seccomp support $seccomp"
@@ -3711,8 +3711,8 @@ if test "$usb_redir" = "yes" ; then
echo "CONFIG_USB_REDIR=y" >> $config_host_mak
fi
-if test "$opengl" = "yes" ; then
- echo "CONFIG_OPENGL=y" >> $config_host_mak
+if test "$glx" = "yes" ; then
+ echo "CONFIG_GLX=y" >> $config_host_mak
fi
if test "$libiscsi" = "yes" ; then
@@ -3991,7 +3991,7 @@ case "$target_arch2" in
target_nptl="yes"
;;
lm32)
- target_libs_softmmu="$opengl_libs"
+ target_libs_softmmu="$glx_libs"
;;
m68k)
bflt="yes"
diff --git a/hw/lm32/Makefile.objs b/hw/lm32/Makefile.objs
index 4e1843c..c813eb2 100644
--- a/hw/lm32/Makefile.objs
+++ b/hw/lm32/Makefile.objs
@@ -15,7 +15,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 c8bd7e9..e6a081e 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;
--
1.7.2.5
- [Qemu-devel] [PATCH 00/12] target-lm32: various fixes, Michael Walle, 2013/03/06
- [Qemu-devel] [PATCH 02/12] lm32-dis: fix NULL pointer dereference, Michael Walle, 2013/03/06
- [Qemu-devel] [PATCH 01/12] target-lm32: fix debug memory access, Michael Walle, 2013/03/06
- [Qemu-devel] [PATCH 03/12] milkymist-uart: fix receive buffering, Michael Walle, 2013/03/06
- [Qemu-devel] [PATCH 04/12] lm32_uart: fix receive buffering, Michael Walle, 2013/03/06
- [Qemu-devel] [PATCH 05/12] target-lm32: don't log cpu state in translation, Michael Walle, 2013/03/06
- [Qemu-devel] [PATCH 09/12] target-lm32: flush tlb after clearing env, Michael Walle, 2013/03/06
- [Qemu-devel] [PATCH 08/12] target-lm32: remove dead code, Michael Walle, 2013/03/06
- [Qemu-devel] [PATCH 06/12] tests: tcg: lm32: add more test cases, Michael Walle, 2013/03/06
- [Qemu-devel] [PATCH 12/12] configure: rename OpenGL feature to GLX,
Michael Walle <=
- [Qemu-devel] [PATCH 11/12] configure: proper OpenGL/GLX probe, Michael Walle, 2013/03/06
- [Qemu-devel] [PATCH 07/12] target-lm32: fix cmpgui and cmpgeui opcodes, Michael Walle, 2013/03/06
- [Qemu-devel] [PATCH 10/12] target-lm32: use HELPER() macro, Michael Walle, 2013/03/06