Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2011-08-08 02:48:04 +0400
committerThomas Dinges <blender@dingto.org>2011-08-08 02:48:04 +0400
commitfad243a4bfd0414b0f8656c570c23ba72012cd40 (patch)
treecf0a6e0b91799b0cb93a3d86d1ab32ede3631ed9 /SConstruct
parent28ae6d85fee9ec32c7a16b9fa004ba6fef3d84f8 (diff)
Mac Compile fix for ndof, by jensverwiebe. Thanks!
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct4
1 files changed, 3 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct
index b35f3fdbf7b..7b25f744103 100644
--- a/SConstruct
+++ b/SConstruct
@@ -265,9 +265,11 @@ if env['OURPLATFORM']=='darwin':
# 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'):
+ if env['WITH_BF_3DMOUSE'] == 1 and 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
+ env['FOUND_NDOF_DRIVERS'] = 0
+
if env['WITH_BF_OPENMP'] == 1:
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):