From 4602fbba34c4c73fa576eb5ccf2006543454a28f Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Thu, 4 May 2017 08:37:46 -0700 Subject: [PATCH] add missing openvr files to CMakeLists.txt, rename 64bit openvr_api.dll to openvr64pi.dll to avoid name conflicts when using 32 AND 64 bit versions of this dll. --- examples/SharedMemory/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/examples/SharedMemory/CMakeLists.txt b/examples/SharedMemory/CMakeLists.txt index dc848abec..1bd626572 100644 --- a/examples/SharedMemory/CMakeLists.txt +++ b/examples/SharedMemory/CMakeLists.txt @@ -249,6 +249,8 @@ LINK_LIBRARIES( ../ThirdPartyLibs/openvr/samples/shared/Matrices.h ../ThirdPartyLibs/openvr/samples/shared/pathtools.cpp ../ThirdPartyLibs/openvr/samples/shared/pathtools.h + ../ThirdPartyLibs/openvr/samples/shared/strtools.cpp + ../ThirdPartyLibs/openvr/samples/shared/strtools.h ../ThirdPartyLibs/openvr/samples/shared/Vectors.h ../MultiThreading/b3Win32ThreadSupport.cpp ../MultiThreading/b3Win32ThreadSupport.h @@ -261,7 +263,7 @@ IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) ADD_CUSTOM_COMMAND( TARGET App_PhysicsServer_SharedMemory_VR POST_BUILD - COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/openvr/bin/win64/openvr_api.dll ${CMAKE_CURRENT_BINARY_DIR}/openvr_api.dll + COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/openvr/bin/win64/openvr_api.dll ${CMAKE_CURRENT_BINARY_DIR}/openvr64pi.dll ) ELSE(CMAKE_CL_64) ADD_CUSTOM_COMMAND(