diff options
author | Jens Verwiebe <info@jensverwiebe.de> | 2012-12-12 23:54:14 +0400 |
---|---|---|
committer | Jens Verwiebe <info@jensverwiebe.de> | 2012-12-12 23:54:14 +0400 |
commit | 8af6721eb5c94f29c3d4d21c0b1431dda3b1cf84 (patch) | |
tree | 6224dac6aa59d8faac66fab0f091cfa01271d3c7 /intern | |
parent | fc65922124a17a01c90615eb1723c64058f372a8 (diff) |
OSX: make cmake and scons both compile jack and ndof with newer sdk's
Diffstat (limited to 'intern')
-rw-r--r-- | intern/ghost/SConscript | 2 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_NDOFManagerCocoa.mm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript index 44882a64286..96d9cfb98f8 100644 --- a/intern/ghost/SConscript +++ b/intern/ghost/SConscript @@ -93,7 +93,7 @@ else: if env['WITH_BF_3DMOUSE']: defs.append('WITH_INPUT_NDOF') - if env['OURPLATFORM']=='linux': + if env['OURPLATFORM'] in ('linux','darwin'): incs += ' ' + env['BF_3DMOUSE_INC'] else: sources.remove('intern' + os.sep + 'GHOST_NDOFManager.cpp') diff --git a/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm b/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm index d29dd4dd3e8..0d009e17561 100644 --- a/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm +++ b/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm @@ -27,7 +27,7 @@ #include "GHOST_SystemCocoa.h" extern "C" { - #include <3DconnexionClient/ConnexionClientAPI.h> + #include <ConnexionClientAPI.h> #include <stdio.h> } |