diff options
| -rwxr-xr-x | configure | 30 | ||||
| -rw-r--r-- | hw/lm32/Makefile.objs | 2 | ||||
| -rw-r--r-- | hw/milkymist-hw.h | 4 |
3 files changed, 18 insertions, 18 deletions
@@ -217,7 +217,7 @@ spice="" rbd="" smartcard_nss="" usb_redir="" -opengl="" +glx="" zlib="yes" guest_agent="yes" want_tools="yes" @@ -858,9 +858,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" ;; @@ -2435,9 +2435,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> @@ -2445,13 +2445,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 @@ -3429,7 +3429,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" @@ -3740,8 +3740,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 @@ -4019,7 +4019,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 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; |