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

switched to a new boost version for Mitsuba 0.4.5 -- also adding Python 3.3 support

metadata
Wenzel Jakob 2013-11-04 09:24:53 -08:00
parent 0366e8c102
commit 5c06ca5723
7 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build/SConscript.install
View File

@ -92,10 +92,10 @@ if sys.platform == 'win32':
'libpng15.dll', 'jpeg62.dll', 'xerces-c_3_1.dll', 'glew32mx.dll', 'libfftw-3.3.dll'],
prefix=dllprefix)
install(distDir, ['libcollada14dom23.dll',
'boost_python-vc100-mt-1_50.dll', 'boost_python3-vc100-mt-1_50.dll',
'boost_system-vc100-mt-1_50.dll', 'boost_filesystem-vc100-mt-1_50.dll',
'boost_chrono-vc100-mt-1_50.dll', 'boost_thread-vc100-mt-1_50.dll'],
dllprefix)
'boost_python27-vc100-mt-1_53.dll', 'boost_python32-vc100-mt-1_53.dll',
'boost_python33-vc100-mt-1_53.dll', 'boost_system-vc100-mt-1_53.dll',
'boost_filesystem-vc100-mt-1_53.dll', 'boost_chrono-vc100-mt-1_53.dll',
'boost_thread-vc100-mt-1_53.dll'], dllprefix)
if 'WIN64' in env['CXXFLAGS']:
installTargets += env.Install(distDir, '#dependencies/bin/vcredist_2010_sp1_x64.exe')

8
build/config-win32-icl.py
View File

@ -14,7 +14,7 @@ BASELIB = ['msvcrt', 'ws2_32', 'Half']
BASELIBDIR = ['#dependencies/lib/i386']
OEXRINCLUDE = ['#dependencies/include/openexr']
OEXRLIB = ['IlmImf', 'IlmThread', 'Iex', 'zdll']
BOOSTLIB = ['boost_system-vc100-mt-1_50', 'boost_filesystem-vc100-mt-1_50', 'boost_thread-vc100-mt-1_50']
BOOSTLIB = ['boost_system-vc100-mt-1_53', 'boost_filesystem-vc100-mt-1_53', 'boost_thread-vc100-mt-1_53']
COLLADAINCLUDE = ['#dependencies/include/collada-dom', '#dependencies/include/collada-dom/1.4']
COLLADALIB = ['libcollada14dom23']
XERCESLIB = ['xerces-c_3']
@ -26,10 +26,12 @@ SHLIBPREFIX = 'lib'
SHLIBSUFFIX = '.dll'
LIBSUFFIX = '.lib'
PROGSUFFIX = '.exe'
PYTHON27LIB = ['boost_python-vc100-mt-1_50', 'python27']
PYTHON27LIB = ['boost_python27-vc100-mt-1_53', 'python27']
PYTHON27INCLUDE = ['#dependencies/include/python27']
PYTHON32LIB = ['boost_python3-vc100-mt-1_50', 'python32']
PYTHON32LIB = ['boost_python32-vc100-mt-1_53', 'python32']
PYTHON32INCLUDE = ['#dependencies/include/python32']
PYTHON33LIB = ['boost_python32-vc100-mt-1_53', 'python33']
PYTHON33INCLUDE = ['#dependencies/include/python33']
QTINCLUDE = ['#dependencies/qt/include']
QTDIR = '#dependencies/qt/i386'
FFTWLIB = ['libfftw-3.3']

8
build/config-win32-msvc2010-debug.py
View File

@ -12,7 +12,7 @@ BASELIB = ['msvcrt', 'ws2_32', 'Half']
BASELIBDIR = ['#dependencies/lib/i386']
OEXRINCLUDE = ['#dependencies/include/openexr']
OEXRLIB = ['IlmImf', 'IlmThread', 'Iex', 'zdll']
BOOSTLIB = ['boost_system-vc100-mt-1_50', 'boost_filesystem-vc100-mt-1_50', 'boost_thread-vc100-mt-1_50']
BOOSTLIB = ['boost_system-vc100-mt-1_53', 'boost_filesystem-vc100-mt-1_53', 'boost_thread-vc100-mt-1_53']
COLLADAINCLUDE = ['#dependencies/include/collada-dom', '#dependencies/include/collada-dom/1.4']
COLLADALIB = ['libcollada14dom23']
XERCESLIB = ['xerces-c_3']
@ -24,10 +24,12 @@ SHLIBPREFIX = 'lib'
SHLIBSUFFIX = '.dll'
LIBSUFFIX = '.lib'
PROGSUFFIX = '.exe'
PYTHON27LIB = ['boost_python-vc100-mt-1_50', 'python27']
PYTHON27LIB = ['boost_python27-vc100-mt-1_53', 'python27']
PYTHON27INCLUDE = ['#dependencies/include/python27']
PYTHON32LIB = ['boost_python3-vc100-mt-1_50', 'python32']
PYTHON32LIB = ['boost_python32-vc100-mt-1_53', 'python32']
PYTHON32INCLUDE = ['#dependencies/include/python32']
PYTHON33LIB = ['boost_python32-vc100-mt-1_53', 'python33']
PYTHON33INCLUDE = ['#dependencies/include/python33']
QTINCLUDE = ['#dependencies/qt/include']
QTDIR = '#dependencies/qt/i386'
FFTWLIB = ['libfftw-3.3']

8
build/config-win32-msvc2010.py
View File

@ -15,7 +15,7 @@ BASELIB = ['msvcrt', 'ws2_32', 'Half']
BASELIBDIR = ['#dependencies/lib/i386']
OEXRINCLUDE = ['#dependencies/include/openexr']
OEXRLIB = ['IlmImf', 'IlmThread', 'Iex', 'zdll']
BOOSTLIB = ['boost_system-vc100-mt-1_50', 'boost_filesystem-vc100-mt-1_50', 'boost_thread-vc100-mt-1_50']
BOOSTLIB = ['boost_system-vc100-mt-1_53', 'boost_filesystem-vc100-mt-1_53', 'boost_thread-vc100-mt-1_53']
COLLADAINCLUDE = ['#dependencies/include/collada-dom', '#dependencies/include/collada-dom/1.4']
COLLADALIB = ['libcollada14dom23']
XERCESLIB = ['xerces-c_3']
@ -27,10 +27,12 @@ SHLIBPREFIX = 'lib'
SHLIBSUFFIX = '.dll'
LIBSUFFIX = '.lib'
PROGSUFFIX = '.exe'
PYTHON27LIB = ['boost_python-vc100-mt-1_50', 'python27']
PYTHON27LIB = ['boost_python27-vc100-mt-1_53', 'python27']
PYTHON27INCLUDE = ['#dependencies/include/python27']
PYTHON32LIB = ['boost_python3-vc100-mt-1_50', 'python32']
PYTHON32LIB = ['boost_python32-vc100-mt-1_53', 'python32']
PYTHON32INCLUDE = ['#dependencies/include/python32']
PYTHON33LIB = ['boost_python32-vc100-mt-1_53', 'python33']
PYTHON33INCLUDE = ['#dependencies/include/python33']
QTINCLUDE = ['#dependencies/qt/include']
QTDIR = '#dependencies/qt/i386'
FFTWLIB = ['libfftw-3.3']

8
build/config-win64-icl.py
View File

@ -14,7 +14,7 @@ BASELIB = ['msvcrt', 'ws2_32', 'Half']
BASELIBDIR = ['#dependencies/lib/x64']
OEXRINCLUDE = ['#dependencies/include/openexr']
OEXRLIB = ['IlmImf', 'IlmThread', 'Iex', 'zdll']
BOOSTLIB = ['boost_system-vc100-mt-1_50', 'boost_filesystem-vc100-mt-1_50', 'boost_thread-vc100-mt-1_50']
BOOSTLIB = ['boost_system-vc100-mt-1_53', 'boost_filesystem-vc100-mt-1_53', 'boost_thread-vc100-mt-1_53']
COLLADAINCLUDE = ['#dependencies/include/collada-dom', '#dependencies/include/collada-dom/1.4']
COLLADALIB = ['libcollada14dom23']
XERCESLIB = ['xerces-c_3']
@ -26,10 +26,12 @@ SHLIBPREFIX = 'lib'
SHLIBSUFFIX = '.dll'
LIBSUFFIX = '.lib'
PROGSUFFIX = '.exe'
PYTHON27LIB = ['boost_python-vc100-mt-1_50', 'python27']
PYTHON27LIB = ['boost_python27-vc100-mt-1_53', 'python27']
PYTHON27INCLUDE = ['#dependencies/include/python27']
PYTHON32LIB = ['boost_python3-vc100-mt-1_50', 'python32']
PYTHON32LIB = ['boost_python32-vc100-mt-1_53', 'python32']
PYTHON32INCLUDE = ['#dependencies/include/python32']
PYTHON33LIB = ['boost_python32-vc100-mt-1_53', 'python33']
PYTHON33INCLUDE = ['#dependencies/include/python33']
QTINCLUDE = ['#dependencies/qt/include']
QTDIR = '#dependencies/qt/x64'
FFTWLIB = ['libfftw-3.3']

8
build/config-win64-msvc2010-debug.py
View File

@ -12,7 +12,7 @@ BASELIB = ['msvcrt', 'ws2_32', 'Half']
BASELIBDIR = ['#dependencies/lib/x64']
OEXRINCLUDE = ['#dependencies/include/openexr']
OEXRLIB = ['IlmImf', 'IlmThread', 'Iex', 'zdll']
BOOSTLIB = ['boost_system-vc100-mt-1_50', 'boost_filesystem-vc100-mt-1_50', 'boost_thread-vc100-mt-1_50']
BOOSTLIB = ['boost_system-vc100-mt-1_53', 'boost_filesystem-vc100-mt-1_53', 'boost_thread-vc100-mt-1_53']
COLLADAINCLUDE = ['#dependencies/include/collada-dom', '#dependencies/include/collada-dom/1.4']
COLLADALIB = ['libcollada14dom23']
XERCESLIB = ['xerces-c_3']
@ -24,10 +24,12 @@ SHLIBPREFIX = 'lib'
SHLIBSUFFIX = '.dll'
LIBSUFFIX = '.lib'
PROGSUFFIX = '.exe'
PYTHON27LIB = ['boost_python-vc100-mt-1_50', 'python27']
PYTHON27LIB = ['boost_python27-vc100-mt-1_53', 'python27']
PYTHON27INCLUDE = ['#dependencies/include/python27']
PYTHON32LIB = ['boost_python3-vc100-mt-1_50', 'python32']
PYTHON32LIB = ['boost_python32-vc100-mt-1_53', 'python32']
PYTHON32INCLUDE = ['#dependencies/include/python32']
PYTHON33LIB = ['boost_python32-vc100-mt-1_53', 'python33']
PYTHON33INCLUDE = ['#dependencies/include/python33']
QTINCLUDE = ['#dependencies/qt/include']
QTDIR = '#dependencies/qt/x64'
FFTWLIB = ['libfftw-3.3']

8
build/config-win64-msvc2010.py
View File

@ -15,7 +15,7 @@ BASELIB = ['msvcrt', 'ws2_32', 'Half']
BASELIBDIR = ['#dependencies/lib/x64']
OEXRINCLUDE = ['#dependencies/include/openexr']
OEXRLIB = ['IlmImf', 'IlmThread', 'Iex', 'zdll']
BOOSTLIB = ['boost_system-vc100-mt-1_50', 'boost_filesystem-vc100-mt-1_50', 'boost_thread-vc100-mt-1_50']
BOOSTLIB = ['boost_system-vc100-mt-1_53', 'boost_filesystem-vc100-mt-1_53', 'boost_thread-vc100-mt-1_53']
COLLADAINCLUDE = ['#dependencies/include/collada-dom', '#dependencies/include/collada-dom/1.4']
COLLADALIB = ['libcollada14dom23']
XERCESLIB = ['xerces-c_3']
@ -27,10 +27,12 @@ SHLIBPREFIX = 'lib'
SHLIBSUFFIX = '.dll'
LIBSUFFIX = '.lib'
PROGSUFFIX = '.exe'
PYTHON27LIB = ['boost_python-vc100-mt-1_50', 'python27']
PYTHON27LIB = ['boost_python27-vc100-mt-1_53', 'python27']
PYTHON27INCLUDE = ['#dependencies/include/python27']
PYTHON32LIB = ['boost_python3-vc100-mt-1_50', 'python32']
PYTHON32LIB = ['boost_python32-vc100-mt-1_53', 'python32']
PYTHON32INCLUDE = ['#dependencies/include/python32']
PYTHON33LIB = ['boost_python32-vc100-mt-1_53', 'python33']
PYTHON33INCLUDE = ['#dependencies/include/python33']
QTINCLUDE = ['#dependencies/qt/include']
QTDIR = '#dependencies/qt/x64'
FFTWLIB = ['libfftw-3.3']