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

Fixes for Oculus VR plugin

Browse source
This commit is contained in:
Dale Glass 2023-12-07 15:20:03 -08:00
parent 6a00d4baf8
commit 1b46ec600a
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -23,6 +23,8 @@ if (WIN32)
PATCH_COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/LibOVRCMakeLists.txt" <SOURCE_DIR>/CMakeLists.txt PATCH_COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/LibOVRCMakeLists.txt" <SOURCE_DIR>/CMakeLists.txt
LOG_DOWNLOAD 1 LOG_DOWNLOAD 1
DOWNLOAD_EXTRACT_TIMESTAMP 1 DOWNLOAD_EXTRACT_TIMESTAMP 1
BUILD_BYPRODUCTS
"project/Lib/LibOVR.lib"
) )
ExternalProject_Get_Property(${EXTERNAL_NAME} SOURCE_DIR) ExternalProject_Get_Property(${EXTERNAL_NAME} SOURCE_DIR)

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

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

11
plugins/CMakeLists.txt
View file

@ -13,17 +13,18 @@ list(REMOVE_ITEM PLUGIN_SUBDIRS "CMakeFiles")
# client-side plugins # client-side plugins
if (NOT SERVER_ONLY AND NOT ANDROID) if (NOT SERVER_ONLY AND NOT ANDROID)
if (NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") 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. # Check if we're building on MSVC 2022. If so, Oculus plugin fails to build.
set(DIR "oculus") set(DIR "oculus")
add_subdirectory(${DIR}) add_subdirectory(${DIR})
set(DIR "openvr")
add_subdirectory(${DIR})
set(DIR "oculusLegacy") set(DIR "oculusLegacy")
add_subdirectory(${DIR}) add_subdirectory(${DIR})
else()
message(WARNING "Building under ${CMAKE_CXX_COMPILER_ID}, MSVC Version ${MSVC_VERSION}. Oculus plugin unsupported, disabling.")
endif() endif()
set(DIR "openvr")
add_subdirectory(${DIR})
endif() endif()
set(DIR "hifiSdl2") set(DIR "hifiSdl2")