From 454ad0bf54bf884fdfd7758fe7aa2187e3245a31 Mon Sep 17 00:00:00 2001 From: Wenzel Jakob Date: Sun, 24 Nov 2013 15:56:58 +0100 Subject: [PATCH] minor fixes --- src/libpython/SConscript | 11 +++++------ src/libpython/core.cpp | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/libpython/SConscript b/src/libpython/SConscript index cbf03d06..f992c2f5 100644 --- a/src/libpython/SConscript +++ b/src/libpython/SConscript @@ -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') diff --git a/src/libpython/core.cpp b/src/libpython/core.cpp index 277b9502..3c77ccd5 100644 --- a/src/libpython/core.cpp +++ b/src/libpython/core.cpp @@ -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()) + BP_CLASS(SHSampler, Object, (bp::init())) .def("warp", &SHSampler::warp); BP_STRUCT(SHRotation, bp::init())