From 11094a0b29d9cdb62c25eb0b217f9f2e18c240ee Mon Sep 17 00:00:00 2001 From: Jens Verwiebe Date: Mon, 27 Jan 2014 20:39:09 +0100 Subject: OSX/scons: fix own error in last commit and do a cleanup --- intern/ghost/SConscript | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'intern/ghost/SConscript') 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] ) + -- cgit v1.2.3