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

merged with main branch

metadata
Wenzel Jakob 2010-08-25 09:09:08 +02:00
parent 32a7dcc414 7db172b8c1
commit d1a2e6e5e3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
SConstruct
View File

@ -268,7 +268,7 @@ if sys.platform == 'darwin':
libcore = coreEnv.SharedLibrary('src/libcore/mitsuba-core', libcore_objects); libcore = coreEnv.SharedLibrary('src/libcore/mitsuba-core', libcore_objects);
if sys.platform == "darwin": if sys.platform == "darwin":
coreEnv.AddPostAction(libcore, 'install_name_tool -id @executable_path/../Frameworks/libcore.dylib $TARGET') coreEnv.AddPostAction(libcore, 'install_name_tool -id @executable_path/../Frameworks/libmitsuba-core.dylib $TARGET')
env = env.Clone() env = env.Clone()
env.Append(LIBS=['mitsuba-core']) env.Append(LIBS=['mitsuba-core'])
@ -299,7 +299,7 @@ librender = renderEnv.SharedLibrary('src/librender/mitsuba-render', [
]) ])
if sys.platform == "darwin": if sys.platform == "darwin":
renderEnv.AddPostAction(librender, 'install_name_tool -id @executable_path/../Frameworks/librender.dylib $TARGET') renderEnv.AddPostAction(librender, 'install_name_tool -id @executable_path/../Frameworks/libmitsuba-render.dylib $TARGET')
env.Append(LIBS=['mitsuba-render']) env.Append(LIBS=['mitsuba-render'])
env.Append(LIBPATH=['src/librender']) env.Append(LIBPATH=['src/librender'])
@ -344,7 +344,7 @@ if sys.platform == 'darwin':
libhw = glEnv.SharedLibrary('src/libhw/mitsuba-hw', libhw_objects) libhw = glEnv.SharedLibrary('src/libhw/mitsuba-hw', libhw_objects)
if sys.platform == "darwin": if sys.platform == "darwin":
glEnv.AddPostAction(libhw, 'install_name_tool -id @executable_path/../Frameworks/libhw.dylib $TARGET') glEnv.AddPostAction(libhw, 'install_name_tool -id @executable_path/../Frameworks/libmitsuba-hw.dylib $TARGET')
env = env.Clone() env = env.Clone()
env.Append(LIBS=['mitsuba-hw']) env.Append(LIBS=['mitsuba-hw'])
@ -400,7 +400,7 @@ if hasCollada:
colladaEnv = mainEnv.Clone() colladaEnv = mainEnv.Clone()
temp = colladaEnv['CXXFLAGS'] temp = colladaEnv['CXXFLAGS']
colladaEnv['CXXFLAGS'] = temp colladaEnv['CXXFLAGS'] = temp
colladaEnv.Append(LIBS=['hw']) colladaEnv.Append(LIBS=['mitsuba-hw'])
colladaEnv.Append(LIBPATH=['src/libhw']) colladaEnv.Append(LIBPATH=['src/libhw'])
if env.has_key('COLLADAINCLUDE'): if env.has_key('COLLADAINCLUDE'):
colladaEnv.Append(CPPPATH=env['COLLADAINCLUDE']) colladaEnv.Append(CPPPATH=env['COLLADAINCLUDE'])