diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2011-08-25 19:12:57 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2011-08-25 19:12:57 +0400 |
| commit | d833d156082a6b10a958b8030276339bd7708550 (patch) | |
| tree | c3bd423a5b9fd7471b733042ca7576d5841d2485 /SConstruct | |
| parent | 8b6dfade4d9a91e2e20958ab7ce567532cc1443e (diff) | |
OSX: refine logic for NDOF, if WITH_BF_3DMOUSE is disabled also never do weak-link framework, existing or not
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/SConstruct b/SConstruct index 75b88c36e4c..4f7e8d04810 100644 --- a/SConstruct +++ b/SConstruct @@ -272,12 +272,12 @@ if env['OURPLATFORM']=='darwin': # for now, Mac builders must download and install the 3DxWare 10 Beta 4 driver framework from 3Dconnexion # necessary header file lives here when installed: # /Library/Frameworks/3DconnexionClient.framework/Versions/Current/Headers/ConnexionClientAPI.h - if not os.path.exists('/Library/Frameworks/3DconnexionClient.framework'): - print "3D_CONNEXION_CLIENT_LIBRARY not found, disabling WITH_BF_3DMOUSE" # avoid build errors ! - env['WITH_BF_3DMOUSE'] = 0 - else: - env.Append(LINKFLAGS=['-weak_framework','3DconnexionClient']) - + if env['WITH_BF_3DMOUSE'] == 1 + if not os.path.exists('/Library/Frameworks/3DconnexionClient.framework'): + print "3D_CONNEXION_CLIENT_LIBRARY not found, disabling WITH_BF_3DMOUSE" # avoid build errors ! + env['WITH_BF_3DMOUSE'] = 0 + else: + env.Append(LINKFLAGS=['-weak_framework','3DconnexionClient']) if env['WITH_BF_OPENMP'] == 1: if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): |