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

Merge branch 'android' of https://github.com/birarda/hifi into android

Browse source
This commit is contained in:
Atlante45 2015-01-22 11:06:15 -08:00
commit 5de2894f3f
4 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
BUILD_ANDROID.md
View file

@ -46,7 +46,7 @@ Note that your path to `arm-linux-androideabi-ar` will probably not be the same
```
export ANDROID_NDK_ROOT=YOUR_NDK_ROOT
./setenv-android.sh
export AR=$ANDROID_NDK_ROOT_/toolchains/arm-linux-androideabi-4.6/prebuilt/darwin-x86_64/bin/arm-linux-androideabi-ar
export AR=$ANDROID_NDK_ROOT/toolchains/arm-linux-androideabi-4.6/prebuilt/darwin-x86_64/bin/arm-linux-androideabi-ar
```
Then, from the OpenSSL directory, run the following commands.

3
CMakeLists.txt
View file

@ -65,6 +65,8 @@ endif ()
if (ANDROID)
if (NOT ANDROID_QT_CMAKE_PREFIX_PATH)
set(QT_CMAKE_PREFIX_PATH ${ANDROID_LIB_DIR}/Qt/5.3/android_armv7/lib/cmake)
else ()
set(QT_CMAKE_PREFIX_PATH ${ANDROID_QT_CMAKE_PREFIX_PATH})
endif ()
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)
@ -80,6 +82,7 @@ else ()
endif ()
set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${QT_CMAKE_PREFIX_PATH})
message(STATUS "QT_CMAKE_PREFIX_PATH is ${QT_CMAKE_PREFIX_PATH}")
# set our OS X deployment target to
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.8)

6
cmake/android/AndroidManifest.xml.in
View file

@ -6,7 +6,7 @@
<application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="@string/AppDisplayName" android:icon="@drawable/icon">
<!-- VR MODE -->
<meta-data android:name="com.samsung.android.vr.application.mode" android:value="vr_dual"/>
<!-- <meta-data android:name="com.samsung.android.vr.application.mode" android:value="vr_dual"/> -->
<activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation"
android:name="org.qtproject.qt5.android.bindings.QtActivity"
@ -47,11 +47,11 @@
<!-- Splash screen -->
</activity>
<activity android:name="com.oculusvr.vrlib.PlatformActivity"
<!-- <activity android:name="com.oculusvr.vrlib.PlatformActivity"
android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"
android:launchMode="singleTask"
android:screenOrientation="landscape"
android:configChanges="screenSize|orientation|keyboardHidden|keyboard">
android:configChanges="screenSize|orientation|keyboardHidden|keyboard"> -->
</activity>
</application>

12
gvr-interface/CMakeLists.txt
View file

@ -19,12 +19,12 @@ set(ANDROID_API_LEVEL 19)
set(ANDROID_APK_PACKAGE io.highfidelity.gvrinterface)
# we need VRLib, so add a project.properties to our apk build folder that says that
find_path(_OCULUS_VRLIB_DIR NAME VRLib.vcxproj HINTS "/ovr_mobile_sdk/VRLib/")
if (NOT _OCULUS_VRLIB_DIR)
message(FATAL_ERROR "Could not find Oculus Mobile SDK VRLib.")
endif()
# find_path(_OCULUS_VRLIB_DIR NAME VRLib.vcxproj HINTS "/ovr_mobile_sdk/VRLib/")
# if (NOT _OCULUS_VRLIB_DIR)
# message(FATAL_ERROR "Could not find Oculus Mobile SDK VRLib.")
# endif()
file(RELATIVE_PATH RELATIVE_VRLIB_PATH ${ANDROID_APK_OUTPUT_DIR} "${_OCULUS_VRLIB_DIR}")
file(WRITE "${ANDROID_APK_BUILD_DIR}/project.properties" "android.library.reference.1=${RELATIVE_VRLIB_PATH}")
# file(RELATIVE_PATH RELATIVE_VRLIB_PATH ${ANDROID_APK_OUTPUT_DIR} "${_OCULUS_VRLIB_DIR}")
# file(WRITE "${ANDROID_APK_BUILD_DIR}/project.properties" "android.library.reference.1=${RELATIVE_VRLIB_PATH}")
qt_create_apk()