Changes between Version 214 and Version 215 of AndroidPort

Timestamp:

Feb 8, 2012, 12:36:55 AM (12 years ago)

Author:

Anders Feder

Comment:

--

AndroidPort

@@ -179 +179 @@
 $ sudo apt-get install default-jdk
 }}}
-Make sure [http://ant.apache.org/ Ant], [http://subversion.tigris.org/ Subversion] and Autoconf 2.13 is installed:
+Make sure [http://ant.apache.org/ Ant], [http://subversion.tigris.org/ Subversion] and Autoconf 2.13 is installed:
 
 {{{
@@ -189 +189 @@
 $ sudo apt-get install ia32-libs
 }}}
-Finally, download the game sources from SVN, e.g.:
+Finally, download the game sources from SVN to any location, e.g.:
 
 {{{
 $ svn co http://svn.wildfiregames.com/public/ps/trunk/ ~/android/0ad-game
 }}}
-
-
 === Installing dependencies ===
 The game has a range of external dependencies. Each of these has to be compiled for the target device's processor architecture and installed in the compiler toolchain's sysroot, so we can link against them when building the game itself.
 
+First set a few shell variables to the paths of tools that were installed in the previous section, e.g.:
+
+{{{
+$ NDK=$HOME/android/android-ndk-r5-crystax-2
+$ TOOLCHAIN=$HOME/android/toolchain
+}}}
+
+
 Download the !MysticTreeGames [https://github.com/MysticTreeGames/Boost-for-Android/tarball/master port of the Boost C++ Libraries] to the working directory and unpack it there, e.g.:
 
@@ -222 +228 @@
 Spidermonkey is designed to build against an older version of the NDK than that of our main compiler toolchain. Download [http://ftp.mozilla.org/pub/mozilla.org/mobile/source/android-ndk-r4c-0moz3.tar.bz2 Mozilla's own toolchain] to the working directory and then unpack it there, e.g.:
 
-Get js-1.8.5.
-
-Apply [https://gist.github.com/1754817 this patch] somehow.
+Apply [https://gist.github.com/1754817 this patch] somehow to libraries/spidermonkey/js-1.8.5.
 
 Now regenerate configure in the js dir:
 
 {{{
-cd js-1.8.5/js/src
-autoconf2.13
+$ cd js-1.8.5/js/src
+$ autoconf2.13
 }}}
 Then create a js directory, configure js, and build it:
 
 {{{
-cd $SYSROOT/usr/
-mkdir js
-cd js
-$TODO/js-1.8.5/js/src/configure \
+$ cd $SYSROOT/usr/
+$ mkdir js
+$ cd js
+$ $TODO/js-1.8.5/js/src/configure \
   --target=arm-android-eabi \
   --with-android-ndk=$NDK \
@@ -246 +250 @@
   --disable-shared \
   --enable-static
-make -s
+$ make -s
 }}}
 Set up the environment for cross-compiling using the standalone toolchain:
@@ -253 +257 @@
 $ HOSTCONF=arm-eabi-linux
 $ BUILDCONF=i686-pc-linux-gnu
-$ NDK=$HOME/android/android-ndk-r5-crystax-2
-$ TOOLCHAIN=$HOME/android/toolchain
 $ export ARCH=armv7-a
 $ export SYSROOT=$TOOLCHAIN/sysroot