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 /SConstruct | |
| parent | fc65922124a17a01c90615eb1723c64058f372a8 (diff) | |
OSX: make cmake and scons both compile jack and ndof with newer sdk's
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 5 |
1 files changed, 3 insertions, 2 deletions
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 |