Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-04-05 18:46:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Re-enable building Oculus plugin on VS 2022

Browse source
This commit is contained in:
Dale Glass 2023-12-08 06:27:33 -08:00
parent 94848d98a2
commit a79cd1e6ce
2 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
plugins/CMakeLists.txt
View file

@ -12,22 +12,17 @@ list(REMOVE_ITEM PLUGIN_SUBDIRS "CMakeFiles")
# client-side plugins
if (NOT SERVER_ONLY AND NOT ANDROID)
if (NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
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.
if (WIN32 AND (NOT USE_GLES))
set(DIR "oculus")
add_subdirectory(${DIR})
set(DIR "oculusLegacy")
add_subdirectory(${DIR})
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()
# Note: OpenVR is a Steam thing, which is different from OVR, which is an Oculus SDK component.
set(DIR "openvr")
add_subdirectory(${DIR})
set(DIR "hifiSdl2")
add_subdirectory(${DIR})

2
plugins/oculus/CMakeLists.txt
View file

@ -8,7 +8,7 @@
# SPDX-License-Identifier: Apache-2.0
#
if (WIN32 AND (NOT USE_GLES) AND (MSVC_VERSION LESS 1930) )
if (WIN32 AND (NOT USE_GLES))
# if we were passed an Oculus App ID for entitlement checks, send that along
if (DEFINED ENV{OCULUS_APP_ID})