diff options
| author | marha <marha@users.sourceforge.net> | 2014-05-23 19:43:56 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-05-23 19:43:56 +0200 |
| commit | 1c96f09adce1625dcbae5fe303d7c551a6c1bad3 (patch) | |
| tree | 70b5bbde90432287ae91513b8a4edcc55fcf9e9e /mesalib/docs/install.html | |
| parent | 697c9a1917acd36a1b99e0d263baf2514446ca11 (diff) | |
| parent | 63bfcd0be46413dda8c22b914d12f66ea5d5c66d (diff) | |
| download | vcxsrv-1c96f09adce1625dcbae5fe303d7c551a6c1bad3.tar.gz vcxsrv-1c96f09adce1625dcbae5fe303d7c551a6c1bad3.tar.bz2 vcxsrv-1c96f09adce1625dcbae5fe303d7c551a6c1bad3.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mapi/glapi/gen/gl_gentable.py
xorg-server/include/servermd.h
Diffstat (limited to 'mesalib/docs/install.html')
| -rw-r--r-- | mesalib/docs/install.html | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/mesalib/docs/install.html b/mesalib/docs/install.html index 5061eded0..f12425fcb 100644 --- a/mesalib/docs/install.html +++ b/mesalib/docs/install.html @@ -34,16 +34,25 @@ <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.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> -</li> -<li>python - Python is needed for building the Gallium components. -Version 2.6.4 or later should work. +For MSVC on Windows, you can find flex/bison programs on the +<a href="ftp://ftp.freedesktop.org/pub/mesa/windows-utils/">Mesa ftp site</a>. </li> </ul> |