Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 03:58:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

trying to fix mac linking errors

Browse source
This commit is contained in:
Sam Gondelman 2015-08-03 16:35:34 -07:00
parent c9780338ae
commit 95232920f1
3 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/modules/Find3DConnexionClient.cmake
View file

@ -18,7 +18,7 @@ include("${MACRO_DIR}/HifiLibrarySearchHints.cmake")
hifi_library_search_hints("3dconnexionclient") hifi_library_search_hints("3dconnexionclient")
if (APPLE) if (APPLE)
find_library(3DConnexionClient 3DConnexionClient) find_library(3DCONNEXIONCLIENT_LIBRARIES NAMES 3DConnexionClient HINTS 3DCONNEXIONCLIENT_SEARCH_DIRS)
if(EXISTS ${3DConnexionClient}) if(EXISTS ${3DConnexionClient})
set(3DCONNEXIONCLIENT_FOUND true) set(3DCONNEXIONCLIENT_FOUND true)
set(3DCONNEXIONCLIENT_INCLUDE_DIRS ${3DConnexionClient}) set(3DCONNEXIONCLIENT_INCLUDE_DIRS ${3DConnexionClient})

12
interface/src/devices/3DConnexionClient.cpp
View file

@ -316,14 +316,6 @@ bool ConnexionClient::RawInputEventFilter(void* msg, long* result) {
return false; return false;
} }
ConnexionClient::ConnexionClient() {
}
ConnexionClient::~ConnexionClient() {
}
// Access the mouse parameters structure // Access the mouse parameters structure
I3dMouseParam& ConnexionClient::MouseParams() { I3dMouseParam& ConnexionClient::MouseParams() {
return f3dMouseParams; return f3dMouseParams;
@ -803,10 +795,6 @@ MouseParameters::MouseParameters() :
{ {
} }
MouseParameters::~MouseParameters()
{
}
bool MouseParameters::IsPanZoom() const { bool MouseParameters::IsPanZoom() const {
return fIsPanZoom; return fIsPanZoom;
} }

4
interface/src/devices/3DConnexionClient.h
View file

@ -45,7 +45,6 @@ public slots:
class MouseParameters : public I3dMouseParam { class MouseParameters : public I3dMouseParam {
public: public:
MouseParameters(); MouseParameters();
~MouseParameters();
// I3dmouseSensor interface // I3dmouseSensor interface
bool IsPanZoom() const; bool IsPanZoom() const;
@ -86,8 +85,7 @@ private:
class ConnexionClient : public QObject, public QAbstractNativeEventFilter { class ConnexionClient : public QObject, public QAbstractNativeEventFilter {
Q_OBJECT Q_OBJECT
public: public:
ConnexionClient(); ConnexionClient() {};
~ConnexionClient();
static ConnexionClient& getInstance(); static ConnexionClient& getInstance();
void init(); void init();