Changes between Version 133 and Version 134 of BuildInstructions

Timestamp:

Jul 7, 2011, 11:19:10 PM (13 years ago)

Author:

Philip Taylor

Comment:

clean up a bit

BuildInstructions

@@ -57 +57 @@
 == Linux ==
 
-Linux is a supported platform as well. 0ad runs smoothly, just give it a try!
-
-=== Dependecies ===
+0 A.D. should work on any reasonably modern Linux distro, on x86 and x86_64 (amd64). The details depend on exactly which distro you use.
+
+=== Dependencies ===
 
 First you need to install various standard tools and development libraries:
 
  * GCC (at least 4.0, preferably 4.3 or later)
- * Subversion (or git if you want to use the git mirror; read below)
+ * Subversion (or git if you want to use the Git mirror; see below)
  * NASM
   * There is a [http://sourceforge.net/tracker/?func=detail&aid=2821249&group_id=6208&atid=106208 bug] in NASM 2.06 on x86_64, so you might want to try a different version if you get errors.
@@ -74 +74 @@
  * OpenGL
  * OpenAL
- * zip (needed by spidermonkey)
+ * zip
  * libogg
  * libvorbis
  * libcurl
  * Gamin (FAM should work too, but is considered deprecated)
- * ENet (pass the flag `--with-system-enet` to `update-workspaces.sh` to use the installed version, otherwise an included version will be used)
  * DevIL
  * CMake
- * '''Optionally''' for editor tools: wxWidgets (probably called wxgtk)
- * '''Optionally''' for Nvidia cards: [http://code.google.com/p/nvidia-texture-tools NVTT] (pass the flag `--with-system-nvtt` to `update-workspaces.sh` to use the installed version; otherwise we'll automatically use a bundled copy of the library)
+ * To compile editing tools (enabled by default; pass the flag `--disable-atlas` to `update-workspaces.sh` to disable):
+   * wxWidgets (packages are probably called wxgtk)
+ * To use shared system libraries instead of bundled copies of libraries (disabled by default; pass the flag `--with-system-$FOO` to `update-workspaces.sh` to use the non-bundled copy):
+   * ENet 1.3 (`--with-system-enet`)
+   * [http://code.google.com/p/nvidia-texture-tools NVTT] (`--with-system-nvtt`)
 
 ==== Debian/Ubuntu ====
 
-Install the dependencies like this:
+Install the dependencies with:
    
 {{{
 #!html
 <pre class="wiki" style="white-space: pre-wrap">
-sudo apt-get install subversion build-essential cmake libsdl1.2-dev zlib1g-dev libpng12-dev libjpeg62-dev libgamin-dev nasm libwxgtk2.8-dev libboost-dev libboost-signals-dev libboost-filesystem-dev libopenal-dev libalut-dev libvorbis-dev libogg-dev libdevil-dev libenet-dev libxml2-dev libcurl4-gnutls-dev zip
+sudo apt-get install subversion build-essential cmake libsdl1.2-dev zlib1g-dev libpng12-dev libjpeg62-dev libgamin-dev nasm libwxgtk2.8-dev libboost-dev libboost-signals-dev libboost-filesystem-dev libopenal-dev libalut-dev libvorbis-dev libogg-dev libdevil-dev libxml2-dev libcurl4-gnutls-dev zip
 </pre>
 }}}
@@ -99 +101 @@
 ==== Mandriva ====
 
-'''Note: '''No ENet package is yet available, so [http://enet.bespin.org/Installation.html install it from source].
-
-Install the rest of the dependencies like this (tested with 2009.1):
+Install the dependencies with:
 
 {{{
 #!html
 <pre class="wiki" style="white-space: pre-wrap">
-urpmi libboost-devel libwxgtk2.8-devel libwxgtku2.8-devel libopenal-devel zlib1-devel libpng-devel libogg0-devel libvorbis-devel libSDL-devel libdevil-devel libgamin-1_0-devel libjpeg62-devel libfreealut-devel nasm libcurl-devel make svn
+urpmi libboost-devel libwxgtk2.8-devel libwxgtku2.8-devel libopenal-devel zlib1-devel libpng-devel libogg0-devel libvorbis-devel libSDL-devel libdevil-devel libgamin-1_0-devel libjpeg62-devel libfreealut-devel nasm libcurl-devel make svn zip
 </pre>
 }}}
@@ -112 +112 @@
 ==== Fedora ====
 
-Install the dependencies like this (tested with 14 and 15):
+Install the dependencies with:
 
 {{{
 #!html
 <pre class="wiki" style="white-space: pre-wrap">
-su -c 'yum -y install subversion gcc-c++ nasm SDL-devel boost-devel zlib-devel libpng-devel libjpeg-devel libxml2-devel openal-devel libogg-devel libvorbis-devel wxGTK-devel gamin-devel enet-devel DevIL-devel binutils-devel cryptopp-devel nspr-devel js-devel DevIL-ILUT-devel libcurl-devel'
+su -c 'yum -y install subversion gcc-c++ cmake nasm SDL-devel boost-devel zlib-devel libpng-devel libjpeg-devel libxml2-devel openal-devel libogg-devel libvorbis-devel wxGTK-devel gamin-devel DevIL-devel binutils-devel DevIL-ILUT-devel libcurl-devel zip'
 </pre>
 }}}
@@ -123 +123 @@
 === Getting the code ===
 
-0ad gets distributed in 2 ways.
-The deveolpment finds place via SVN but there is also a git mirror. The mirror may be slightly less up-to-date but usually offers faster downloads.
-
-To checkout the svn trunk, run this command:
+0 A.D. is primarily developed on SVN. To checkout the latest code from SVN, run this command:
 
 {{{
@@ -132 +129 @@
 }}}
 
-To use the git mirror, use this command:
+There is also a Git mirror, which may be slightly less up-to-date but usually offers faster downloads. To use the Git mirror, use this command instead:
+
 {{{
 git clone https://github.com/0ad/0ad.git
@@ -148 +146 @@
 
  * '''-j3''' gives the number of parallel builds to run, and should typically be one plus the number of CPU cores available.
- * The '''Release''' mode builds are more optimised, are harder to debug. Use `CONFIG=Debug` (and run `pyrogenesis_dbg`) if you need better debugging support.
-
+ * The '''Release''' mode builds are more optimised, but are harder to debug. Use `CONFIG=Debug` (and run `pyrogenesis_dbg`) if you need better debugging support.
 
 If you encounter any build errors, review the [http://trac.wildfiregames.com/report existing bug reports], check the [#Knownproblemsandsolutions known problems section] or please file a [http://trac.wildfiregames.com/newticket new bug in the tracker].
@@ -169 +166 @@
 }}}
 
-
 === Keeping up to date ===
 
-If you already checked out the code and only want to update und rebuild it, you may find it helpful to save the lines below to a script called e.g. `rebuild.sh`, place it  in your 0ad directory, make it executable and run it.
+If you already checked out the code and only want to update and rebuild it, you may find it helpful to save the lines below to a script called e.g. `rebuild.sh`, place it in your 0ad directory, make it executable and run it.
 
 {{{