From bdc519743c32434c006e04bab79777222dc16b77 Mon Sep 17 00:00:00 2001 From: Ian Rees Date: Wed, 16 Dec 2015 17:20:12 +1300 Subject: [PATCH] Fixed paths for 3Dconnexion headers on Mac --- src/Gui/CMakeLists.txt | 3 ++- src/Gui/GuiApplicationNativeEventAware.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Gui/CMakeLists.txt b/src/Gui/CMakeLists.txt index ea5638607..2bfd303a8 100644 --- a/src/Gui/CMakeLists.txt +++ b/src/Gui/CMakeLists.txt @@ -12,7 +12,8 @@ if (FREECAD_USE_3DCONNEXION) add_definitions(-D_USE_3DCONNEXION_SDK) if(APPLE) 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(FREECAD_USE_3DCONNEXION) diff --git a/src/Gui/GuiApplicationNativeEventAware.h b/src/Gui/GuiApplicationNativeEventAware.h index c03312388..243269f33 100644 --- a/src/Gui/GuiApplicationNativeEventAware.h +++ b/src/Gui/GuiApplicationNativeEventAware.h @@ -45,7 +45,7 @@ class QMainWindow; #ifdef Q_WS_MACX #include -#include <3DconnexionClient/ConnexionClientAPI.h> +#include extern OSErr InstallConnexionHandlers(ConnexionMessageHandlerProc messageHandler, ConnexionAddedHandlerProc addedHandler, ConnexionRemovedHandlerProc removedHandler) __attribute__((weak_import)); extern UInt16 RegisterConnexionClient(UInt32 signature, UInt8 *name, UInt16 mode, UInt32 mask) __attribute__((weak_import));