From b25a2a1918858356fb064f49be0e91882babbca2 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 22 Jan 2015 10:23:07 -0800 Subject: [PATCH] temporary removal of VRLib requirement --- cmake/android/AndroidManifest.xml.in | 6 +++--- gvr-interface/CMakeLists.txt | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cmake/android/AndroidManifest.xml.in b/cmake/android/AndroidManifest.xml.in index 36a2fcd238..32c657444b 100755 --- a/cmake/android/AndroidManifest.xml.in +++ b/cmake/android/AndroidManifest.xml.in @@ -6,7 +6,7 @@ - + - + android:configChanges="screenSize|orientation|keyboardHidden|keyboard"> --> diff --git a/gvr-interface/CMakeLists.txt b/gvr-interface/CMakeLists.txt index 451851dd94..372ca68308 100644 --- a/gvr-interface/CMakeLists.txt +++ b/gvr-interface/CMakeLists.txt @@ -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() \ No newline at end of file