From f98bbe1aa03351d3e71d45473a20f3479281b3cd Mon Sep 17 00:00:00 2001 From: Sylvain Beucler Date: Sun, 15 Apr 2012 18:47:07 +0000 Subject: [PATCH] Android: fix/upgrade paths in README git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1241 7f0cb862-5218-0410-a997-914c9d46530a --- README.android | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.android b/README.android index c0b43b8..cc8bff5 100644 --- 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 @@ -50,7 +50,7 @@ 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 @@ -63,7 +63,7 @@ Compile FreeGLUT for a traditional cross-compiler environment cd cross-android-toolchain/ 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 FREEGLUT_GLES2=ON \ -D FREEGLUT_BUILD_DEMOS=NO \ .. @@ -75,7 +75,7 @@ Compile FreeGLUT for a traditional cross-compiler environment 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,7 +84,7 @@ 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/ -- 1.7.10.4