Fix previous commit, I made a confusion when merging my changes with the trunk

[freeglut] / README.android

diff --git a/README.android b/README.android
index 71a1822..e42fbc5 100644 (file)
--- a/README.android
+++ b/README.android
@@ -1,3 +1,26 @@
+Status
+======
+
+Done:
+- Initialize context with EGL
+- Keyboard support
+- Mouse support
+- Virtual keypad (on touchscreen)
+- Extract assets in cache dir on start-up
+
+TODO:
+- Open new windows (if that's possible)
+- Joystick support (xperia play...)
+- Display translucent keys on virtual keypad
+- API to detect touchscreen presence
+- API to disable assets extract
+- GLES2 support for geometry and menus
+  (possibly also GLES1)
+- Generate freeglut_std.h with GLES1 or GLES2 or non-ES headers
+- Make EGL support reusable by Mesa X11
+- ...
+
+
 Create a module compatible with the NDK build-system
 ====================================================
 
@@ -48,14 +71,38 @@ 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/
+  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
+  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
+  PKG_CONFIG_PATH=/usr/src/ndk-standalone-9/share/pkgconfig
+  cp .../android_toolchain.cmake .
+  cmake \
+    -D CMAKE_TOOLCHAIN_FILE=android_toolchain.cmake
+    -D CMAKE_INSTALL_PREFIX=/somewhere \
+    -D MY_PROG_OPTION=something ... \
+    .
+  make -j4
+  make install