[Bf-blender-cvs] [11094a0] master: OSX/scons: fix own error in last commit and do a cleanup

[Jens Verwiebe]

Commit: 11094a0b29d9cdb62c25eb0b217f9f2e18c240ee
Author: Jens Verwiebe
Date:   Mon Jan 27 20:39:09 2014 +0100
https://developer.blender.org/rB11094a0b29d9cdb62c25eb0b217f9f2e18c240ee

OSX/scons: fix own error in last commit and do a cleanup

===================================================================

M	intern/ghost/SConscript

===================================================================

diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript
index 30a037a..8075647 100644
--- a/intern/ghost/SConscript
+++ b/intern/ghost/SConscript
@@ -141,8 +141,10 @@ if window_system in ('win32-vc', 'win64-vc'):
 elif window_system == 'darwin' and env['C_COMPILER_ID'] == 'gcc' and  env['CCVERSION'] >= '4.6': # 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++' )
     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] )
+    
+if window_system == 'darwin' and env['WITH_BF_3DMOUSE']: # build seperate to circumvent extern "C" linkage issues
+    env.BlenderLib ('bf_intern_ghostndof3dconnexion', sources2, Split(incs), defines=defs, libtype=['intern','player'], priority = [40,15] )
+