minor fixes

metadata
Wenzel Jakob 2013-11-24 15:56:58 +01:00
parent 43223d78d3
commit 454ad0bf54
2 changed files with 6 additions and 7 deletions

View File

@ -33,10 +33,9 @@ for ver in hasPython:
if sys.platform == 'darwin':
pythonEnv.Append(LINKFLAGS=['-Xlinker', '-rpath', '-Xlinker', '@loader_path/../../Contents/Frameworks', '-undefined', 'dynamic_lookup'])
if hasPython:
libcore_obj = pythonEnv.SharedObject('core_'+ver, 'core.cpp')
librender_obj = pythonEnv.SharedObject('render_'+ver, 'render.cpp')
libpython = pythonEnv.SharedLibrary('mitsuba_python'+ver, [libcore_obj, librender_obj])
libcore_obj = pythonEnv.SharedObject('core_'+ver, 'core.cpp')
librender_obj = pythonEnv.SharedObject('render_'+ver, 'render.cpp')
libpython = pythonEnv.SharedLibrary('mitsuba_python'+ver, [libcore_obj, librender_obj])
if sys.platform == 'darwin':
env.AddPostAction(libpython, 'strip -u -r $TARGET')
if sys.platform == 'darwin':
env.AddPostAction(libpython, 'strip -u -r $TARGET')

View File

@ -2112,7 +2112,7 @@ void export_core() {
Float (*dotSH)(const SHVector &, const SHVector &) = &mitsuba::dot;
bp::def("dot", dotSH);
BP_CLASS(SHSampler, Object, bp::init<int, int>())
BP_CLASS(SHSampler, Object, (bp::init<int, int>()))
.def("warp", &SHSampler::warp);
BP_STRUCT(SHRotation, bp::init<int>())