diff --git a/cmake/modules/FindLibOVR.cmake b/cmake/modules/FindLibOVR.cmake index caabda65db..015a1de42b 100644 --- a/cmake/modules/FindLibOVR.cmake +++ b/cmake/modules/FindLibOVR.cmake @@ -21,14 +21,7 @@ else (LIBOVR_LIBRARIES AND LIBOVR_INCLUDE_DIRS) find_path(LIBOVR_INCLUDE_DIRS OVR.h PATH_SUFFIXES Include HINTS ${LIBOVR_SEARCH_DIRS}) if (APPLE) - - if (${CMAKE_BUILD_TYPE}) - set(LIBOVR_LIBRARY_TYPE ${CMAKE_BUILD_TYPE}) - else() - set(LIBOVR_LIBRARY_TYPE "Debug") - endif() - - find_library(LIBOVR_LIBRARIES "Lib/MacOS/${LIBOVR_LIBRARY_TYPE}/libovr.a" HINTS ${LIBOVR_SEARCH_DIRS}) + find_library(LIBOVR_LIBRARIES "Lib/MacOS/Release/libovr.a" HINTS ${LIBOVR_SEARCH_DIRS}) elseif (UNIX) find_library(UDEV_LIBRARY libudev.a /usr/lib/x86_64-linux-gnu/) find_library(XINERAMA_LIBRARY libXinerama.a /usr/lib/x86_64-linux-gnu/) diff --git a/interface/external/oculus/readme.txt b/interface/external/oculus/readme.txt index d9ee5284d8..002047b73f 100644 --- a/interface/external/oculus/readme.txt +++ b/interface/external/oculus/readme.txt @@ -9,5 +9,11 @@ You can download the Oculus SDK from https://developer.oculusvr.com/ (account cr You may optionally choose to copy the SDK folders to a location outside the repository (so you can re-use with different checkouts and different projects). If so our CMake find module expects you to set the ENV variable 'HIFI_LIB_DIR' to a directory containing a subfolder 'oculus' that contains the three folders mentioned above. + + NOTE: On OS X there is a linker error with version 0.2.5c of the Oculus SDK. + It must be re-built (from the included LibOVR_With_Samples.xcodeproj) with RRTI support. + In XCode Build Settings for the ovr target, set "Enable C++ Runtime Types" to yes. + Then, Archive and use the organizer to save a copy of the built products. + In the exported directory you will have a new libovr.a to copy into the oculus directory from above. 2. Clear your build directory, run cmake and build, and you should be all set. \ No newline at end of file