diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2011-12-13 02:17:02 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2011-12-13 02:17:02 +0400 |
| commit | 94bc2b0cffd27dc74f428aee86ca9e2782a14e0a (patch) | |
| tree | 729f493b7dccbe188d2638c941b42d9032538288 /SConstruct | |
| parent | 01478a3743f1d1fe3d641ff498953af027ca2e60 (diff) | |
OSX: proper scons config and linking weak for jackOSX and errorhandling
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct index 0bd7dc70446..d8db597d1c6 100644 --- a/SConstruct +++ b/SConstruct @@ -272,7 +272,7 @@ if 'blenderlite' in B.targets: if k not in B.arguments: env[k] = v -# Extended OSX_SDK and 3D_CONNEXION_CLIENT_LIBRARY detection for OSX +# Extended OSX_SDK and 3D_CONNEXION_CLIENT_LIBRARY and JAckOSX detection for OSX if env['OURPLATFORM']=='darwin': print B.bc.OKGREEN + "Detected Xcode version: -- " + B.bc.ENDC + env['XCODE_CUR_VER'][:9] + " --" print "Available " + env['MACOSX_SDK_CHECK'] @@ -291,6 +291,16 @@ if env['OURPLATFORM']=='darwin': else: env.Append(LINKFLAGS=['-Xlinker','-weak_framework','-Xlinker','3DconnexionClient']) + # for now, Mac builders must download and install the JackOSX framework + # necessary header file lives here when installed: + # /Library/Frameworks/Jackmp.framework/Versions/A/Headers/jack.h + if env['WITH_BF_JACK'] == 1: + if not os.path.exists('/Library/Frameworks/Jackmp.framework'): + 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']) + if env['WITH_BF_OPENMP'] == 1: if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): env['CCFLAGS'].append('/openmp') |