android: make code 're-entrant' - i.e. NativeActivity can restart the program without...

[freeglut] / README.android

diff --git a/README.android b/README.android
index c0b43b8..808ffec 100644 (file)
--- a/README.android
+++ b/README.android
@@ -10,7 +10,7 @@ Create a module compatible with the NDK build-system
 - Use your own cross-compiler for Android, or export the one from the
   NDK:
 
-  /usr/src/android-ndk-r7/build/tools/make-standalone-toolchain.sh \
+  /usr/src/android-ndk-r7c/build/tools/make-standalone-toolchain.sh \
     --platform=android-9 \
     --install-dir=/usr/src/ndk-standalone-9
 
@@ -18,11 +18,12 @@ 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/
+  mkdir cross-android-module-gles2/
+  cd cross-android-module-gles2/
   cmake \
     -D CMAKE_TOOLCHAIN_FILE=../android_toolchain.cmake \
     -D CMAKE_INSTALL_PREFIX=/freeglut-gles2 \
+    -D CMAKE_BUILD_TYPE=Debug \
     -D FREEGLUT_GLES2=ON \
     -D FREEGLUT_BUILD_DEMOS=NO \
     ..
@@ -50,32 +51,34 @@ Compile FreeGLUT for a traditional cross-compiler environment
 - Use your own cross-compiler for Android, or export the one from the
   NDK:
 
-  /usr/src/android-ndk-r7/build/tools/make-standalone-toolchain.sh \
+  /usr/src/android-ndk-r7c/build/tools/make-standalone-toolchain.sh \
     --platform=android-9 \
     --install-dir=/usr/src/ndk-standalone-9
 
 - Compile FreeGLUT and install it in your Android cross-compiler path:
 
-
   PATH=/usr/src/ndk-standalone-9/bin:$PATH
   cd /usr/src/freeglut-3.0.0/
-  mkdir cross-android-toolchain/
-  cd cross-android-toolchain/
+  mkdir cross-android-toolchain-gles2/
+  cd cross-android-toolchain-gles2/
   cmake \
     -D CMAKE_TOOLCHAIN_FILE=../android_toolchain.cmake \
-    -D CMAKE_INSTALL_PREFIX=/usr/src/ndk-standalone-9 \
+    -D CMAKE_INSTALL_PREFIX=/usr/src/ndk-standalone-9/sysroot/usr \
+    -D CMAKE_BUILD_TYPE=Debug \
     -D FREEGLUT_GLES2=ON \
     -D FREEGLUT_BUILD_DEMOS=NO \
     ..
   make -j4
   make install
+  # Only static for now:
+  rm -f /usr/src/ndk-standalone-9/sysroot/usr/lib/libfreeglut-gles?.so*
 
 - Compile your own project.
 
 For instance if you use the autotools:
 
   PATH=/usr/src/ndk-standalone-9/bin:$PATH
-  export PKG_CONFIG_PATH=/usr/src/ndk-standalone-9/share/pkgconfig
+  export PKG_CONFIG_PATH=/usr/src/ndk-standalone-9/sysroot/usr/share/pkgconfig
   ./configure --host=arm-linux-androideabi --prefix=/somewhere
   make
   make install
@@ -84,13 +87,14 @@ If you use CMake, you may want to copy our Android toolchain
 'android_toolchain.cmake':
 
   PATH=/usr/src/ndk-standalone-9/bin:$PATH
-  export PKG_CONFIG_PATH=/usr/src/ndk-standalone-9/share/pkgconfig
+  export PKG_CONFIG_PATH=/usr/src/ndk-standalone-9/sysroot/usr/share/pkgconfig
   cp .../android_toolchain.cmake .
   mkdir cross-android/
   cd cross-android/
   cmake \
     -D CMAKE_TOOLCHAIN_FILE=../android_toolchain.cmake \
     -D CMAKE_INSTALL_PREFIX=/somewhere \
+    -D CMAKE_BUILD_TYPE=Debug \
     -D MY_PROG_OPTION=something ... \
     ..
   make -j4