mirror of https://github.com/bjornbytes/lovr.git
Embed submo's to VR SDKs
This commit is contained in:
parent
25bb12d07c
commit
1756983eb3
|
@ -10,6 +10,4 @@ plugins
|
||||||
*.config
|
*.config
|
||||||
Activity*.java
|
Activity*.java
|
||||||
AndroidManifest*.xml
|
AndroidManifest*.xml
|
||||||
deps/VrApi
|
|
||||||
deps/pico
|
|
||||||
deps/OpenXR-Oculus
|
deps/OpenXR-Oculus
|
||||||
|
|
|
@ -19,3 +19,12 @@
|
||||||
[submodule "deps/openxr"]
|
[submodule "deps/openxr"]
|
||||||
path = deps/openxr
|
path = deps/openxr
|
||||||
url = https://github.com/khronosgroup/openxr-sdk
|
url = https://github.com/khronosgroup/openxr-sdk
|
||||||
|
[submodule "deps/oculus-mobile"]
|
||||||
|
path = deps/oculus-mobile
|
||||||
|
url = https://github.com/lovr-org/ovr_sdk_mobile
|
||||||
|
[submodule "deps/pico"]
|
||||||
|
path = deps/pico
|
||||||
|
url = https://github.com/lovr-org/pico_native_sdk
|
||||||
|
[submodule "deps/oculus-pc"]
|
||||||
|
path = deps/oculus-pc
|
||||||
|
url = https://github.com/lovr-org/ovr_sdk_pc
|
||||||
|
|
|
@ -215,9 +215,7 @@ endif()
|
||||||
|
|
||||||
# Oculus SDK -- expects Oculus SDK 1.26.0 or later
|
# Oculus SDK -- expects Oculus SDK 1.26.0 or later
|
||||||
if(LOVR_ENABLE_HEADSET AND LOVR_USE_OCULUS)
|
if(LOVR_ENABLE_HEADSET AND LOVR_USE_OCULUS)
|
||||||
if(NOT LOVR_OCULUS_PATH)
|
set(LOVR_OCULUS_PATH "${CMAKE_CURRENT_SOURCE_DIR}/deps/oculus-pc" CACHE STRING "Location of the Oculus Desktop SDK folder")
|
||||||
message(FATAL_ERROR "LOVR_USE_OCULUS requires the LOVR_OCULUS_PATH to be set to the location of the Oculus Desktop SDK (LibOVR) folder")
|
|
||||||
endif()
|
|
||||||
set(OCULUS_BUILD_TYPE "Release")
|
set(OCULUS_BUILD_TYPE "Release")
|
||||||
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
|
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
|
||||||
set(OCULUS_ARCH "x64")
|
set(OCULUS_ARCH "x64")
|
||||||
|
@ -226,12 +224,12 @@ if(LOVR_ENABLE_HEADSET AND LOVR_USE_OCULUS)
|
||||||
endif()
|
endif()
|
||||||
include_directories("${LOVR_OCULUS_PATH}/LibOVR/Include")
|
include_directories("${LOVR_OCULUS_PATH}/LibOVR/Include")
|
||||||
link_directories("${LOVR_OCULUS_PATH}/LibOVR/Lib/Windows/${OCULUS_ARCH}/${OCULUS_BUILD_TYPE}/VS2017")
|
link_directories("${LOVR_OCULUS_PATH}/LibOVR/Lib/Windows/${OCULUS_ARCH}/${OCULUS_BUILD_TYPE}/VS2017")
|
||||||
set(LOVR_OCULUS LibOVR)
|
set(LOVR_OCULUS "${LOVR_OCULUS_PATH}/LibOVR/Lib/Windows/${OCULUS_ARCH}/${OCULUS_BUILD_TYPE}/VS2017/LibOVR.lib")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# VrApi (Oculus Mobile SDK) -- tested on 1.34.0
|
# VrApi (Oculus Mobile SDK) -- tested on 1.34.0
|
||||||
if(LOVR_ENABLE_HEADSET AND LOVR_USE_VRAPI)
|
if(LOVR_ENABLE_HEADSET AND LOVR_USE_VRAPI)
|
||||||
set(LOVR_VRAPI_PATH "${CMAKE_CURRENT_SOURCE_DIR}/deps/VrApi" CACHE STRING "The path to the VrApi folder of the Oculus Mobile SDK")
|
set(LOVR_VRAPI_PATH "${CMAKE_CURRENT_SOURCE_DIR}/deps/oculus-mobile/VrApi" CACHE STRING "The path to the VrApi folder of the Oculus Mobile SDK")
|
||||||
add_library(VrApi SHARED IMPORTED)
|
add_library(VrApi SHARED IMPORTED)
|
||||||
include_directories("${LOVR_VRAPI_PATH}/Include")
|
include_directories("${LOVR_VRAPI_PATH}/Include")
|
||||||
set_target_properties(VrApi PROPERTIES IMPORTED_LOCATION "${LOVR_VRAPI_PATH}/Libs/Android/${ANDROID_ABI}/Release/libvrapi.so")
|
set_target_properties(VrApi PROPERTIES IMPORTED_LOCATION "${LOVR_VRAPI_PATH}/Libs/Android/${ANDROID_ABI}/Release/libvrapi.so")
|
||||||
|
@ -240,7 +238,7 @@ endif()
|
||||||
|
|
||||||
# Pico Native SDK (1.3.3)
|
# Pico Native SDK (1.3.3)
|
||||||
if(LOVR_ENABLE_HEADSET AND LOVR_USE_PICO)
|
if(LOVR_ENABLE_HEADSET AND LOVR_USE_PICO)
|
||||||
set(LOVR_PICO_PATH "${CMAKE_CURRENT_SOURCE_DIR}/deps/pico" CACHE STRING "The path to the Pico SDK folder (unzipped aar)")
|
set(LOVR_PICO_PATH "${CMAKE_CURRENT_SOURCE_DIR}/deps/pico/aar" CACHE STRING "The path to the Pico SDK folder")
|
||||||
add_library(Pvr_NativeSDK SHARED IMPORTED)
|
add_library(Pvr_NativeSDK SHARED IMPORTED)
|
||||||
set_target_properties(Pvr_NativeSDK PROPERTIES IMPORTED_LOCATION "${LOVR_PICO_PATH}/jni/${ANDROID_ABI}/libPvr_NativeSDK.so")
|
set_target_properties(Pvr_NativeSDK PROPERTIES IMPORTED_LOCATION "${LOVR_PICO_PATH}/jni/${ANDROID_ABI}/libPvr_NativeSDK.so")
|
||||||
set(LOVR_PICO Pvr_NativeSDK)
|
set(LOVR_PICO Pvr_NativeSDK)
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 50a3e48ff87960f10f517208794dfc64df36aeb4
|
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 6ee999756bd0d95952615a90f9e11786359297c8
|
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 418d31425e3873749bbd6a7cb97641635df6e398
|
Loading…
Reference in New Issue