projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Android: fix/upgrade paths in README
[freeglut]
/
README.android
diff --git
a/README.android
b/README.android
index
4cded4a
..
cc8bff5
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:
- 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
--platform=android-9 \
--install-dir=/usr/src/ndk-standalone-9
@@
-22,7
+22,7
@@
Create a module compatible with the NDK build-system
cd cross-android-module/
cmake \
-D CMAKE_TOOLCHAIN_FILE=../android_toolchain.cmake \
cd cross-android-module/
cmake \
-D CMAKE_TOOLCHAIN_FILE=../android_toolchain.cmake \
- -D CMAKE_INSTALL_PREFIX=/freeglut \
+ -D CMAKE_INSTALL_PREFIX=/freeglut-gles2 \
-D FREEGLUT_GLES2=ON \
-D FREEGLUT_BUILD_DEMOS=NO \
..
-D FREEGLUT_GLES2=ON \
-D FREEGLUT_BUILD_DEMOS=NO \
..
@@
-31,17
+31,17
@@
Create a module compatible with the NDK build-system
- Copy Android.mk in the new 'freeglut/' directory :
- 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:
- 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!
- 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
Compile FreeGLUT for a traditional cross-compiler environment
@@
-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:
- 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
--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 \
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 \
..
-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
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
./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
'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/
cp .../android_toolchain.cmake .
mkdir cross-android/
cd cross-android/