diff --git a/docs/contents.html b/docs/contents.html index 257b13f68a7..b348d3d17f3 100644 --- a/docs/contents.html +++ b/docs/contents.html @@ -37,8 +37,8 @@ a:visited { Download / Install diff --git a/docs/install.html b/docs/install.html index 16ef013688a..2d72506f67d 100644 --- a/docs/install.html +++ b/docs/install.html @@ -1,58 +1,72 @@ -Compilation and Installation +Compiling and Installing -

Compilation and Installation

+

Compiling and Installing

  1. Unix / X11 +
  2. Windows -
  3. VMS
  4. Other
- +

1. Unix/X11 Compilation and Installation

-

1.1 Prerequisites for DRI and Hardware Acceleration

+ +

1.1 Prerequisites for DRI and hardware acceleration

-To build Mesa 7.1 with DRI-based hardware acceleration you must first have -the DRM version 2.3.1. +The following are required for DRI-based hardware acceleration with Mesa 7.3:

-

-You should also be using the Xorg server version 1.4 or 1.5. +

- -

1.2 Autoconf Compilation

+ +

1.2 Building with Autoconf

Mesa may be built using autoconf. This should work well on most GNU-based systems. -When that fails, the traditional Mesa build system is available. +If that fails the traditional Mesa build system is available. -

1.3 Traditional Compilation

+ +

1.3 Building with traditional Makefiles

The traditional Mesa build system is based on a collection of pre-defined system configurations.

-To see the list of configurations, type make alone. -Then choose a configuration from the list and type make configname. +To see the list of configurations, just type make. +Then choose a configuration from the list and type make +configname.

@@ -66,7 +80,7 @@ allow you to run OpenGL/GLX applications on any X server (regardless of whether it supports the GLX X server extension). You will not be able to use hardware 3D acceleration.

-To compile stand-alone Mesa type make in the top-level directory. +To compile stand-alone Mesa type make in the top-level directory. You'll see a list of supported system configurations. Choose one from the list (such as linux-x86), and type:

@@ -109,6 +123,7 @@ Later, if you want to rebuild for a different configuration run

+

1.4 The libraries

@@ -169,6 +184,7 @@ If you built the DRI hardware drivers, you'll also see the DRI drivers: +

1.5 Running the demos

@@ -244,6 +260,7 @@ Retrace your steps if this doesn't look right.

+

1.6 Installing the header and library files

@@ -284,7 +301,8 @@ This is a handy way to compare multiple OpenGL implementations.

-

1.7 Building OpenGL Programs With pkg-config

+ +

1.7 Building OpenGL programs with pkg-config

Running make install will install package configuration files @@ -314,25 +332,15 @@ Please see the README.WIN32 file. - - -

3. VMS Compilation and Installation

- -

-Please see the README.VMS file. -

- - - - -

4. Other systems

+

3. Other systems

Documentation for other environments (some may be very out of date):