docs: correct name for GL_OES_primitive_bounding_box

[mesa.git] / docs / install.html

diff --git a/docs/install.html b/docs/install.html
index 24492a786a49b28318b0f2e76401dfeaf810f663..8b349c40b9da23b7d2433cbe636b0405675f8528 100644 (file)
--- a/docs/install.html
+++ b/docs/install.html
@@ -34,20 +34,32 @@
 
 <h2>1.1 General</h2>
 <ul>
+<li><a href="http://www.python.org/">Python</a> - Python is required.
+Version 2.6.4 or later should work.
+</li>
+<br>
+<li><a href="http://www.makotemplates.org/">Python Mako module</a> -
+Python Mako module is required. Version 0.3.4 or later should work.
+</li>
+</br>
+<li><a href="http://www.scons.org/">SCons</a> is required for building on
+Windows and optional for Linux (it's an alternative to autoconf/automake.)
+</li>
+<br>
 <li>lex / yacc - for building the GLSL compiler.
+<br>
+<br>
 On Linux systems, flex and bison are used.
 Versions 2.5.35 and 2.4.1, respectively, (or later) should work.
 <br>
 <br>
 On Windows with MinGW, install flex and bison with:
 <pre>mingw-get install msys-flex msys-bison</pre>
+For MSVC on Windows, install
+<a href="http://winflexbison.sourceforge.net/">Win flex-bison</a>.
 </li>
-<li>python - Python is needed for building the Gallium components.
-Version 2.6.4 or later should work.
-<br>
 <br>
-To build OpenGL ES 1.1 and 2.0 you'll also need
-<a href="http://xmlsoft.org/sources/win32/python/libxml2-python-2.7.7.win32-py2.7.exe">libxml2-python</a>.
+<li>For building on Windows, Microsoft Visual Studio 2013 or later is required.
 </li>
 </ul>
 
@@ -61,8 +73,7 @@ The following are required for DRI-based hardware acceleration with Mesa:
 <ul>
 <li><a href="http://xorg.freedesktop.org/releases/individual/proto/">
 dri2proto</a> version 2.6 or later
-<li><a href="http://dri.freedesktop.org/libdrm/">libDRM</a>
-version 2.4.33 or later
+<li><a href="http://dri.freedesktop.org/libdrm/">libDRM</a> latest version
 <li>Xorg server version 1.5 or later
 <li>Linux 2.6.28 or later
 </ul>
@@ -73,7 +84,7 @@ the needed dependencies:
 <pre>
   sudo yum install flex bison imake libtool xorg-x11-proto-devel libdrm-devel \
   gcc-c++ xorg-x11-server-devel libXi-devel libXmu-devel libXdamage-devel git \
-  expat-devel llvm-devel
+  expat-devel llvm-devel python-mako
 </pre>
 
 
@@ -118,14 +129,13 @@ by -debug for debug builds.
 To build Mesa with SCons for Windows on Linux using the MinGW crosscompiler toolchain do
 </p>
 <pre>
-    scons platform=windows toolchain=crossmingw machine=x86 mesagdi libgl-gdi
+    scons platform=windows toolchain=crossmingw machine=x86 libgl-gdi
 </pre>
 <p>
 This will create:
 </p>
 <ul>
-<li>build/windows-x86-debug/mesa/drivers/windows/gdi/opengl32.dll &mdash; Mesa + swrast, binary compatible with Windows's opengl32.dll
-<li>build/windows-x86-debug/gallium/targets/libgl-gdi/opengl32.dll &mdash; Mesa + Gallium + softpipe, binary compatible with Windows's opengl32.dll
+<li>build/windows-x86-debug/gallium/targets/libgl-gdi/opengl32.dll &mdash; Mesa + Gallium + softpipe (or llvmpipe), binary compatible with Windows's opengl32.dll
 </ul>
 <p>
 Put them all in the same directory to test them.