Use different names for GLES1 and GLES2 libraries, to allow parallel install

[freeglut] / README.android

diff --git a/README.android b/README.android
index 71a1822..c0b43b8 100644 (file)
--- a/README.android
+++ b/README.android
@@ -1,3 +1,9 @@
+Status
+======
+
+See http://freeglut.sourceforge.net/docs/android.php
+
+
 Create a module compatible with the NDK build-system
 ====================================================
 
@@ -12,28 +18,30 @@ 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_INSTALL_PREFIX=/freeglut \
+    -D CMAKE_TOOLCHAIN_FILE=../android_toolchain.cmake \
+    -D CMAKE_INSTALL_PREFIX=/freeglut-gles2 \
     -D FREEGLUT_GLES2=ON \
     -D FREEGLUT_BUILD_DEMOS=NO \
-    .
+    ..
   make -j4
   make install DESTDIR=$(pwd)
 
 - Copy Android.mk in the new 'freeglut/' directory :
 
-  cp android/Android.mk freeglut/
+  cp ../android/gles2/Android.mk freeglut-gles2/
 
 - Reference this module in your jni/Android.mk:
 
-  LOCAL_STATIC_LIBRARIES := ... freeglut
+  LOCAL_STATIC_LIBRARIES := ... freeglut-gles2
   ...
-  $(call import-module,freeglut)
+  $(call import-module,freeglut-gles2)
 
 - You now can point your NDK_MODULE_PATH to this module!
 
-  ndk-build NDK_MODULE_PATH=/usr/src/freeglut-3.0.0/freeglut/
+  ndk-build NDK_MODULE_PATH=/usr/src/freeglut-3.0.0/cross-android-module/freeglut-gles2/
 
 
 Compile FreeGLUT for a traditional cross-compiler environment
@@ -48,14 +56,42 @@ Compile FreeGLUT for a traditional cross-compiler environment
 
 - Compile FreeGLUT and install it in your Android cross-compiler path:
 
+
   PATH=/usr/src/ndk-standalone-9/bin:$PATH
-  ./configure --host=arm-linux-androideabi --prefix=/usr/src/ndk-standalone-9
-  make
+  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_INSTALL_PREFIX=/usr/src/ndk-standalone-9 \
+    -D FREEGLUT_GLES2=ON \
+    -D FREEGLUT_BUILD_DEMOS=NO \
+    ..
+  make -j4
   make install
 
-- Compile your own project, for instance if you use the autotools:
+- 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
   ./configure --host=arm-linux-androideabi --prefix=/somewhere
   make
   make install
+
+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
+  cp .../android_toolchain.cmake .
+  mkdir cross-android/
+  cd cross-android/
+  cmake \
+    -D CMAKE_TOOLCHAIN_FILE=../android_toolchain.cmake \
+    -D CMAKE_INSTALL_PREFIX=/somewhere \
+    -D MY_PROG_OPTION=something ... \
+    ..
+  make -j4
+  make install