Updated default native API level to 24 to support Choreographer. Upda…

…ted OSVR-Unity-Rendering submodule to include branch with vsync timings.
OSVR · Jul 31, 2017 · 7e6a9ea · 7e6a9ea
1 parent 26bd7a3
commit 7e6a9ea
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -37,7 +37,7 @@ if(NOT ANDROID_TOOLCHAIN_NAME AND ANDROID_ABI MATCHES "armeabi")
 endif()
 
 if(NOT ANDROID_NATIVE_API_LEVEL)
-    set(ANDROID_NATIVE_API_LEVEL "16" CACHE STRING "Android Native API Level")
+    set(ANDROID_NATIVE_API_LEVEL "24" CACHE STRING "Android Native API Level")
 endif()
 
 # Optional, externally-built osvr_json_to_c instance

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -214,6 +214,7 @@ osvr_android_add_common_cmake_arg("-DOpenCV_DIR=${OpenCV_DIR}")
 # Indicate where osvr_json_to_c is for ease of use
 osvr_android_add_common_cmake_arg("-DOSVR_JSON_TO_C_COMMAND=${OSVR_JSON_TO_C_COMMAND}")
 
+
 ExternalProject_Add(OSVR-Core
     SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/OSVR-Core"
     INSTALL_DIR "${ANDROID_INSTALL_DIR}"
@@ -247,7 +248,7 @@ add_ep_to_force(OSVR-RenderManager)
 ExternalProject_Add(OSVR-Unity-Rendering
     SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/OSVR-Unity-Rendering"
     INSTALL_DIR "${ANDROID_INSTALL_DIR}"
-    DEPENDS OSVR-Core OSVR-RenderManager#SDL2
+    DEPENDS OSVR-Core OSVR-RenderManager #SDL2
     CMAKE_GENERATOR "${ANDROID_GENERATOR}"
     CMAKE_ARGS
     ${COMMON_CMAKE_ARGS}

diff --git a/src/OSVR-Unity-Rendering b/src/OSVR-Unity-Rendering