Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 10:37:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove physics lib requirement for gvr-interface

Browse source
This commit is contained in:
Stephen Birarda 2015-01-19 12:50:52 -08:00
parent 60bdd206eb
commit c3cab45d16
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
BUILD_ANDROID.md
View file

@ -49,7 +49,7 @@ If you have been building other components it is possible that the OpenSSL compi
Download the [Intel Threading Building Blocks source](https://www.threadingbuildingblocks.org/download) and extract the tarball inside your `ANDROID_LIB_DIR`. Rename the extracted folder to `tbb`. Download the [Intel Threading Building Blocks source](https://www.threadingbuildingblocks.org/download) and extract the tarball inside your `ANDROID_LIB_DIR`. Rename the extracted folder to `tbb`.
From the tbb directory, execute the following commands. This will set the compiler and archive tool to the correct ones from the NDK install and then build TBB using `ndk-build`. From the tbb directory, execute the following commands. This will set the compiler and archive tool to the correct ones from the NDK install and then build TBB using `ndk-build`. Then, the compiled libs are copied to a lib folder in the root of tbb directory.
``` ```
export CC=$ANDROID_NDK/toolchains/arm-linux-androideabi-4.6/prebuilt/darwin-x86_64/bin/arm-linux-androideabi-gcc export CC=$ANDROID_NDK/toolchains/arm-linux-androideabi-4.6/prebuilt/darwin-x86_64/bin/arm-linux-androideabi-gcc
@ -57,8 +57,9 @@ export AR=$ANDROID_NDK/toolchains/arm-linux-androideabi-4.6/prebuilt/darwin-x86_
cd jni cd jni
ndk-build target=android tbb tbbmalloc arch=arm ndk-build target=android tbb tbbmalloc arch=arm
cd ../ cd ../
mkdir lib
cp -rf build/linux_arm_*/**/*.so lib/ cp -rf build/linux_arm_*/**/*.so lib/
``` ```
####GLM ####GLM

2
gvr-interface/CMakeLists.txt
View file

@ -13,7 +13,7 @@ include_glm()
set(REQUIRED_HIFI_LIBRARIES "shared" "networking") set(REQUIRED_HIFI_LIBRARIES "shared" "networking")
link_hifi_libraries(${REQUIRED_HIFI_LIBRARIES}) link_hifi_libraries(${REQUIRED_HIFI_LIBRARIES})
link_shared_dependencies() include_dependency_includes()
set(ANDROID_SDK_ROOT $ENV{ANDROID_HOME}) set(ANDROID_SDK_ROOT $ENV{ANDROID_HOME})
set(ANDROID_APP_DISPLAY_NAME Interface) set(ANDROID_APP_DISPLAY_NAME Interface)