diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/autoconf.html | 8 | ||||
| -rw-r--r-- | docs/devinfo.html | 6 | ||||
| -rw-r--r-- | docs/download.html | 5 | ||||
| -rw-r--r-- | docs/faq.html | 6 | ||||
| -rw-r--r-- | docs/license.html | 8 | ||||
| -rw-r--r-- | docs/sourcetree.html | 1 |
6 files changed, 9 insertions, 25 deletions
diff --git a/docs/autoconf.html b/docs/autoconf.html index 936ddcffebb..64bcbd48a67 100644 --- a/docs/autoconf.html +++ b/docs/autoconf.html @@ -21,7 +21,6 @@ <ul> <li><a href="#glu">GLU</a></li> <li><a href="#glw">GLw</a></li> - <li><a href="#glut">GLUT</a></li> </ul> <li><a href="#demos">Demo Program Options</a></li> </ol> @@ -252,13 +251,6 @@ on all drivers. This can be disable with the option if libGLU has been enabled. This can be disable with the option <code>--disable-glw</code>. </li> - -<a name="glut"> -<li><b><em>GLUT</em></b> - The libglut library will be built by default -if libGLU has been enabled and the glut source code from the MesaGLUT -tarball is available. This can be disable with the option -<code>--disable-glut</code>. -</li> </ul> </p> diff --git a/docs/devinfo.html b/docs/devinfo.html index 2d1c125e802..8887dd02624 100644 --- a/docs/devinfo.html +++ b/docs/devinfo.html @@ -161,12 +161,6 @@ Then: <code>git push origin mesa_X_Y</code> <H3>Make the tarballs</H3> <p> -Make a symbolic link from $(DIRECTORY) to 'Mesa'. For example, -<code>ln -s Mesa Mesa-7.5</code> -This is needed in order to make a correct tar file in the next step. -</p> - -<p> Make the distribution files. From inside the Mesa directory: <pre> make tarballs diff --git a/docs/download.html b/docs/download.html index 03fa60b4dc5..3c4d5976c2c 100644 --- a/docs/download.html +++ b/docs/download.html @@ -25,9 +25,8 @@ The Mesa package is named MesaLib-x.y.z.{tar.bz2, tar.gz, zip} where x.y.z is the version. There are three types of compressed archives. </p> <p> -There's also the MesaGLUT-x.y.z.{tar.bz2, tar.gz, zip} packages which -contain Mark Kilgard's GLUT library. -This is optional. +In the past, there was also MesaGLUT-x.y.z.{tar.bz2, tar.gz, zip} packages which +contained Mark Kilgard's GLUT library. Most Linux distributions include an implementation of GLUT (such as freeglut). </p> <p> diff --git a/docs/faq.html b/docs/faq.html index 65e279aac57..071381c5a1c 100644 --- a/docs/faq.html +++ b/docs/faq.html @@ -198,9 +198,9 @@ Mesa's not the solution. <h2><a name="part2">2.3 Where is the GLUT library?</a></h2> <p> -<a name="part2">GLUT (OpenGL Utility Toolkit) is in the separate MesaGLUT-x.y.z.tar.gz file. -If you don't already have GLUT installed, you should grab the MesaGLUT -package and compile it with the rest of Mesa. +<a name="part2">GLUT (OpenGL Utility Toolkit) is no longer in the separate MesaGLUT-x.y.z.tar.gz file. +If you don't already have GLUT installed, you should grab +<a href="http://freeglut.sourceforge.net/">freeglut</a>. </a></p> diff --git a/docs/license.html b/docs/license.html index 44b980d93da..5da8ef1deae 100644 --- a/docs/license.html +++ b/docs/license.html @@ -38,10 +38,10 @@ target="_parent">Silicon Graphics Incorporated</a>. <p> The Mesa distribution consists of several components. Different copyrights -and licenses apply to different components. For example, GLUT is copyrighted -by Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa -device drivers are copyrighted by their authors. See below for a list of -Mesa's main components and the license for each. +and licenses apply to different components. For example, some demo programs +are copyrighted by SGI, some of the Mesa device drivers are copyrighted by +their authors. See below for a list of Mesa's main components and the license +for each. </p> <p> The core Mesa library is licensed according to the terms of the MIT license. diff --git a/docs/sourcetree.html b/docs/sourcetree.html index 08a9a50e9ec..2e2d1d3f275 100644 --- a/docs/sourcetree.html +++ b/docs/sourcetree.html @@ -150,7 +150,6 @@ each directory. <li><b>sgi</b> - GLU from SGI <li><b>mesa</b> - Mesa version of GLU (deprecated) </ul> - <li><b>glut</b> - Mark Kilgard's OpenGL OpenGL Utility Toolkit library <li><b>glx</b> - The GLX library code for building libGL. This is used for direct rendering drivers. It will dynamically load one of the xxx_dri.so drivers. |