[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39692] trunk/blender/SConstruct: OSX: refine logic for NDOF, if WITH_BF_3DMOUSE is disabled also never do weak-link framework, existing or not

[jens verwiebe]

Revision: 39692
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39692
Author:   jensverwiebe
Date:     2011-08-25 15:12:57 +0000 (Thu, 25 Aug 2011)
Log Message:
-----------
OSX: refine logic for NDOF, if WITH_BF_3DMOUSE is disabled also never do weak-link framework, existing or not

Modified Paths:
--------------
    trunk/blender/SConstruct

Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct	2011-08-25 14:49:47 UTC (rev 39691)
+++ trunk/blender/SConstruct	2011-08-25 15:12:57 UTC (rev 39692)
@@ -272,13 +272,13 @@
     # 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'):
                 env['CCFLAGS'].append('/openmp')