bugfix for the build scripts when Qt is inactive

metadata
Wenzel Jakob 2011-11-17 14:41:54 -05:00
parent 3e0e3cd757
commit 93214e4cc2
2 changed files with 6 additions and 9 deletions

View File

@ -61,7 +61,9 @@ if sys.platform == 'linux2':
'librender/libmitsuba-render.so', 'libbidir/libmitsuba-bidir.so'])
if hasPython:
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:
install(distDir, ['converter/mtsimport'])
if sys.platform == 'win32':

View File

@ -1,9 +1,4 @@
#!/bin/bash
unamestr=`uname`
if [[ "$unamestr" == 'Darwin' ]]; then
export PATH=`pwd`/Mitsuba.app/Contents/MacOS:$PATH
else
export LD_LIBRARY_PATH=`pwd`/dist
export PATH=`pwd`/dist:$PATH
ulimit -c 1000000000
fi
export PATH=`pwd`/dist:/hydra/S1/local/bin:/hydra/S1/local/python271/bin:$PATH
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