From 0b9e6e20c7e73684f96fff9b8ed00d0ca4271c2d Mon Sep 17 00:00:00 2001 From: Wenzel Jakob Date: Fri, 19 Aug 2011 21:17:13 -0400 Subject: [PATCH] OSX fixes --- src/mtsgui/SConscript | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/mtsgui/SConscript b/src/mtsgui/SConscript index 674554cb..eec5ef06 100644 --- a/src/mtsgui/SConscript +++ b/src/mtsgui/SConscript @@ -48,13 +48,15 @@ if hasQt: qtEnv.Prepend(LIBPATH=env['COLLADALIBDIR']) if env.has_key('COLLADALIB'): qtEnv.Prepend(LIBS=env['COLLADALIB']) - + if sys.platform == 'darwin': qtEnv_osx = qtEnv.Clone() + mainEnv_osx = mainEnv.Clone() + mainEnv_osx.ConfigureForObjectiveCPP() qtEnv_osx.ConfigureForObjectiveCPP() + mainEnv_osx.Program('symlinks_install', ['symlinks_install.c']) qtEnv_osx['CXXFLAGS'].append(['-Fdependencies/darwin', '-framework', 'BWToolkitFramework']) qtSources += qtEnv_osx.StaticObject('previewsettingsdlg_cocoa_impl.mm') - qtEnv_osx.Program('symlinks_install', ['symlinks_install.c']) else: qtSources = [x for x in qtSources if (not isinstance(x, str) or 'cocoa' not in x)] mtsgui = qtEnv.Program('mtsgui', qtSources)