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

complete reversal of the previous change, since crashes still occurred on some configurations 

There are now separate boost libraries for the different MSVC++ versions
metadata
Wenzel Jakob 2010-10-20 13:59:05 -07:00
parent cf5ebdbe38
commit fba2d62807
21 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SConstruct
View File

@ -675,8 +675,6 @@ if sys.platform == 'win32':
installTargets += env.Install('dist', dllprefix + 'xerces-c_3_0.dll') installTargets += env.Install('dist', dllprefix + 'xerces-c_3_0.dll')
installTargets += env.Install('dist', dllprefix + 'glew32mx.dll') installTargets += env.Install('dist', dllprefix + 'glew32mx.dll')
installTargets += env.Install('dist', dllprefix + 'libcollada14dom21.dll') installTargets += env.Install('dist', dllprefix + 'libcollada14dom21.dll')
installTargets += env.Install('dist', dllprefix + 'boost_system-vc90-mt-1_39.dll')
installTargets += env.Install('dist', dllprefix + 'boost_filesystem-vc90-mt-1_39.dll')
if hasQt: if hasQt:
installTargets += env.Install('dist', env['QT4_BINPATH']+'/QtCore4.dll') installTargets += env.Install('dist', env['QT4_BINPATH']+'/QtCore4.dll')
installTargets += env.Install('dist', env['QT4_BINPATH']+'/QtGui4.dll') installTargets += env.Install('dist', env['QT4_BINPATH']+'/QtGui4.dll')
@ -719,8 +717,6 @@ elif sys.platform == 'darwin':
installTargets += env.OSXLibInst('Mitsuba.app/Contents/Frameworks', 'tools/darwin/Xerces-C.framework/Resources/lib/libxerces-c-3.0.dylib') installTargets += env.OSXLibInst('Mitsuba.app/Contents/Frameworks', 'tools/darwin/Xerces-C.framework/Resources/lib/libxerces-c-3.0.dylib')
installTargets += env.OSXLibInst('Mitsuba.app/Contents/Frameworks', 'tools/darwin/libpng.framework/Resources/lib/libpng.dylib') installTargets += env.OSXLibInst('Mitsuba.app/Contents/Frameworks', 'tools/darwin/libpng.framework/Resources/lib/libpng.dylib')
installTargets += env.OSXLibInst('Mitsuba.app/Contents/Frameworks', 'tools/darwin/libjpeg.framework/Resources/lib/libjpeg.dylib') installTargets += env.OSXLibInst('Mitsuba.app/Contents/Frameworks', 'tools/darwin/libjpeg.framework/Resources/lib/libjpeg.dylib')
installTargets += env.OSXLibInst('Mitsuba.app/Contents/Frameworks', 'tools/darwin/libboost.framework/Resources/lib/libboost_system-xgcc42-mt-1_39.dylib')
installTargets += env.OSXLibInst('Mitsuba.app/Contents/Frameworks', 'tools/darwin/libboost.framework/Resources/lib/libboost_filesystem-xgcc42-mt-1_39.dylib')
if hasCollada: if hasCollada:
installTargets += env.OSXLibInst('Mitsuba.app/Contents/Frameworks', 'tools/darwin/Collada14Dom.framework/Resources/lib/libCollada14Dom.dylib') installTargets += env.OSXLibInst('Mitsuba.app/Contents/Frameworks', 'tools/darwin/Collada14Dom.framework/Resources/lib/libCollada14Dom.dylib')
if hasQt: if hasQt:

2
config/config-msvc2008-win32.py
View File

@ -14,7 +14,7 @@ OEXRINCLUDE = ['#tools/windows/include/OpenEXR']
OEXRFLAGS = ['/D', 'OPENEXR_DLL'] OEXRFLAGS = ['/D', 'OPENEXR_DLL']
OEXRLIB = ['IlmImf', 'IlmThread', 'Iex', 'zlib1', 'Half'] OEXRLIB = ['IlmImf', 'IlmThread', 'Iex', 'zlib1', 'Half']
BOOSTINCLUDE = ['#tools/boost'] BOOSTINCLUDE = ['#tools/boost']
BOOSTLIB = ['libboost_system', 'libboost_filesystem'] BOOSTLIB = ['libboost_system-vc90-mt-1_39', 'libboost_filesystem-vc90-mt-1_39']
COLLADAINCLUDE = ['#tools/windows/include/colladadom', '#tools/windows/include/colladadom/1.4'] COLLADAINCLUDE = ['#tools/windows/include/colladadom', '#tools/windows/include/colladadom/1.4']
COLLADALIB = ['libcollada14dom21'] COLLADALIB = ['libcollada14dom21']
XERCESLIB = ['xerces-c_3'] XERCESLIB = ['xerces-c_3']

2
config/config-msvc2008-win64.py
View File

@ -14,7 +14,7 @@ OEXRINCLUDE = ['#tools/windows/include/OpenEXR']
OEXRFLAGS = ['/D', 'OPENEXR_DLL'] OEXRFLAGS = ['/D', 'OPENEXR_DLL']
OEXRLIB = ['IlmImf', 'IlmThread', 'Iex', 'zlib1', 'Half'] OEXRLIB = ['IlmImf', 'IlmThread', 'Iex', 'zlib1', 'Half']
BOOSTINCLUDE = ['#tools/boost'] BOOSTINCLUDE = ['#tools/boost']
BOOSTLIB = ['libboost_system', 'libboost_filesystem'] BOOSTLIB = ['libboost_system-vc90-mt-1_39', 'libboost_filesystem-vc90-mt-1_39']
COLLADAINCLUDE = ['#tools/windows/include/colladadom', '#tools/windows/include/colladadom/1.4'] COLLADAINCLUDE = ['#tools/windows/include/colladadom', '#tools/windows/include/colladadom/1.4']
COLLADALIB = ['libcollada14dom21'] COLLADALIB = ['libcollada14dom21']
XERCESLIB = ['xerces-c_3'] XERCESLIB = ['xerces-c_3']

2
config/config-msvc2010-win32.py
View File

@ -14,7 +14,7 @@ OEXRINCLUDE = ['#tools/windows/include/OpenEXR']
OEXRFLAGS = ['/D', 'OPENEXR_DLL'] OEXRFLAGS = ['/D', 'OPENEXR_DLL']
OEXRLIB = ['IlmImf', 'IlmThread', 'Iex', 'zlib1', 'Half'] OEXRLIB = ['IlmImf', 'IlmThread', 'Iex', 'zlib1', 'Half']
BOOSTINCLUDE = ['#tools/boost'] BOOSTINCLUDE = ['#tools/boost']
BOOSTLIB = ['libboost_system', 'libboost_filesystem'] BOOSTLIB = ['libboost_system-vc100-mt-1_39', 'libboost_filesystem-vc100-mt-1_39']
COLLADAINCLUDE = ['#tools/windows/include/colladadom', '#tools/windows/include/colladadom/1.4'] COLLADAINCLUDE = ['#tools/windows/include/colladadom', '#tools/windows/include/colladadom/1.4']
COLLADALIB = ['libcollada14dom21'] COLLADALIB = ['libcollada14dom21']
XERCESLIB = ['xerces-c_3'] XERCESLIB = ['xerces-c_3']

2
config/config-msvc2010-win64.py
View File

@ -14,7 +14,7 @@ OEXRINCLUDE = ['#tools/windows/include/OpenEXR']
OEXRFLAGS = ['/D', 'OPENEXR_DLL'] OEXRFLAGS = ['/D', 'OPENEXR_DLL']
OEXRLIB = ['IlmImf', 'IlmThread', 'Iex', 'zlib1', 'Half'] OEXRLIB = ['IlmImf', 'IlmThread', 'Iex', 'zlib1', 'Half']
BOOSTINCLUDE = ['#tools/boost'] BOOSTINCLUDE = ['#tools/boost']
BOOSTLIB = ['libboost_system', 'libboost_filesystem'] BOOSTLIB = ['libboost_system-vc100-mt-1_39', 'libboost_filesystem-vc100-mt-1_39']
COLLADAINCLUDE = ['#tools/windows/include/colladadom', '#tools/windows/include/colladadom/1.4'] COLLADAINCLUDE = ['#tools/windows/include/colladadom', '#tools/windows/include/colladadom/1.4']
COLLADALIB = ['libcollada14dom21'] COLLADALIB = ['libcollada14dom21']
XERCESLIB = ['xerces-c_3'] XERCESLIB = ['xerces-c_3']

BIN
tools/windows/lib32/boost_filesystem-vc90-mt-1_39.dll
View File

Binary file not shown.

BIN
tools/windows/lib32/boost_system-vc90-mt-1_39.dll
View File

Binary file not shown.

BIN
tools/windows/lib32/libboost_filesystem-vc100-mt-1_39.lib Normal file
View File

Binary file not shown.

BIN
tools/windows/lib32/libboost_filesystem-vc90-mt-1_39.lib Normal file
View File

Binary file not shown.

BIN
tools/windows/lib32/libboost_filesystem.lib
View File

Binary file not shown.

BIN
tools/windows/lib32/libboost_system-vc100-mt-1_39.lib Normal file
View File

Binary file not shown.

BIN
tools/windows/lib32/libboost_system-vc90-mt-1_39.lib Normal file
View File

Binary file not shown.

BIN
tools/windows/lib32/libboost_system.lib
View File

Binary file not shown.

BIN
tools/windows/lib64/boost_filesystem-vc90-mt-1_39.dll
View File

Binary file not shown.

BIN
tools/windows/lib64/boost_system-vc90-mt-1_39.dll
View File

Binary file not shown.

BIN
tools/windows/lib64/libboost_filesystem-vc100-mt-1_39.lib Normal file
View File

Binary file not shown.

BIN
tools/windows/lib64/libboost_filesystem-vc90-mt-1_39.lib Normal file
View File

Binary file not shown.

BIN
tools/windows/lib64/libboost_filesystem.lib
View File

Binary file not shown.

BIN
tools/windows/lib64/libboost_system-vc100-mt-1_39.lib Normal file
View File

Binary file not shown.

BIN
tools/windows/lib64/libboost_system-vc90-mt-1_39.lib Normal file
View File

Binary file not shown.

BIN
tools/windows/lib64/libboost_system.lib
View File

Binary file not shown.