Changes between Version 265 and Version 266 of BuildInstructions

Timestamp:

Jan 24, 2015, 4:39:07 PM (9 years ago)

Author:

fabio

Comment:

update for spidermonkey 31

BuildInstructions

@@ -124 +124 @@
 sudo apt-get install build-essential libboost-dev libboost-filesystem-dev   \
     libcurl4-gnutls-dev libenet-dev libgloox-dev libicu-dev libjpeg-dev     \
-    libminiupnpc-dev libmozjs-24-dev libnvtt-dev libogg-dev libopenal-dev   \
+    libminiupnpc-dev libnspr4-dev libnvtt-dev libogg-dev libopenal-dev   \
     libpng-dev libsdl-dev libvorbis-dev libwxgtk3.0-dev libxcursor-dev      \
     libxml2-dev subversion zlib1g-dev
 }}}
   * With these dependencies you have to run:
-   * `./update-workspaces.sh --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
-}}}
+   * `./update-workspaces.sh --with-system-nvtt
+ * If you want to use a packaged **mozjs31** from [https://launchpad.net/~wfg/+archive/ubuntu/0ad.dev/+packages 0ad.dev PPA]:
+   * you should replace `libnspr4-dev` with `libmozjs-31-dev` and run `update-workspace.sh` with `--with-system-mozjs31`.
  * On systems **earlier than Debian 8/jessie and Ubuntu 14.04/trusty**:
   * you should run `update-workspace.sh` with `--without-miniupnpc` if you don't have `libminiupnpc-dev` >= 1.6;
   * 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 nvidia-texture-tools, `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].
@@ -269 +266 @@
   * If you want to build a distributable app bundle as described below, you will need Xcode.
   * '''Note:''' As of Mavericks (10.9) and Xcode 5, Apple [https://developer.apple.com/library/mac/releasenotes/DeveloperTools/RN-Xcode/xc5_release_notes/xc5_release_notes.html#//apple_ref/doc/uid/TP40001051-CH2-SW302 no longer supports] llvm-gcc, instead it is required to use clang. Additionally, the default C++ library is now libc++ instead of libstdc++. If you've upgraded and previously built the game, you should pass the `--force-rebuild` flag to `build-osx-libs.sh`.
-  * '''Note:''' As of Alpha 16, the game uses SpiderMonkey 24, which no longer supports gcc 4.2.x including llvm-gcc previously bundled with Xcode. The game can no longer be built on OS X Leopard (10.5), and there is a !SpiderMonkey [https://bugzilla.mozilla.org/show_bug.cgi?id=862657 bug] that breaks the build on Snow Leopard (10.6) with Xcode 3.2.6.
+  * '''Note:''' As of Alpha 18, the game uses SpiderMonkey 31, which no longer supports gcc 4.2.x including llvm-gcc previously bundled with Xcode. The game can no longer be built on OS X Leopard (10.5), and there is a !SpiderMonkey [https://bugzilla.mozilla.org/show_bug.cgi?id=862657 bug] that breaks the build on Snow Leopard (10.6) with Xcode 3.2.6.
  * Obtain CMake:
   * You can download a prebuilt OS X package [http://www.cmake.org/cmake/resources/software.html here].