Merge branch 'master' of github.com:sgothel/jogl

Conflicts:
	doc/HowToBuild.html

1 files changed, 31 insertions, 9 deletions

diff --git a/doc/HowToBuild.html b/doc/HowToBuild.html
index cac35d346..018214a6d 100644
--- a/doc/HowToBuild.html
+++ b/doc/HowToBuild.html
@@ -59,16 +59,26 @@
                         <li> <b><a href="http://ant.apache.org/">Ant</a></b> 1.8.0 or later</li>
                         <li> <b><a href="http://www.kernel.org/pub/software/scm/git/docs/">Git</a></b> 1.6.0 or later<br/>
                             <ul>
-                                <li> <a href="http://www.kernel.org/pub/software/scm/git/">Source Code for GNU/Linux, MacOSX, ..</a></li>
+                                <li> Use your Unix distribution's version, if available, or</li>
+                                <li> <a href="http://www.kernel.org/pub/software/scm/git/">Source Code for GNU/Linux, MacOSX, ..</a>, or</li>
                                 <li> <a href="http://code.google.com/p/msysgit/">Git on Windows</a>,
                                     <a href="http://code.google.com/p/msysgit/downloads/list">download</a> version
                                     <a href="http://code.google.com/p/msysgit/downloads/detail?name=Git-1.7.0.2-preview20100309.exe&can=2&q=">1.7.0</a> or later.</li>
-                            </ul></li>
+                                <li> <a href="http://code.google.com/p/git-osx-installer/">git-osx-installer</a> </li>
+                            </ul>
+                        </li>
+                        <li> Optional <b>NVidia Cg 2.2</b> <br/>
+                            <ul>
+                                <li> <a href="http://developer.nvidia.com/object/cg_download.html">Cg 2.2 Toolkit Download Page</a></li>
+                            </ul>
+                        </li>
+
                         <li> <b>GNU Linux</b> x86, 32- and 64-bit<br/>
                             You may have to install a few developer packages ...
                             <ul>
                                 <li> <b>[K]Ubuntu</b> 10.04 or later
                                     <ul>
+                                        <li>git</li>
                                         <li>gcc</li>
                                         <li>libgl1-mesa-dev</li>
                                         <li>libglu1-mesa-dev</li>
@@ -84,8 +94,9 @@
                                 </li>
                             </ul>
                         </li>
-                        <li> <b>OpenSuSE</b> 10.2 or later 
+                        <li> <b>OpenSuSE</b> 10.2 or later
                             <ul>
+                                <li>git</li>
                                 <li>gcc</li>
                                 <li>x11-devel</li>
                                 <li>mesa-devel</li>
@@ -93,6 +104,7 @@
                         </li>
                         <li> <b>CentOS / Red Hat Enterprise Linux</b> 5.4 or later<br/>
                             <ul>
+                                <li>git</li>
                                 <li>gcc</li>
                                 <li>mesa-libGL-devel</li>
                                 <li>libICE-devel</li>
@@ -113,21 +125,31 @@
                         </li>
                         <li> <b>MacOSX</b> Intel
                             <ul>
+                                <li> git, see above </li>
                                 <li> <a href="http://www.apple.com/macosx/">Mac OS X</a> 10.3 (note: will not work with earlier releases) </li>
                                 <li> <a href="http://developer.apple.com/technologies/xcode.html">Xcode</a> for gcc, etc (included in OSX)</li>
                             </ul>
                         </li>
                         <li> <b>Windows</b>/x86 (32-bit)
                             <ul>
-                                <li> Windows XP or later </li>
+                                <li>Windows XP or later </li>
+                                <li>git, see above</li>
                                 <li> <a href="http://www.mingw.org/">MinGW</a><br/>
-                                    Read <a href="http://www.mingw.org/wiki/Getting_Started">MinGW Getting Started</a> and
+                                    Read <a href="http://www.mingw.org/wiki/Getting_Started">MinGW Getting Started</a>.<br/>
+                                    We used the download script <code>mingwdl.sh</code> shown at
                                     <a href="http://www.mingw.org/wiki/HOWTO_Install_the_MinGW_GCC_Compiler_Suite">HOWTO Install the MinGW GCC Compiler Suite</a>.<br/></li>
-                                <li> Not supported: Microsoft Visual C++ 6.0 or later</li>
+                                <li> Not supported: Microsoft Visual C++ 6.0 or later, but may work. Last successful try in 2008.</li>
                             </ul>
                         </li>
-                        <li> <b>Windows</b>/x86 (64-bit)<br/>
-                            Currently broken ..
+                        <li> <b>Windows</b>/x86_64 (64-bit)<br/>
+                            <ul>
+                                <li>Windows XP or later </li>
+                                <li>git, see above</li>
+                                <li> <a href="http://mingw-w64.sourceforge.net/">MinGW64</a><br/>
+                                    We used the build <code>mingw-w64-bin_x86_64-mingw_20100515_sezero.zip</code> available at
+                                    <a href="http://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win64/Personal%20Builds/sezero_20100515/">MingW64 Personal Builds - sezero</a>.<br/></li>
+                                <li> Not supported: Microsoft Visual C++, never tried.</li>
+                            </ul>
                         </li>
                     </ul>
 
@@ -201,7 +223,7 @@
                     productions; the C grammar warnings have been documented by the
                     author of the grammar as having been investigated completely and
                     harmless, and the warnings about our modifications are also
-                    harmless. 
+                    harmless.
 
                     <h2> Common build problems </h2>