diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2014-01-27 23:39:09 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2014-01-27 23:39:20 +0400 |
| commit | 11094a0b29d9cdb62c25eb0b217f9f2e18c240ee (patch) | |
| tree | ff208a7ac4af7e17c866d2a1f15a91c3c0f2a08a /intern/ghost/SConscript | |
| parent | efaadc3104ce1374d07a679af2ee099ece512f26 (diff) | |
OSX/scons: fix own error in last commit and do a cleanup
Diffstat (limited to 'intern/ghost/SConscript')
| -rw-r--r-- | intern/ghost/SConscript | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript index 30a037a6818..80756472edb 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] ) + |