Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix Mac OSX build, openvr 32bit/64bit was not selected, library out-of-date

Browse Source
This commit is contained in:
Erwin Coumans
2017-10-11 17:20:26 -07:00
parent f2c64fdf40
commit 10527e12eb
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
examples/SharedMemory/CMakeLists.txt
View File

@@ -227,7 +227,7 @@ INCLUDE_DIRECTORIES(
LINK_LIBRARIES( LINK_LIBRARIES(
openvr_api Bullet3Common BulletWorldImporter BulletInverseDynamicsUtils BulletInverseDynamics BulletDynamics BulletCollision LinearMath BussIK OpenGLWindow Bullet3Common BulletWorldImporter BulletInverseDynamicsUtils BulletInverseDynamics BulletDynamics BulletCollision LinearMath BussIK openvr_api OpenGLWindow
) )
@@ -259,11 +259,14 @@ LINK_LIBRARIES(
../MultiThreading/b3PosixThreadSupport.cpp ../MultiThreading/b3PosixThreadSupport.cpp
../MultiThreading/b3PosixThreadSupport.h ../MultiThreading/b3PosixThreadSupport.h
) )
IF (CMAKE_CL_64)
LINK_DIRECTORIES(${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/openvr/lib/osx64) IF (CMAKE_SIZEOF_VOID_P MATCHES 8)
MESSAGE("CL64")
LINK_DIRECTORIES(${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/openvr/bin/osx64)
ELSE() ELSE()
MESSAGE("CL32")
set(ARCH_TARGET osx32) set(ARCH_TARGET osx32)
LINK_DIRECTORIES(${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/openvr/lib/osx32) LINK_DIRECTORIES(${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/openvr/bin/osx32)
ENDIF() ENDIF()
add_definitions(-DOSX -DPOSIX) add_definitions(-DOSX -DPOSIX)

BIN
examples/ThirdPartyLibs/openvr/bin/osx64/libopenvr_api.a
View File

Binary file not shown.