suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #71 from ianrrees/20151216-3dconnexion-mac

Browse Source 
Fixed paths for 3Dconnexion headers on Mac
This commit is contained in:
wwmayer 2015-12-19 14:19:58 +01:00
commit eb5ec62ccb
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Gui/CMakeLists.txt
View File

@ -12,7 +12,8 @@ if (FREECAD_USE_3DCONNEXION)
add_definitions(-D_USE_3DCONNEXION_SDK) add_definitions(-D_USE_3DCONNEXION_SDK)
if(APPLE) if(APPLE)
set(3DCONNEXION_LINKFLAGS "-F/Library/Frameworks -weak_framework 3DconnexionClient") set(3DCONNEXION_LINKFLAGS "-F/Library/Frameworks -weak_framework 3DconnexionClient")
set(3DCONNEXION_INCLUDE_DIR ${3DCONNEXIONCLIENT_FRAMEWORK}/Headers ) set(3DCONNEXION_INCLUDE_DIR ${3DCONNEXIONCLIENT_FRAMEWORK}/Headers
${3DCONNEXIONCLIENT_FRAMEWORK}/Headers/3DconnexionClient )
endif(APPLE) endif(APPLE)
endif(FREECAD_USE_3DCONNEXION) endif(FREECAD_USE_3DCONNEXION)

2
src/Gui/GuiApplicationNativeEventAware.h
View File

@ -45,7 +45,7 @@ class QMainWindow;
#ifdef Q_WS_MACX #ifdef Q_WS_MACX
#include <IOKit/IOKitLib.h> #include <IOKit/IOKitLib.h>
#include <3DconnexionClient/ConnexionClientAPI.h> #include <ConnexionClientAPI.h>
extern OSErr InstallConnexionHandlers(ConnexionMessageHandlerProc messageHandler, ConnexionAddedHandlerProc addedHandler, ConnexionRemovedHandlerProc removedHandler) extern OSErr InstallConnexionHandlers(ConnexionMessageHandlerProc messageHandler, ConnexionAddedHandlerProc addedHandler, ConnexionRemovedHandlerProc removedHandler)
__attribute__((weak_import)); __attribute__((weak_import));
extern UInt16 RegisterConnexionClient(UInt32 signature, UInt8 *name, UInt16 mode, UInt32 mask) __attribute__((weak_import)); extern UInt16 RegisterConnexionClient(UInt32 signature, UInt8 *name, UInt16 mode, UInt32 mask) __attribute__((weak_import));