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

Merge pull request #758 from daleglass-overte/fix-oculus

Browse source 
Fixes for Oculus VR plugin
This commit is contained in:
Dale Glass 2023-12-08 15:19:18 +01:00 committed by GitHub
commit e9628a84c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cmake/externals/LibOVR/CMakeLists.txt vendored
View file

@ -15,14 +15,22 @@ string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
if (WIN32)
# Note the -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
# It's important that we pass our build type down to other builds we make, especially on Windows.
# On Windows, debug libraries get a 'd' suffix, eg, LibOVRd.lib. This means that a mismatch of build
# types means we'll generate a LibOVRd.lib and the rest of the system will look for LibOVR.lib, or
# viceversa.
ExternalProject_Add(
${EXTERNAL_NAME}
URL "${EXTERNAL_BUILD_ASSETS}/dependencies/ovr_sdk_win_1.35.0.zip"
URL_MD5 1e3e8b2101387af07ff9c841d0ea285e
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
PATCH_COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/LibOVRCMakeLists.txt" <SOURCE_DIR>/CMakeLists.txt
LOG_DOWNLOAD 1
DOWNLOAD_EXTRACT_TIMESTAMP 1
BUILD_BYPRODUCTS
"project/Lib/LibOVR.lib"
"project/Lib/LibOVRd.lib"
)
ExternalProject_Get_Property(${EXTERNAL_NAME} SOURCE_DIR)

4
cmake/externals/LibOVR/LibOVRCMakeLists.txt vendored
View file

@ -1,6 +1,8 @@
cmake_minimum_required(VERSION 3.2)
cmake_minimum_required(VERSION 3.20)
project(LibOVR)
message(STATUS "Building LibOVR for ${CMAKE_BUILD_TYPE} configuration")
include_directories(LibOVR/Include LibOVR/Src)
file(GLOB HEADER_FILES LibOVR/Include/*.h)
file(GLOB EXTRA_HEADER_FILES LibOVR/Include/Extras/*.h)

2
cmake/externals/LibOVRPlatform/CMakeLists.txt vendored
View file

@ -16,6 +16,8 @@ if (WIN32)
INSTALL_COMMAND ""
LOG_DOWNLOAD 1
DOWNLOAD_EXTRACT_TIMESTAMP 1
BUILD_BYPRODUCTS
"project/src/LibOVRPlatform/Windows/LibOVRPlatform64_1.lib"
)
ExternalProject_Get_Property(${EXTERNAL_NAME} SOURCE_DIR)

12
plugins/CMakeLists.txt
View file

@ -13,17 +13,19 @@ list(REMOVE_ITEM PLUGIN_SUBDIRS "CMakeFiles")
# client-side plugins
if (NOT SERVER_ONLY AND NOT ANDROID)
if (NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
if (NOT ((CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") AND (MSVC_VERSION LESS 1930)))
if ((CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") AND (MSVC_VERSION GREATER 1930))
message(WARNING "Building under ${CMAKE_CXX_COMPILER_ID}, MSVC Version ${MSVC_VERSION}. Oculus plugin unsupported, disabling.")
else()
# Check if we're building on MSVC 2022. If so, Oculus plugin fails to build.
set(DIR "oculus")
add_subdirectory(${DIR})
set(DIR "openvr")
add_subdirectory(${DIR})
set(DIR "oculusLegacy")
add_subdirectory(${DIR})
else()
message(WARNING "Building under ${CMAKE_CXX_COMPILER_ID}, MSVC Version ${MSVC_VERSION}. Oculus plugin unsupported, disabling.")
endif()
# Note: OpenVR is a Steam thing, which is different from OVR, which is an Oculus SDK component.
set(DIR "openvr")
add_subdirectory(${DIR})
endif()
set(DIR "hifiSdl2")