From 544ab209e75ec3646d7edbafd736dcf4c93738cc Mon Sep 17 00:00:00 2001 From: Dan Nicholson Date: Sun, 30 Dec 2007 08:41:53 -0800 Subject: Allow osmesa to be enabled or disabled The conditional in src/mesa/Makefile currently hardcodes the cases where libOSMesa can be built on libGL. Likewise, the xlib case always includes libOSMesa in the stand-alone target. This changes the conditional to a loop over the DRIVER_DIRS variable. This means that any driver configuration can enable or disable osmesa. The current "stand-alone" rule is changed so that DRIVER_DIRS=x11 and DRIVER_DIRS="x11 osmesa" are both respected. The configure option is changed to --enable-gl-osmesa as this change allows libOSMesa to be built upon any of the libGL-enabling drivers. --- docs/autoconf.html | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'docs') diff --git a/docs/autoconf.html b/docs/autoconf.html index 964ff140ab..518f5d2d41 100644 --- a/docs/autoconf.html +++ b/docs/autoconf.html @@ -116,6 +116,12 @@ be used. In this case, the --with-x, --x-includes and --x-libraries options can control the use of X for Mesa. +
  • --enable-gl-osmesa - The OSMesa +library can be built on top of libGL for drivers that provide it. +This option controls whether to build libOSMesa. By default, this is +enabled for the Xlib driver and disabled otherwise. Note that this +option is different than using OSMesa as the driver. +
  • --enable-debug - This option will enable compiler options and macros to aid in debugging the Mesa libraries.
    • @@ -156,16 +162,6 @@ libraries, as well as the X11 development headers, will be need to support the Xlib driver. - -

    -

    -

    -
  • DRI - This mode uses the DRI hardware drivers for accelerated OpenGL rendering. Enable the DRI drivers with the option -- cgit v1.2.3