diff --git a/build/SConscript.install b/build/SConscript.install index d475234d..eaccdef4 100644 --- a/build/SConscript.install +++ b/build/SConscript.install @@ -63,6 +63,11 @@ if sys.platform == 'win32': prefix=dllprefix) install('#dist', ['libcollada14dom23.dll', 'boost_system-%s-mt-1_44.dll' % compilerType, 'boost_filesystem-%s-mt-1_44.dll' % compilerType], dllprefix + '/' + compilerType + '/') + if 'WIN64' in env['CXXFLAGS']: + installTargets += env.Install('#dist', '#dependencies/windows/bin/vcredist_2010_sp1_x64.exe') + else: + installTargets += env.Install('#dist', '#dependencies/windows/bin/vcredist_2010_sp1_x86.exe') + installTargets += env.Install('#dist', '#data/windows/README.txt') if 'REDIST_PATH' in env: install('#dist', ['libmmd.dll', 'libiomp5md.dll'], prefix = env['REDIST_PATH']) diff --git a/data/windows/README.txt b/data/windows/README.txt new file mode 100644 index 00000000..593f1417 --- /dev/null +++ b/data/windows/README.txt @@ -0,0 +1,11 @@ +This is the binary Windows release of Mitsuba, an extensible rendering framework. + +Please use the 'mtsgui.exe' executable to launch the graphical user interface. + +If you encounter an error message regarding a missing component named 'msvcr100.dll' +or 'msvcp100.dll', you will need to install the package "vcredist_2010_sp1_x86.exe' +or "vcredist_2010_sp1_x64.exe' (one of them will be included with the Mitsuba release) + +For general documentation on Mitsuba, please refer to +http://www.mitsuba-renderer.org/docs.html and +http://www.mitsuba-renderer.org/videos.html. \ No newline at end of file