lpnf
/
lovr
mirror of https://github.com/bjornbytes/lovr.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Turn openvr into an imported library; 

It uses a deprecated version of CMake, creates weird directories,
is slow to compile, and causes tup to rely on CMake more.  Instead,
just use its binary artifacts directly.
This commit is contained in:
bjorn 2021-02-28 15:49:06 -07:00
parent cf4bb36d03
commit f3a12f2af9
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
CMakeLists.txt
View File

@ -167,21 +167,17 @@ endif()
# OpenVR
if(LOVR_ENABLE_HEADSET AND LOVR_USE_OPENVR)
set(BUILD_SHARED ON CACHE BOOL "")
set(BUILD_UNIVERSAL OFF CACHE BOOL "")
add_library(openvr SHARED IMPORTED)
include_directories(deps/openvr/headers)
include_directories(deps/openvr/src)
include_directories(deps/openvr/src/vrcommon)
if(WIN32 AND CMAKE_SIZEOF_VOID_P EQUAL 8)
set(LOVR_OPENVR openvr_api64)
if(WIN32)
set_target_properties(openvr PROPERTIES IMPORTED_LOCATION "${CMAKE_SOURCE_DIR}/deps/openvr/bin/win64/openvr_api.dll")
set_target_properties(openvr PROPERTIES IMPORTED_IMPLIB "${CMAKE_SOURCE_DIR}/deps/openvr/lib/win64/openvr_api.lib")
elseif(APPLE)
set_target_properties(openvr PROPERTIES IMPORTED_LOCATION "${CMAKE_SOURCE_DIR}/deps/openvr/bin/osx32/libopenvr_api.dylib")
else()
set(LOVR_OPENVR openvr_api)
set_target_properties(openvr PROPERTIES IMPORTED_LOCATION "${CMAKE_SOURCE_DIR}/deps/openvr/bin/linux64/libopenvr_api.so")
endif()
add_subdirectory(deps/openvr)
set_target_properties(${LOVR_OPENVR} PROPERTIES
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/openvr_api"
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/openvr_api"
)
set(LOVR_OPENVR openvr)
endif()
# OpenXR

10
Tuprules.tup
View File

@ -220,12 +220,12 @@ ifneq (@(CMAKE_DEPS),)
# OpenVR
CFLAGS_@(OPENVR) += -I$(DEPS)/openvr/headers
LDFLAGS_@(OPENVR)_$(win32) += -L$(DEPS)/openvr/bin/win64/$(CONFIG) -lopenvr_api64
LDFLAGS_@(OPENVR)_$(macos) += -L$(BUILD)/openvr_api -lopenvr_api
LDFLAGS_@(OPENVR)_$(linux) += -L$(BUILD)/openvr_api -lopenvr_api
LDFLAGS_@(OPENVR)_$(win32) += -L$(DEPS)/openvr/bin/win64 -lopenvr_api64
LDFLAGS_@(OPENVR)_$(macos) += -L$(DEPS)/openvr/bin/osx32 -lopenvr_api
LDFLAGS_@(OPENVR)_$(linux) += -L$(DEPS)/openvr/bin/linux64 -lopenvr_api
LIBS_@(OPENVR)_$(win32) += $(DEPS)/openvr/bin/win64/openvr_api.dll
LIBS_@(OPENVR)_$(macos) += $(BUILD)/openvr_api/libopenvr_api.dylib
LIBS_@(OPENVR)_$(linux) += $(BUILD)/openvr_api/libopenvr_api.so
LIBS_@(OPENVR)_$(macos) += $(DEPS)/openvr/bin/osx32/libopenvr_api.dylib
LIBS_@(OPENVR)_$(linux) += $(DEPS)/openvr/bin/linux64/libopenvr_api.so
# ODE
CFLAGS_@(PHYSICS) += -I$(DEPS)/ode/include -I$(BUILD)/ode/include