WIP: trying to fix windows not finding framework

This commit is contained in:
SamGondelman 2015-07-30 18:11:24 -07:00
parent a01a4f929f
commit 25e75bcc79
3 changed files with 4 additions and 5 deletions

View file

@ -28,9 +28,8 @@ if (APPLE)
else () else ()
message(STATUS "Could NOT find 3DConnexionClient") message(STATUS "Could NOT find 3DConnexionClient")
endif() endif()
endif() elseif (WIN32)
message(STATUS ${CONNEXIONCLIENT_SEARCH_DIRS})
if (WIN32)
find_path(3DCONNEXIONCLIENT_INCLUDE_DIRS I3dMouseParams.h PATH_SUFFIXES Inc HINTS ${CONNEXIONCLIENT_SEARCH_DIRS}) find_path(3DCONNEXIONCLIENT_INCLUDE_DIRS I3dMouseParams.h PATH_SUFFIXES Inc HINTS ${CONNEXIONCLIENT_SEARCH_DIRS})
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)

View file

@ -158,7 +158,7 @@ ConnexionClient& ConnexionClient::getInstance() {
#ifdef HAVE_3DCONNEXIONCLIENT #ifdef HAVE_3DCONNEXIONCLIENT
#ifdef _WIN32 #ifdef Q_OS_WIN
static ConnexionClient* gMouseInput = 0; static ConnexionClient* gMouseInput = 0;

View file

@ -33,7 +33,7 @@ public slots:
#ifdef HAVE_3DCONNEXIONCLIENT #ifdef HAVE_3DCONNEXIONCLIENT
// the windows connexion rawinput // the windows connexion rawinput
#ifdef _WIN32 #ifdef Q_OS_WIN
#include "I3dMouseParams.h" #include "I3dMouseParams.h"
#include <QAbstractNativeEventFilter> #include <QAbstractNativeEventFilter>