diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2013-09-13 19:18:17 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2013-09-13 19:18:17 +0400 |
| commit | 3596ab932c9b3da89760e3d32e48c174b8ca5fea (patch) | |
| tree | 6b0353ff9bc0a6f38148f86a469399f409b23b94 /intern/ghost/SConscript | |
| parent | e59bc04aa71792b07ae7004e26e706c92384a7de (diff) | |
OSX: Compilefix for ndof symbols get magled when used extern C, now use discrete c files embedded, patch by Jake Kauth
Diffstat (limited to 'intern/ghost/SConscript')
| -rw-r--r-- | intern/ghost/SConscript | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript index d1ecc5e8c13..fb289801e7a 100644 --- a/intern/ghost/SConscript +++ b/intern/ghost/SConscript @@ -33,6 +33,7 @@ Import ('env') window_system = env['OURPLATFORM'] sources = env.Glob('intern/*.cpp') +sources2 = env.Glob('intern/GHOST_NDOFManager3Dconnexion.c') if window_system == 'darwin': sources += env.Glob('intern/*.mm') @@ -156,6 +157,7 @@ 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" else: |