Added autodetection to configure for bullet libraries installed in /usr or /usr/local,

added --enable-static-bullet option to staticly link the libraries.
Updated installation instructions.

1 files changed, 46 insertions, 8 deletions

diff --git a/doc/installation.html b/doc/installation.html
index ebfe223..0e06100 100644
--- a/doc/installation.html
+++ b/doc/installation.html
@@ -83,12 +83,20 @@
 
 <div class="text">
 <p>
+	Requirements:<br>
+	To run the client, tour system will need to have the following packages installed: libSDL, libjpeg, libpng and libz.
+	You do not need to have the bullet libraries installed. To run the dedicated server you need libz and ncurses.
+	These are common packages and most systems will already have them installed.
+</p>
+<p>
 	Linux download:<br>
 	<a href="http://ingar.satgnu.net/osirion/files/osirion-linux-latest.zip">osirion-linux-latest.zip</a> (32- and 64-bit)<br>
 	This package contains the linux version of the client and the server.
+</p>
 <p>
 	Extract the package, a new subdirectory will be created. The actual directory name will depend on
 	the version number. Enter the new subdirectory.
+</p>
 <div class="code">
 tar jxvf osirion-latest.tar.bz2<br>
 cd osirion-linux-740
@@ -96,18 +104,22 @@ cd osirion-linux-740
 <p>
 	Dowload the game data package:<br>
 	<a href="http://ingar.satgnu.net/osirion/files/osirion-data-latest.zip">osirion-data-latest.zip</a><br>
+</p>
 <p>
 	Unzip it:
+</p>
 <div class="code">
 unzip ../osirion-data-latest.zip
 </div>
 <p>
 	 To run the 32 bit client:
+</p>
 <div class="code">
 ./osirion.x86
 </div>
 <p>
 	 To run the 64 bit client:
+</p>
 <div class="code">
 ./osirion.x86_64
 </div>
@@ -149,8 +161,17 @@ unzip ../osirion-data-latest.zip
 </p>
 <p>
 	You will also need a recent version of gcc, GNU make, automake and libtool.
-	In theory, the source should compile on any POSIX-compatible platform 
-	supported by SDL.
+</p>
+</div>
+
+<div class="subtitle">
+	Building on windows
+</div>
+<div class="text">
+<p>
+	You can build the source on windows using a MinGW/MSYS environment. You can use
+	the instructions in <a href="http://ingar.satgnu.net/devenv/mingw32/">this document</a>
+	to create a complete environment, capable of building the Project::OSiRiON source code.
 </p>
 </div>
 
@@ -178,6 +199,9 @@ cd bullet-2.77<br>
 make<br>
 sudo make install<br>
 </div>
+<p>
+	I recommend you use this specific version of the library, physics behaviour could be different in other versions.
+</p>
 </div>
 
 <div class="subtitle">
@@ -228,22 +252,36 @@ autoreconf -fi<br>
 	If you do not need the client and want to build the dedicated server only
 	you can pass the <span class="fixed">--without-client</span> option to <span class="fixed">configure</span>:
 </p>
+<div class="code">
+./configure --without-client
+</div>
 <p>
-	Configure will automaticly detect the bullet library if it was installed in <span class=fixed>/usr/local</span>.
-	If it was installed somewhere else you will have to pass the <span class="fixed">--with-bullet=directory</span> option
-	to configure. For example, <span class="fixed">--with-bullet=/usr</span> will use the bullet libraries installed in
-	<span class="fixed">/usr/lib</span> and the includes in <span class="fixed">/usr/include/bullet</span>.
+	Configure will automaticly detect the bullet library if it was installed in 
+	<span class=fixed>/usr</span> or <span class=fixed>/usr/local</span>.
+	If it was installed somewhere else you will have to pass the <span class="fixed">--with-bullet=prefix</span> option
+	to configure. For example, <span class="fixed">--with-bullet=/opt/bullet</span> will use the bullet libraries installed in
+	<span class="fixed">/opt/bullet/lib</span> and the includes in <span class="fixed">/opt/bullet/include/bullet</span>.
 	 
 </p>
-
 <div class="code">
-./configure --without-client --with-bullet=/usr
+./configure --with-bullet=/opt/bullet
 </div>
 <p>
+	If you add the <span class=fixed>--enable-static-bullet</span> option, the resulting binary will be staticly
+	linked with the bullet libraries. They will work on systems that do not have bullet installed.
+</p>
+<div class="code">
+./configure --with-bullet=/opt/bullet --enable-static-bullet
+</div>
+
+<p>
 	If <span class="fixed">configure</span> finds ncurses or pdcurses, the dedicated server will use this
 	library and a have a curses console. To disable curses detection, pass the
 	<span class="fixed">--without-curses</span> option to <span class="fixed">configure</span>.
 </p>
+<div class="code">
+./configure --without-client --without-curses
+</div>
 <p>
 	Compile the source code:
 </p>