[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60272] trunk/blender/intern/ghost/ SConscript: OSX/scons: fix linking errors due bf_intern_ghostndof3dconnexion was build even if no 3Dmouseware was detected

jens verwiebe info at jensverwiebe.de
Fri Sep 20 20:52:39 CEST 2013


Revision: 60272
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60272
Author:   jensverwiebe
Date:     2013-09-20 18:52:39 +0000 (Fri, 20 Sep 2013)
Log Message:
-----------
OSX/scons: fix linking errors due bf_intern_ghostndof3dconnexion was build even if no 3Dmouseware was detected

Modified Paths:
--------------
    trunk/blender/intern/ghost/SConscript

Modified: trunk/blender/intern/ghost/SConscript
===================================================================
--- trunk/blender/intern/ghost/SConscript	2013-09-20 18:47:12 UTC (rev 60271)
+++ trunk/blender/intern/ghost/SConscript	2013-09-20 18:52:39 UTC (rev 60272)
@@ -157,8 +157,9 @@
 
 elif env['WITH_GHOST_COCOA']:	 # always use default-Apple-gcc for objC language, for gnu-compilers do not support it fully yet
     env.BlenderLib ('bf_intern_ghost', sources, Split(incs), defines=defs, libtype=['intern','player'], priority = [40,15], cc_compilerchange='/usr/bin/gcc', cxx_compilerchange='/usr/bin/g++' )
-    env.BlenderLib ('bf_intern_ghostndof3dconnexion', sources2, Split(incs), defines=defs, libtype=['intern','player'], priority = [40,15], cc_compilerchange='/usr/bin/gcc', cxx_compilerchange='/usr/bin/g++' )
     print "GHOST COCOA WILL BE COMPILED WITH APPLE GCC"
+    if env['WITH_BF_3DMOUSE']:
+        env.BlenderLib ('bf_intern_ghostndof3dconnexion', sources2, Split(incs), defines=defs, libtype=['intern','player'], priority = [40,15], cc_compilerchange='/usr/bin/gcc', cxx_compilerchange='/usr/bin/g++' )
 
 else:
     env.BlenderLib ('bf_intern_ghost', sources, Split(incs), defines=defs, libtype=['intern','player'], priority = [40,15] )




More information about the Bf-blender-cvs mailing list