zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-11 07:11:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge commit 'refs/pull/338/head' of https://github.com/coelckers/gzdoom

Browse source
This commit is contained in:
Rachael Alexanderson 2017-05-30 14:59:24 -04:00
commit 56806e3243
1 changed files with 32 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/CMakeLists.txt
View file

@ -477,6 +477,13 @@ if (GZDOOM_USE_OPENVR)
${OPENVR_SDK_PATH}/headers ${OPENVR_SDK_PATH}/headers
) )
include_directories("${OPENVR_INCLUDE_DIRECTORY}") include_directories("${OPENVR_INCLUDE_DIRECTORY}")
option( GZDOOM_OPENVR_STATIC "Statically link OpenVR API" ON )
if(GZDOOM_OPENVR_STATIC)
# Incorporate the whole openvr API into zdoom, using a few rules lifted from the OpenVR CMakeLists.txt files
add_definitions( -DVR_API_PUBLIC )
include_directories(${OPENVR_SDK_PATH}/src ${OPENVR_SDK_PATH}/src/vrcommon)
file(GLOB OPENVR_SOURCES "${OPENVR_SDK_PATH}/src/*.cpp" "${OPENVR_SDK_PATH}/src/vrcommon/*.cpp")
else() # link to shared OpenVR library
# Link to correct library for this platform # Link to correct library for this platform
if(WIN32) if(WIN32)
set(OPENVR_PLAT "win") set(OPENVR_PLAT "win")
@ -495,13 +502,14 @@ if (GZDOOM_USE_OPENVR)
HINTS "${OPENVR_SDK_PATH}/lib/${OPENVR_PLAT}/" HINTS "${OPENVR_SDK_PATH}/lib/${OPENVR_PLAT}/"
) )
list(APPEND ZDOOM_LIBS ${OPENVR_LIBRARY}) list(APPEND ZDOOM_LIBS ${OPENVR_LIBRARY})
add_definitions("-DUSE_OPENVR")
# Find shared library file needed for package distribution # Find shared library file needed for package distribution
find_program(OPENVR_SHARED_LIBRARY find_program(OPENVR_SHARED_LIBRARY
NAMES libopenvr_api.so libopenvr_api.dylib openvr_api.dll NAMES libopenvr_api.so libopenvr_api.dylib openvr_api.dll
PATHS "${OPENVR_SDK_PATH}/bin/${OPENVR_PLAT}/" PATHS "${OPENVR_SDK_PATH}/bin/${OPENVR_PLAT}/"
NO_DEFAULT_PATH NO_DEFAULT_PATH
) )
endif()
add_definitions("-DUSE_OPENVR")
endif() endif()
# Start defining source files for ZDoom # Start defining source files for ZDoom
@ -1190,6 +1198,7 @@ add_executable( zdoom WIN32 MACOSX_BUNDLE
${X86_SOURCES} ${X86_SOURCES}
${FASTMATH_SOURCES} ${FASTMATH_SOURCES}
${PCH_SOURCES} ${PCH_SOURCES}
${OPENVR_SOURCES}
x86.cpp x86.cpp
strnatcmp.c strnatcmp.c
zstring.cpp zstring.cpp