Changes between Version 138 and Version 139 of BuildInstructions

Timestamp:

Sep 21, 2011, 2:37:57 AM (13 years ago)

Author:

historic_bruno

Comment:

Removes nasm dependencies, updates OS X instructions

BuildInstructions

@@ -65 +65 @@
  * GCC (at least 4.0, preferably 4.3 or later)
  * 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.
  * SDL
  * Boost
@@ -94 +92 @@
 #!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 libxml2-dev libcurl4-gnutls-dev zip libenet-dev
+sudo apt-get install subversion build-essential cmake libsdl1.2-dev zlib1g-dev libpng12-dev libjpeg62-dev libgamin-dev 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 libenet-dev
 </pre>
 }}}
@@ -106 +104 @@
 #!html
 <pre class="wiki" style="white-space: pre-wrap">
-urpmi gcc-c++ nasm python subversion zip cmake boost-devel DevIL-devel fam-devel libcurl-devel libjpeg-devel libpng-devel libvorbis-devel libxml2-devel libwxgtku2.8-devel openal-soft-devel
+urpmi gcc-c++ python subversion zip cmake boost-devel DevIL-devel fam-devel libcurl-devel libjpeg-devel libpng-devel libvorbis-devel libxml2-devel libwxgtku2.8-devel openal-soft-devel
 </pre>
 }}}
@@ -117 +115 @@
 #!html
 <pre class="wiki" style="white-space: pre-wrap">
-su -c 'yum -y install gcc-c++ nasm python subversion zip cmake boost-devel DevIL-devel fam-devel libcurl-devel libjpeg-devel libpng-devel libvorbis-devel libxml2-devel openal-soft-devel pkgconfig SDL-devel wxGTK-devel'
+su -c 'yum -y install gcc-c++ python subversion zip cmake boost-devel DevIL-devel fam-devel libcurl-devel libjpeg-devel libpng-devel libvorbis-devel libxml2-devel openal-soft-devel pkgconfig SDL-devel wxGTK-devel'
 </pre>
 }}}
@@ -128 +126 @@
 #!html
 <pre class="wiki" style="white-space: pre-wrap">
-sudo zypper install gcc-c++ nasm python subversion zip cmake boost-devel DevIL-devel fam-devel libcurl-devel libjpeg-devel libpng-devel libvorbis-devel libxml2-devel openal-soft-devel pkg-config wxGTK-devel libSDL-devel
+sudo zypper install gcc-c++ python subversion zip cmake boost-devel DevIL-devel fam-devel libcurl-devel libjpeg-devel libpng-devel libvorbis-devel libxml2-devel openal-soft-devel pkg-config wxGTK-devel libSDL-devel
 </pre>
 }}}
@@ -230 +228 @@
    * libxml2
    * curl
-   * nasm
    * cmake
-   * wxWidgets
+   * wxWidgets-devel (required for building Atlas, only the 2.9.x branch will build on 64-bit Macs)
    * subversion (the default version on 10.5 seems to cause checksum mismatch errors)
 
  * Now follow the same instructions as for Linux above, starting from the `svn co`.
-
- * The Atlas editing tools do not work under OS X (#500), so you may need to edit `update-workspaces.sh` and remove the `--atlas` flag before running it.
 
 === Compiling with GCC 4.2 or 4.3 under OS X ===