mingzailao
/
mitsuba
mirror of https://github.com/Quartenia/mitsuba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OSX fixes

metadata
Wenzel Jakob 2011-08-19 21:17:13 -04:00
parent 30833047d2
commit 0b9e6e20c7
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mtsgui/SConscript
View File

@ -48,13 +48,15 @@ if hasQt:
qtEnv.Prepend(LIBPATH=env['COLLADALIBDIR']) qtEnv.Prepend(LIBPATH=env['COLLADALIBDIR'])
if env.has_key('COLLADALIB'): if env.has_key('COLLADALIB'):
qtEnv.Prepend(LIBS=env['COLLADALIB']) qtEnv.Prepend(LIBS=env['COLLADALIB'])
if sys.platform == 'darwin': if sys.platform == 'darwin':
qtEnv_osx = qtEnv.Clone() qtEnv_osx = qtEnv.Clone()
mainEnv_osx = mainEnv.Clone()
mainEnv_osx.ConfigureForObjectiveCPP()
qtEnv_osx.ConfigureForObjectiveCPP() qtEnv_osx.ConfigureForObjectiveCPP()
mainEnv_osx.Program('symlinks_install', ['symlinks_install.c'])
qtEnv_osx['CXXFLAGS'].append(['-Fdependencies/darwin', '-framework', 'BWToolkitFramework']) qtEnv_osx['CXXFLAGS'].append(['-Fdependencies/darwin', '-framework', 'BWToolkitFramework'])
qtSources += qtEnv_osx.StaticObject('previewsettingsdlg_cocoa_impl.mm') qtSources += qtEnv_osx.StaticObject('previewsettingsdlg_cocoa_impl.mm')
qtEnv_osx.Program('symlinks_install', ['symlinks_install.c'])
else: else:
qtSources = [x for x in qtSources if (not isinstance(x, str) or 'cocoa' not in x)] qtSources = [x for x in qtSources if (not isinstance(x, str) or 'cocoa' not in x)]
mtsgui = qtEnv.Program('mtsgui', qtSources) mtsgui = qtEnv.Program('mtsgui', qtSources)