Changes between Version 232 and Version 233 of BuildInstructions

Timestamp:

Apr 27, 2014, 9:06:23 PM (10 years ago)

Author:

Daniel Cardenas

Comment:

Update for ubuntu 14.04. Mostly just a rewording.

BuildInstructions

@@ -128 +128 @@
 ==== Debian (7 or later) / Ubuntu (12.04 or later) ====
 Install the dependencies with:
-
 {{{
 #!sh
 sudo apt-get install build-essential libboost-dev libboost-filesystem-dev   \
     libboost-signals-dev libcurl4-gnutls-dev libenet-dev libgloox-dev       \
-    libicu-dev libjpeg-dev libminiupnpc-dev libnspr4-dev libnvtt-dev        \
+    libicu-dev libjpeg-dev libminiupnpc-dev libmozjs-24-dev libnvtt-dev     \
     libogg-dev libopenal-dev libpng-dev libsdl-dev libvorbis-dev            \
-    libwxgtk2.8-dev libxcursor-dev libxml2-dev subversion zlib1g-dev
-}}}
- * With these dependencies you have to run `update-workspaces.sh` with `--with-system-enet --with-system-miniupnpc --with-system-nvtt` flags.
- * On Debian jessie/8 and Ubuntu trusty/14.04 or later:
-  * you should replace `libwxgtk2.8-dev` with `libwxgtk3.0-dev`;
-  * you should replace `libnspr4-dev` with `libmozjs-24-dev` and run `update-workspace.sh` with `--with-system-mozjs24` to use the SpiderMonkey library provided by the system. To avoid useless warnings when using system mozjs24 you could fix mozjs24 headers with:
+    libwxgtk3.0-dev libxcursor-dev libxml2-dev subversion zlib1g-dev cmake
+}}}
+ * With these dependencies you have to run:
+  * `update-workspaces.sh --with-system-enet --with-system-miniupnpc --with-system-nvtt --with-system-mozjs24`
+ * To avoid useless warnings when using system mozjs24 you could fix mozjs24 headers with:
 {{{
 sudo perl -i -pe 's/(^#elif _MSC_VER >= 1600).*/#elif defined(_MSC_VER) && _MSC_VER >= 1600/' /usr/include/mozjs-24/mozilla/NullPtr.h
 }}}
+ * On systems earlier than Debian jessie/8 and Ubuntu trusty/14.04 or later:
+  * you should replace `libwxgtk3.0-dev` with `libwxgtk2.8-dev`;
+  * you should replace `libmozjs-24-dev` with `libnspr4-dev` and run `update-workspace.sh` without `--with-system-mozjs24`.
  * When not using system libraries, `libenet-dev` and `libnvtt-dev` can be omitted, but `cmake` is needed to build the bundled NVTT.
  * You can also use `libcurl4-openssl-dev` instead of `libcurl4-gnutls-dev` (it's not possible to install both at once), but [http://lintian.debian.org/tags/possible-gpl-code-linked-with-openssl.html note that openssl is not GPL compatible and the resulting binaries could not be redistributed].