diff options
author | Mike Erwin <significant.bit@gmail.com> | 2011-08-07 20:29:05 +0400 |
---|---|---|
committer | Mike Erwin <significant.bit@gmail.com> | 2011-08-07 20:29:05 +0400 |
commit | 6a0bbfd0e47e81fcb66cc91291adbcf1e6e87284 (patch) | |
tree | 30d8f93476ded47046dc69839419391af4527b39 /SConstruct | |
parent | bf23acf3bb8ae43e6a50108a00e7572fe35edea4 (diff) |
fixed ndof library detect for Mac SCons, ndof enabled by default (disabled if lib not found), minor cleanup
Diffstat (limited to 'SConstruct')
-rw-r--r-- | SConstruct | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/SConstruct b/SConstruct index 4f920190276..b422892680d 100644 --- a/SConstruct +++ b/SConstruct @@ -255,13 +255,12 @@ if 'blenderlite' in B.targets: # detect presence of 3D_CONNEXION_CLIENT_LIBRARY for OSX if env['OURPLATFORM']=='darwin': - envi = Environment() - conf = Configure(envi) - if not conf.CheckCHeader('ConnexionClientAPI.h'): # CheckCXXHeader if it is c++ ! + # for now, Mac builders must download and install the 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 - envi = conf.Finish() - if env['WITH_BF_OPENMP'] == 1: if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): |