diff --git a/libraries/input-plugins/CMakeLists.txt b/libraries/input-plugins/CMakeLists.txt index 4a56dfa241..c3ded6c587 100644 --- a/libraries/input-plugins/CMakeLists.txt +++ b/libraries/input-plugins/CMakeLists.txt @@ -21,10 +21,12 @@ add_dependency_external_projects(glm) find_package(GLM REQUIRED) target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS}) -add_dependency_external_projects(OpenVR) -find_package(OpenVR REQUIRED) -target_include_directories(${TARGET_NAME} PRIVATE ${OPENVR_INCLUDE_DIRS}) -target_link_libraries(${TARGET_NAME} ${OPENVR_LIBRARIES}) +if (WIN32) + add_dependency_external_projects(OpenVR) + find_package(OpenVR REQUIRED) + target_include_directories(${TARGET_NAME} PRIVATE ${OPENVR_INCLUDE_DIRS}) + target_link_libraries(${TARGET_NAME} ${OPENVR_LIBRARIES}) +endif() #add_dependency_external_projects(Sixense) #find_package(Sixense REQUIRED) diff --git a/libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp b/libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp index f7b35305b2..caa1f7e1c4 100644 --- a/libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp +++ b/libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp @@ -22,7 +22,7 @@ #include #include "UserActivityLogger.h" -#ifndef Q_OS_MAC +#ifdef Q_OS_WIN extern vr::IVRSystem* _hmd; extern int hmdRefCount; extern vr::TrackedDevicePose_t _trackedDevicePose[vr::k_unMaxTrackedDeviceCount]; @@ -64,7 +64,7 @@ ViveControllerManager::ViveControllerManager() : } bool ViveControllerManager::isSupported() const { -#ifndef Q_OS_MAC +#ifdef Q_OS_WIN return vr::VR_IsHmdPresent(); #else return false; @@ -72,7 +72,7 @@ bool ViveControllerManager::isSupported() const { } void ViveControllerManager::activate(PluginContainer* container) { -#ifndef Q_OS_MAC +#ifdef Q_OS_WIN container->addMenu(MENU_PATH); container->addMenuItem(MENU_PATH, RENDER_CONTROLLERS, [this] (bool clicked) { this->setRenderControllers(clicked); }, @@ -136,7 +136,7 @@ void ViveControllerManager::activate(PluginContainer* container) { } void ViveControllerManager::deactivate(PluginContainer* container) { -#ifndef Q_OS_MAC +#ifdef Q_OS_WIN container->removeMenuItem(MENU_NAME, RENDER_CONTROLLERS); container->removeMenu(MENU_PATH); @@ -213,7 +213,7 @@ void ViveControllerManager::renderHand(UserInputMapper::PoseValue pose, gpu::Bat } void ViveControllerManager::update(float deltaTime, bool jointsCaptured) { -#ifndef Q_OS_MAC +#ifdef Q_OS_WIN _poseStateMap.clear(); // TODO: This shouldn't be necessary