mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 12:49:34 +02:00
only look for the 32-bit oculus lib on windows
This commit is contained in:
parent
4e382099fb
commit
002738037c
1 changed files with 5 additions and 17 deletions
|
@ -36,26 +36,14 @@ else (LIBOVR_LIBRARIES AND LIBOVR_INCLUDE_DIRS)
|
||||||
if (UDEV_LIBRARY AND XINERAMA_LIBRARY AND OVR_LIBRARY)
|
if (UDEV_LIBRARY AND XINERAMA_LIBRARY AND OVR_LIBRARY)
|
||||||
set(LIBOVR_LIBRARIES "${OVR_LIBRARY};${UDEV_LIBRARY};${XINERAMA_LIBRARY}" CACHE INTERNAL "Oculus libraries")
|
set(LIBOVR_LIBRARIES "${OVR_LIBRARY};${UDEV_LIBRARY};${XINERAMA_LIBRARY}" CACHE INTERNAL "Oculus libraries")
|
||||||
endif (UDEV_LIBRARY AND XINERAMA_LIBRARY AND OVR_LIBRARY)
|
endif (UDEV_LIBRARY AND XINERAMA_LIBRARY AND OVR_LIBRARY)
|
||||||
elseif (WIN32)
|
elseif (WIN32)
|
||||||
if (CMAKE_CL_64)
|
if (CMAKE_BUILD_TYPE MATCHES DEBUG)
|
||||||
set(WINDOWS_ARCH_DIR "Win32")
|
set(WINDOWS_LIBOVR_NAME "libovrd.lib")
|
||||||
|
|
||||||
if (CMAKE_BUILD_TYPE MATCHES DEBUG)
|
|
||||||
set(WINDOWS_LIBOVR_NAME "libovrd.lib")
|
|
||||||
else()
|
|
||||||
set(WINDOWS_LIBOVR_NAME "libovr.lib")
|
|
||||||
endif()
|
|
||||||
else()
|
else()
|
||||||
set(WINDOWS_ARCH_DIR "x64")
|
set(WINDOWS_LIBOVR_NAME "libovr.lib")
|
||||||
|
|
||||||
if (CMAKE_BUILD_TYPE MATCHES DEBUG)
|
|
||||||
set(WINDOWS_LIBOVR_NAME "libovr64d.lib")
|
|
||||||
else()
|
|
||||||
set(WINDOWS_LIBOVR_NAME "libovr64.lib")
|
|
||||||
endif()
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
find_library(LIBOVR_LIBRARIES "Lib/${WINDOWS_ARCH_DIR}/${LIBOVR_NAME}" HINTS ${LIBOVR_SEARCH_DIRS})
|
find_library(LIBOVR_LIBRARIES "Lib/Win32/${LIBOVR_NAME}" HINTS ${LIBOVR_SEARCH_DIRS})
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
if (LIBOVR_INCLUDE_DIRS AND LIBOVR_LIBRARIES)
|
if (LIBOVR_INCLUDE_DIRS AND LIBOVR_LIBRARIES)
|
||||||
|
|
Loading…
Reference in a new issue