bugfix for the build scripts when Qt is inactive
parent
3e0e3cd757
commit
93214e4cc2
|
@ -61,7 +61,9 @@ if sys.platform == 'linux2':
|
||||||
'librender/libmitsuba-render.so', 'libbidir/libmitsuba-bidir.so'])
|
'librender/libmitsuba-render.so', 'libbidir/libmitsuba-bidir.so'])
|
||||||
if hasPython:
|
if hasPython:
|
||||||
install(os.path.join(distDir, 'python'), ['libpython/mitsuba.so'])
|
install(os.path.join(distDir, 'python'), ['libpython/mitsuba.so'])
|
||||||
install(distDir, ['mitsuba/mitsuba', 'mitsuba/mtssrv', 'mitsuba/mtsutil', 'mtsgui/mtsgui'])
|
install(distDir, ['mitsuba/mitsuba', 'mitsuba/mtssrv', 'mitsuba/mtsutil'])
|
||||||
|
if hasQt:
|
||||||
|
install(distDir, ['mtsgui/mtsgui'])
|
||||||
if hasCollada:
|
if hasCollada:
|
||||||
install(distDir, ['converter/mtsimport'])
|
install(distDir, ['converter/mtsimport'])
|
||||||
if sys.platform == 'win32':
|
if sys.platform == 'win32':
|
||||||
|
|
11
setpath.sh
11
setpath.sh
|
@ -1,9 +1,4 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
unamestr=`uname`
|
export PATH=`pwd`/dist:/hydra/S1/local/bin:/hydra/S1/local/python271/bin:$PATH
|
||||||
if [[ "$unamestr" == 'Darwin' ]]; then
|
export LD_LIBRARY_PATH=`pwd`/dist:/hydra/S1/local/gcc461/lib64:`pwd`/dist:/hydra/S1/local/gcc461/lib:/hydra/S1/local/python271/lib/:/hydra/S1/local/mitsuba/lib/:/hydra/S1/local/mitsuba/lib64/:$LD_LIBRARY_PATH
|
||||||
export PATH=`pwd`/Mitsuba.app/Contents/MacOS:$PATH
|
|
||||||
else
|
|
||||||
export LD_LIBRARY_PATH=`pwd`/dist
|
|
||||||
export PATH=`pwd`/dist:$PATH
|
|
||||||
ulimit -c 1000000000
|
|
||||||
fi
|
|
||||||
|
|
Loading…
Reference in New Issue