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 | |
| parent | fc65922124a17a01c90615eb1723c64058f372a8 (diff) | |
OSX: make cmake and scons both compile jack and ndof with newer sdk's
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | SConstruct | 5 | ||||
| -rw-r--r-- | build_files/scons/config/darwin-config.py | 2 | ||||
| -rw-r--r-- | intern/ghost/SConscript | 2 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_NDOFManagerCocoa.mm | 2 |
5 files changed, 7 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7433d7259ac..9b9fafdf514 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1522,7 +1522,7 @@ elseif(APPLE) if(WITH_INPUT_NDOF) set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -F/Library/Frameworks -weak_framework 3DconnexionClient") - set(NDOF_INCLUDE_DIRS /Library/Frameworks/3DconnexionClient.framework ) + set(NDOF_INCLUDE_DIRS /Library/Frameworks/3DconnexionClient.framework/Headers ) endif() endif() diff --git a/SConstruct b/SConstruct index c2bae0459ca..34d1742ee56 100644 --- a/SConstruct +++ b/SConstruct @@ -294,7 +294,8 @@ if env['OURPLATFORM']=='darwin': print "3D_CONNEXION_CLIENT_LIBRARY not found, disabling WITH_BF_3DMOUSE" # avoid build errors ! env['WITH_BF_3DMOUSE'] = 0 else: - env.Append(LINKFLAGS=['-Xlinker','-weak_framework','-Xlinker','3DconnexionClient']) + env.Append(LINKFLAGS=['-F/Library/Frameworks','-Xlinker','-weak_framework','-Xlinker','3DconnexionClient']) + env['BF_3DMOUSE_INC'] = '/Library/Frameworks/3DconnexionClient.framework/Headers' # for now, Mac builders must download and install the JackOSX framework # necessary header file lives here when installed: @@ -304,7 +305,7 @@ if env['OURPLATFORM']=='darwin': print "JackOSX install not found, disabling WITH_BF_JACK" # avoid build errors ! env['WITH_BF_JACK'] = 0 else: - env.Append(LINKFLAGS=['-Xlinker','-weak_framework','-Xlinker','Jackmp']) + env.Append(LINKFLAGS=['-L/Library/Frameworks','-Xlinker','-weak_framework','-Xlinker','Jackmp']) if env['WITH_BF_CYCLES_OSL'] == 1: OSX_OSL_LIBPATH = Dir(env.subst(env['BF_OSL_LIBPATH'])).abspath diff --git a/build_files/scons/config/darwin-config.py b/build_files/scons/config/darwin-config.py index 252a1b1b37e..207ddd3579b 100644 --- a/build_files/scons/config/darwin-config.py +++ b/build_files/scons/config/darwin-config.py @@ -165,7 +165,7 @@ BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a' WITH_BF_JACK = True BF_JACK = '/Library/Frameworks/Jackmp.framework' BF_JACK_INC = '${BF_JACK}/headers' -BF_JACK_LIB = 'jack' +#BF_JACK_LIB = 'jack' # not used due framework BF_JACK_LIBPATH = '${BF_JACK}' WITH_BF_SNDFILE = True 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> } |