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:
authorJens Verwiebe <info@jensverwiebe.de>2013-09-20 22:52:39 +0400
committerJens Verwiebe <info@jensverwiebe.de>2013-09-20 22:52:39 +0400
commit50fbb6c07e6864cb5a2300858f28a0f0ce3ac1af (patch)
tree78a159484f6d7caeb3dffa7067f6413bea6ef686 /intern/ghost/SConscript
parentaff71ea2d5e92a7701a60f5bfd587e0bfeb1f0a2 (diff)
OSX/scons: fix linking errors due bf_intern_ghostndof3dconnexion was build even if no 3Dmouseware was detected
Diffstat (limited to 'intern/ghost/SConscript')
-rw-r--r--intern/ghost/SConscript3
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript
index fb289801e7a..fed8cd7aa3c 100644
--- a/intern/ghost/SConscript
+++ b/intern/ghost/SConscript
@@ -157,8 +157,9 @@ if window_system in ('win32-vc', 'win64-vc'):
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] )