diff options
| author | Dan Nicholson <dbn.lists@gmail.com> | 2007-12-30 08:41:53 -0800 |
|---|---|---|
| committer | Dan Nicholson <dbn.lists@gmail.com> | 2008-01-11 08:25:15 -0800 |
| commit | 544ab209e75ec3646d7edbafd736dcf4c93738cc (patch) | |
| tree | c8642fb334f36e5bd9b552b09e3236bba1b835a3 /docs/autoconf.html | |
| parent | 540faf5f91057ef311999afc5a6366bebe7dec33 (diff) | |
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.
Diffstat (limited to 'docs/autoconf.html')
| -rw-r--r-- | docs/autoconf.html | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/docs/autoconf.html b/docs/autoconf.html index 964ff140abc..518f5d2d416 100644 --- a/docs/autoconf.html +++ b/docs/autoconf.html @@ -116,6 +116,12 @@ be used. In this case, the <code>--with-x</code>, <code>--x-includes</code> and <code>--x-libraries</code> options can control the use of X for Mesa. </li> +<li><code>--enable-gl-osmesa</code> - The <a href="osmesa.html">OSMesa +library</a> 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. +</li> <li><code>--enable-debug</code> - This option will enable compiler options and macros to aid in debugging the Mesa libraries. </li> @@ -156,16 +162,6 @@ libraries, as well as the X11 development headers, will be need to support the Xlib driver. </li> -<!-- Xlib specific options --> -<p> -<ul> -<li><code>--disable-xlib-osmesa</code> - By default, the OSMesa library -will be built and linked to the Xlib enabled libGL. This option disables -building of libOSMesa. -</li> -</ul> -</p> - <a name="dri"> <li><b><em>DRI</em></b> - This mode uses the DRI hardware drivers for accelerated OpenGL rendering. Enable the DRI drivers with the option |