README.android: use separate build dirs + minor fixes

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1227 7f0cb862-5218-0410-a997-914c9d46530a

diff --git a/README.android b/README.android
index e42fbc5..e997a98 100644 (file)
--- a/README.android
+++ b/README.android
@@ -35,12 +35,14 @@ Create a module compatible with the NDK build-system
 
   PATH=/usr/src/ndk-standalone-9/bin:$PATH
   cd /usr/src/freeglut-3.0.0/
+  mkdir cross-android-module/
+  cd cross-android-module/
   cmake \
-    -D CMAKE_TOOLCHAIN_FILE=android_toolchain.cmake \
+    -D CMAKE_TOOLCHAIN_FILE=../android_toolchain.cmake \
     -D CMAKE_INSTALL_PREFIX=/freeglut \
     -D FREEGLUT_GLES2=ON \
     -D FREEGLUT_BUILD_DEMOS=NO \
-    .
+    ..
   make -j4
   make install DESTDIR=$(pwd)
 
@@ -74,12 +76,14 @@ Compile FreeGLUT for a traditional cross-compiler environment
 
   PATH=/usr/src/ndk-standalone-9/bin:$PATH
   cd /usr/src/freeglut-3.0.0/
+  mkdir cross-android-toolchain/
+  cd cross-android-toolchain/
   cmake \
-    -D CMAKE_TOOLCHAIN_FILE=android_toolchain.cmake \
+    -D CMAKE_TOOLCHAIN_FILE=../android_toolchain.cmake \
     -D CMAKE_INSTALL_PREFIX=/usr/src/ndk-standalone-9 \
     -D FREEGLUT_GLES2=ON \
     -D FREEGLUT_BUILD_DEMOS=NO \
-    .
+    ..
   make -j4
   make install
 
@@ -88,7 +92,7 @@ Compile FreeGLUT for a traditional cross-compiler environment
 For instance if you use the autotools:
 
   PATH=/usr/src/ndk-standalone-9/bin:$PATH
-  PKG_CONFIG_PATH=/usr/src/ndk-standalone-9/share/pkgconfig
+  export PKG_CONFIG_PATH=/usr/src/ndk-standalone-9/share/pkgconfig
   ./configure --host=arm-linux-androideabi --prefix=/somewhere
   make
   make install
@@ -97,12 +101,14 @@ If you use CMake, you may want to copy our Android toolchain
 'android_toolchain.cmake':
 
   PATH=/usr/src/ndk-standalone-9/bin:$PATH
-  PKG_CONFIG_PATH=/usr/src/ndk-standalone-9/share/pkgconfig
+  export PKG_CONFIG_PATH=/usr/src/ndk-standalone-9/share/pkgconfig
   cp .../android_toolchain.cmake .
+  mkdir cross-android/
+  cd cross-android/
   cmake \
-    -D CMAKE_TOOLCHAIN_FILE=android_toolchain.cmake
+    -D CMAKE_TOOLCHAIN_FILE=../android_toolchain.cmake \
     -D CMAKE_INSTALL_PREFIX=/somewhere \
     -D MY_PROG_OPTION=something ... \
-    .
+    ..
   make -j4
   make install