diff --git a/.gitignore b/.gitignore index 2f247c28..0e89d18c 100644 --- a/.gitignore +++ b/.gitignore @@ -20,9 +20,10 @@ config.log *.pyc # MSVC++-related -build/mitsuba-msvc2010.sdf -build/mitsuba-msvc2010.suo -build/mitsuba-msvc2010.vcxproj.user +build/mitsuba-msvc2017.sdf +build/mitsuba-msvc2017.suo +build/mitsuba-msvc2017.vcxproj.user +build/.vs/**/* data/windows/mitsuba_res.res dist diff --git a/build/config-win64-msvc2017-debug.py b/build/config-win64-msvc2017-debug.py index 4d0c66fa..e07286ac 100644 --- a/build/config-win64-msvc2017-debug.py +++ b/build/config-win64-msvc2017-debug.py @@ -1,4 +1,4 @@ -BUILDDIR = '#build/release' +BUILDDIR = '#build/debug' DISTDIR = '#dist' CXX = 'cl' CC = 'cl' @@ -8,7 +8,7 @@ TARGET_ARCH = 'x86_64' MSVC_VERSION = '15.0' LINKFLAGS = ['/nologo', '/SUBSYSTEM:CONSOLE', '/DEBUG', '/MACHINE:X64', '/FIXED:NO', '/OPT:REF', '/OPT:ICF', '/LTCG', '/NODEFAULTLIB:LIBCMT', '/MANIFEST'] BASEINCLUDE = ['#include', '#dependencies/include'] -BASELIB = ['msvcrt', 'ws2_32', 'Half'] +BASELIB = ['msvcrt', 'ws2_32', 'Half', 'zlib'] BASELIBDIR = ['#dependencies/lib'] OEXRINCLUDE = ['#dependencies/include/openexr'] OEXRLIB = ['IlmImf', 'IlmThread', 'Iex', 'zlib'] @@ -30,5 +30,6 @@ PYTHON35LIB = ['boost_python35-vc141-mt-1_64', 'python35'] PYTHON35INCLUDE = ['#dependencies/include/python35'] PYTHON36LIB = ['boost_python36-vc141-mt-1_64', 'python36'] PYTHON36INCLUDE = ['#dependencies/include/python36'] +QTINCLUDE = ['#dependencies/include'] QTDIR = '#dependencies' FFTWLIB = ['libfftw3-3'] diff --git a/build/config-win64-msvc2017.py b/build/config-win64-msvc2017.py index e43afd95..9a917052 100644 --- a/build/config-win64-msvc2017.py +++ b/build/config-win64-msvc2017.py @@ -5,13 +5,18 @@ CC = 'cl' # /O2=optimize for speed, global optimizations, intrinsic functions, favor fast code, frame pointer omission # /EHsc=C++ exceptions, /fp:fast=Enable reasonable FP optimizations, /GS-=No buffer security checks, /GL=whole program optimizations # To include debug information add '/Z7' to CXXFLAGS and '/DEBUG' to LINKFLAGS -CXXFLAGS = ['/nologo', '/O2', '/fp:fast', '/D', 'WIN32', '/D', 'WIN64', '/W3', '/EHsc', '/GS-', '/GL', '/MD', '/D', 'MTS_DEBUG', '/D', 'SINGLE_PRECISION', '/D', 'SPECTRUM_SAMPLES=3', '/D', 'MTS_SSE', '/D', 'MTS_HAS_COHERENT_RT', '/D', '_CONSOLE', '/D', 'NDEBUG', '/D', 'OPENEXR_DLL', '/openmp'] +# EDIT: MSVC2017 bugs Mitsuba when using /O2 because of /Ob2 - replaced it with the full set and /Ob2 for /Ob1 +# EDIT: /Og is deprecated too +CXXFLAGS = ['/nologo', #'/Og', +'/Oi', '/Ot', '/Oy', '/Ob1', #'/Ob2', +'/Gs', '/GF', '/Gy', #'/O2', +'/fp:fast', '/D', 'WIN32', '/D', 'WIN64', '/W3', '/EHsc', '/GS-', '/GL', '/MD', '/D', 'MTS_DEBUG', '/D', 'SINGLE_PRECISION', '/D', 'SPECTRUM_SAMPLES=3', '/D', 'MTS_SSE', '/D', 'MTS_HAS_COHERENT_RT', '/D', '_CONSOLE', '/D', 'NDEBUG', '/D', 'OPENEXR_DLL', '/openmp'] SHCXXFLAGS = CXXFLAGS TARGET_ARCH = 'x86_64' MSVC_VERSION = '15.0' LINKFLAGS = ['/nologo', '/SUBSYSTEM:CONSOLE', '/MACHINE:X64', '/FIXED:NO', '/OPT:REF', '/OPT:ICF', '/LTCG', '/NODEFAULTLIB:LIBCMT', '/MANIFEST'] BASEINCLUDE = ['#include', '#dependencies/include'] -BASELIB = ['msvcrt', 'ws2_32', 'Half'] +BASELIB = ['msvcrt', 'ws2_32', 'Half', 'zlib'] BASELIBDIR = ['#dependencies/lib'] OEXRINCLUDE = ['#dependencies/include/openexr'] OEXRLIB = ['IlmImf', 'IlmThread', 'Iex', 'zlib'] @@ -33,5 +38,6 @@ PYTHON35LIB = ['boost_python35-vc141-mt-1_64', 'python35'] PYTHON35INCLUDE = ['#dependencies/include/python35'] PYTHON36LIB = ['boost_python36-vc141-mt-1_64', 'python36'] PYTHON36INCLUDE = ['#dependencies/include/python36'] +QTINCLUDE = ['#dependencies/include'] QTDIR = '#dependencies' FFTWLIB = ['libfftw3-3'] diff --git a/build/mitsuba-msvc2010.sln b/build/mitsuba-msvc2010.sln deleted file mode 100644 index 4cccda1f..00000000 --- a/build/mitsuba-msvc2010.sln +++ /dev/null @@ -1,26 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mitsuba", "mitsuba-msvc2010.vcxproj", "{BA3C2621-9FB1-4348-9059-AFC8CCAB25E9}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {BA3C2621-9FB1-4348-9059-AFC8CCAB25E9}.Debug|Win32.ActiveCfg = Debug|Win32 - {BA3C2621-9FB1-4348-9059-AFC8CCAB25E9}.Debug|Win32.Build.0 = Debug|Win32 - {BA3C2621-9FB1-4348-9059-AFC8CCAB25E9}.Debug|x64.ActiveCfg = Debug|x64 - {BA3C2621-9FB1-4348-9059-AFC8CCAB25E9}.Debug|x64.Build.0 = Debug|x64 - {BA3C2621-9FB1-4348-9059-AFC8CCAB25E9}.Release|Win32.ActiveCfg = Release|Win32 - {BA3C2621-9FB1-4348-9059-AFC8CCAB25E9}.Release|Win32.Build.0 = Release|Win32 - {BA3C2621-9FB1-4348-9059-AFC8CCAB25E9}.Release|x64.ActiveCfg = Release|x64 - {BA3C2621-9FB1-4348-9059-AFC8CCAB25E9}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/build/mitsuba-msvc2017.sln b/build/mitsuba-msvc2017.sln new file mode 100644 index 00000000..d75c6c4f --- /dev/null +++ b/build/mitsuba-msvc2017.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.26730.12 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mitsuba-msvc2017", "mitsuba-msvc2017.vcxproj", "{14BF8B5B-8DCA-4A28-83CA-CE9962153946}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {14BF8B5B-8DCA-4A28-83CA-CE9962153946}.Debug|x64.ActiveCfg = Debug|x64 + {14BF8B5B-8DCA-4A28-83CA-CE9962153946}.Debug|x64.Build.0 = Debug|x64 + {14BF8B5B-8DCA-4A28-83CA-CE9962153946}.Release|x64.ActiveCfg = Release|x64 + {14BF8B5B-8DCA-4A28-83CA-CE9962153946}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {881D9083-39B3-458C-965B-C455BED48F34} + EndGlobalSection +EndGlobal diff --git a/build/mitsuba-msvc2010.vcxproj b/build/mitsuba-msvc2017.vcxproj similarity index 83% rename from build/mitsuba-msvc2010.vcxproj rename to build/mitsuba-msvc2017.vcxproj index fb1a61ec..c0e69395 100644 --- a/build/mitsuba-msvc2010.vcxproj +++ b/build/mitsuba-msvc2017.vcxproj @@ -1,102 +1,98 @@ - + Debug Win32 - - Debug - x64 - Release Win32 + + Debug + x64 + Release x64 - {BA3C2621-9FB1-4348-9059-AFC8CCAB25E9} - mitsuba + 15.0 + {14BF8B5B-8DCA-4A28-83CA-CE9962153946} MakeFileProj + mitsuba-vs2017 - - Makefile - Makefile + true + v141 - + Makefile + false + v141 Makefile + true + v141 + + + Makefile + false + v141 - + + + - + - + - + - - <_ProjectFileVersion>10.0.30319.1 - Debug\ - Debug\ - cd .. && scons --parallelize --cfg=build\config-win32-msvc2010-debug.py - cd .. && scons --parallelize --cfg=build\config-win32-msvc2010-debug.py -c && scons --parallelize --cfg=build\config-win32-msvc2010-debug.py - cd .. && scons --parallelize --cfg=build\config-win32-msvc2010-debug.py -c - ..\dist\mtsgui.exe - WIN32;_DEBUG;$(NMakePreprocessorDefinitions) - ..\include;$(NMakeIncludeSearchPath) - $(NMakeForcedIncludes) - $(NMakeAssemblySearchPath) - $(NMakeForcedUsingAssemblies) - Release\ - Release\ - cd .. && scons --parallelize --cfg=build\config-win32-msvc2010.py - cd .. && scons --parallelize --cfg=build\config-win32-msvc2010.py -c && scons --parallelize --cfg=build\config-win32-msvc2010.py - cd .. && scons --parallelize --cfg=build\config-win32-msvc2010.py -c - ..\dist\mtsgui.exe - WIN32;NDEBUG;SINGLE_PRECISION;$(NMakePreprocessorDefinitions) - ..\include;$(NMakeIncludeSearchPath) - $(NMakeForcedIncludes) - $(NMakeAssemblySearchPath) - $(NMakeForcedUsingAssemblies) - Debug\ - Debug\ - cd .. && scons --parallelize --cfg=build\config-win64-msvc2010-debug.py - cd .. && scons --parallelize --cfg=build\config-win64-msvc2010-debug.py -c && scons --parallelize --cfg=build\config-win64-msvc2010-debug.py - cd .. && scons --parallelize --cfg=build\config-win64-msvc2010-debug.py -c - ..\dist\mtsgui.exe - WIN32;_DEBUG;$(NMakePreprocessorDefinitions) - ..\include;$(NMakeIncludeSearchPath) - $(NMakeForcedIncludes) - $(NMakeAssemblySearchPath) - $(NMakeForcedUsingAssemblies) - Release\ - Release\ - cd .. && scons --parallelize --cfg=build\config-win64-msvc2010.py - cd .. && scons --parallelize --cfg=build\config-win64-msvc2010.py -c && scons --parallelize --cfg=build\config-win64-msvc2010.py - cd .. && scons --parallelize --cfg=build\config-win64-msvc2010.py -c - ..\dist\mtsgui.exe - WIN32;NDEBUG;SINGLE_PRECISION;$(NMakePreprocessorDefinitions) - ..\include;$(NMakeIncludeSearchPath) - $(NMakeForcedIncludes) - $(NMakeAssemblySearchPath) - $(NMakeForcedUsingAssemblies) + + WIN32;_DEBUG;$(NMakePreprocessorDefinitions) + + + WIN32;NDEBUG;$(NMakePreprocessorDefinitions) + + + WIN32;_DEBUG;$(NMakePreprocessorDefinitions) + cd .. && scons --parallelize --cfg=build\config-win64-msvc2017-debug.py + cd .. && scons --parallelize --cfg=build\config-win64-msvc2017-debug.py -c && scons --parallelize --cfg=build\config-win64-msvc201-debug.py + cd .. && scons --parallelize --cfg=build\config-win64-msvc2017-debug.py -c + ..\dist\mtsgui.exe + ..\include;$(NMakeIncludeSearchPath) + $(NMakeForcedIncludes) + $(NMakeAssemblySearchPath) + $(NMakeForcedUsingAssemblies) + $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ + + + $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ + cd .. && scons --parallelize --cfg=build\config-win64-msvc2017.py + cd .. && scons --parallelize --cfg=build\config-win64-msvc2017.py -c && scons --parallelize --cfg=build\config-win64-msvc2017.py + cd .. && scons --parallelize --cfg=build\config-win64-msvc2017.py -c + ..\dist\mtsgui.exe + WIN32;NDEBUG;SINGLE_PRECISION;$(NMakePreprocessorDefinitions) + ..\include;$(NMakeIncludeSearchPath) + $(NMakeForcedIncludes) + $(NMakeAssemblySearchPath) + $(NMakeForcedUsingAssemblies) @@ -109,895 +105,925 @@ {4FC737F1-C7A5-4376-A066-2A32D752A2FF} cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + - + - - - + - - - - - - - - - - - - - - - - - - - - - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + + + + + + + + + + + + + + + + + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - + - + + + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - - - - - - - - - - - - - - - - + - - - + - + + + + + + + + + + + + + - - - + - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - + - + - + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + + + - + - + + + + + + + + + + + + + + + + + + + - + - + - + - + - - - - - + - + + + + + + + @@ -1005,156 +1031,153 @@ - - - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + + + + + + + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - + + + + diff --git a/build/mitsuba-msvc2010.vcxproj.filters b/build/mitsuba-msvc2017.vcxproj.filters similarity index 93% rename from build/mitsuba-msvc2010.vcxproj.filters rename to build/mitsuba-msvc2017.vcxproj.filters index 353385b3..cfc67577 100644 --- a/build/mitsuba-msvc2010.vcxproj.filters +++ b/build/mitsuba-msvc2017.vcxproj.filters @@ -8,174 +8,148 @@ {4FC737F1-C7A5-4376-A066-2A32D752A2FF} cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - {81dd9e3e-7bca-44a1-a313-76fb5af5ab0c} + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + {8000154e-a34c-4e6e-9bce-2e943d63752e} - - {7112f301-f6d5-4351-ae06-4a29910a3766} - - - {15522c16-64b9-487e-b9fe-dea0094cb5c1} - - - {4df10a81-6f13-45ae-9a39-ce009db3a659} - - - {0c722d61-5189-477d-b242-2fa2ad26c83c} - - - {d849b48a-b61d-4540-81ab-f5228fd6fa93} - - - {32a38ee8-b255-4e23-8efc-9491fc27c645} - - - {9f6ef52b-2504-4722-a200-7aaa9603088a} - - - {6c49af9f-8cac-477f-825b-ccb368e313c6} - - - {182aef81-5fdf-4eb1-a7d3-5b1d7d5de2b5} - - - {81241aff-695b-4556-bf46-e9d3ac4aa7fb} + + {74b9ba96-fc9d-415f-bd24-942a03f00596} - {f4218b48-d878-435b-915a-8da9727666b1} + {bb77c619-6ad1-4d1f-a412-e808391f7725} - {e6e1a06f-b795-4a12-9b0c-0c730e0b2ac6} - - - {231a82e9-6b4b-4a95-995c-8abd0b6149b3} - - - {4c70e19a-a935-4b0f-88e3-10683b03f66c} - - - {4a433329-84ca-4a8b-938e-4d06c21ec6ff} - - - {4414bb60-269f-4934-9dc9-58bbed35bc1d} - - - {4bc23857-f9a2-453d-bc64-8c9ebc5aff42} - - - {a9318f22-caaa-40af-b8fc-9b8051ec0859} - - - {fba5da81-e3f2-4fbe-98d7-807aaa2c2cf3} - - - {abd6883d-375b-4d85-bb93-12952995332d} - - - {4c9fdf84-d6a6-47f8-8d58-c01ed8351fa0} + {948b22ef-18c2-44ab-a1bd-612e69731287} - {366f9975-2268-4124-81b9-87e7c2c03b1e} - - - {8d2d02ea-1957-4256-8046-f525d13e7ba5} - - - {8438e074-8733-4689-95ba-86145dd9fd9d} + {e6e969f8-3a44-4f76-b45a-e67e66e959ef} - {9d35d85d-280c-49ef-869a-ffaa0602f9f5} - - - {6df94c72-e89d-451e-ad6b-160ea0313077} - - - {7bec8429-3bb9-4dfd-8008-a10c675a9818} - - - {747a1613-4c01-46ef-ba17-92d2286890ad} - - - {516a0fc3-a824-4486-b50c-f3165d1d8361} - - - {bddbc784-474a-4cd3-bbea-3123048dbfaa} - - - {7bba2a7a-8cd3-47bd-9ab2-e33939d4eba6} - - - {32cdfdd7-c3bb-41f2-b433-10165963f9ed} + {acc2b68c-cad3-4687-a2b3-9f47b0eb83bc} - {49edc93d-4305-45a8-a6d9-ae283837d46a} + {7e05f182-75e7-4b68-b350-8a0ab06d79c7} + + + {a7d72cdc-ded2-4d44-a37b-5e9444ce838d} - {d24cf1e6-a301-42e8-9fc1-26fe0ddc3f04} + {9ff03e73-43d4-42d3-b72b-bc15d3028e5b} + + + {c3e33cae-c5e5-4b9c-92db-ea2089b8e630} + + + {17277614-b4a8-4b40-adfc-03aa730cb02f} + + + {9dc2a139-de66-4f0b-8b0a-84e4467993c4} + + + {292aa15a-6c15-4e94-8142-ee30139841dc} + + + {6699b66d-3520-4e38-90b7-951ee33d42cb} - {3df649be-39d5-4416-8776-427a1696c016} + {3b7e4cfd-aba5-43c2-8d1e-7643aa9be017} - - {2e68088f-97e2-4dee-91f5-c85e3e36dd74} + + {40109048-2284-42cf-bdb5-b47f39297dc9} - {f7674a86-b0a5-484c-9db3-a20500b9bbf9} + {5a021792-829f-4746-927b-420731243f01} + + + {fa5ab14d-a464-4fcc-89a2-99c2a0f9d3a8} + + + {cb2ffa28-34af-4a2b-80a1-347b44354654} + + + {46ffed5c-88dd-4f15-bca2-99bcf7d98104} - {f41987e3-e0b9-431d-b37b-5931db380b09} + {b950b4ef-8cce-4e05-99cd-87abfc7a96d5} + + + {75e3bd49-2297-4d51-bedd-25e87fce60c0} + + + {0b4b65bb-936f-4ebd-8bc6-909649c5f502} + + + {5a00e80f-ca4a-43e3-a7f6-ca658c38fe58} + + + {bcb6e3e4-751a-4b40-b53a-d20645bd66a5} + + + {7ab51169-58a0-47be-8be7-6bd48bb63ae2} + + + {7f176125-0c0d-47ee-b5cf-eecd8e5c406e} + + + {09cc97d7-7264-4787-978e-25a52d5a4278} + + + {175722a6-0942-405a-a407-a6a8d69a3752} + + + {5f6ef9c1-4565-4e0a-838e-a7eb35a768a6} + + + {1e89cc6f-b9ed-4030-a44a-6643e3e7bb8a} + + + {cbfd70ff-5a16-4ad4-bb62-826a2132b092} + + + {cf5c4310-79c1-481f-bd70-a68d8733cefc} + + + {5e59f3c4-3703-4832-ba29-167bdfa6049d} + + + {3f64c071-18c3-41a4-a2ad-d55ed52e3f16} + + + {de7fca8e-2908-43cb-bd91-3522e26d9b12} + + + {52b48fd6-2a20-40a2-b642-728fd24642fb} + + + {141bbe89-3f63-4186-a928-c64e4509ed03} - {88ed597b-50ba-4d6f-bf50-ae8f5fa17789} - - - {5499a8e9-ef31-4ab9-a58f-d3a36a784004} - - - {b74f25a9-ff20-4888-8dfc-57dd968b0b8d} - - - {18246123-74da-4fee-8581-bd2860451c40} + {efc778bf-ffd6-4011-a36a-d657db59e73f} - {3fdeab5a-5ccf-41c6-bf05-d9f7f510c741} + {9b776b99-9e65-4df9-aa8a-85ffd2dfa05e} + + + {bbb766ee-5f92-4544-a1f7-e4426bd49005} + + + {bff3b91a-f436-4396-af45-0281292f4387} + + + {fb9de678-78e4-43de-a5be-34a164d20066} - - Source Files\converter - - - Source Files\converter - - - Source Files\converter - - - Source Files\converter - - + Source Files\bsdfs - + Source Files\bsdfs - - Source Files\bsdfs - - - Source Files\bsdfs - - - Source Files\bsdfs - - - Source Files\bsdfs - - - Source Files\bsdfs - - + Source Files\bsdfs @@ -184,440 +158,563 @@ Source Files\bsdfs - - Source Files\bsdfs - - + Source Files\bsdfs Source Files\bsdfs - + + Source Files\bsdfs + + Source Files\bsdfs Source Files\bsdfs + + Source Files\bsdfs + + + Source Files\bsdfs + + + Source Files\bsdfs + + + Source Files\bsdfs + + + Source Files\bsdfs + Source Files\bsdfs Source Files\bsdfs - - Source Files\bsdfs - - + Source Files\bsdfs Source Files\bsdfs - - Source Files\bsdfs - Source Files\bsdfs - - Source Files\librender + + Source Files\bsdfs - - Source Files\librender + + Source Files\bsdfs - - Source Files\librender + + Source Files\bsdfs - - Source Files\librender + + Source Files\converter - - Source Files\librender + + Source Files\converter - - Source Files\librender + + Source Files\converter - - Source Files\librender + + Source Files\converter - - Source Files\librender + + Source Files\emitters - - Source Files\librender + + Source Files\emitters - - Source Files\librender + + Source Files\emitters - - Source Files\librender + + Source Files\emitters - - Source Files\librender + + Source Files\emitters - - Source Files\librender + + Source Files\emitters - - Source Files\librender + + Source Files\emitters - - Source Files\librender + + Source Files\emitters - - Source Files\librender + + Source Files\emitters - - Source Files\librender + + Source Files\emitters\sunsky - - Source Files\librender + + Source Files\emitters - - Source Files\librender + + Source Files\films - - Source Files\librender + + Source Files\films - - Source Files\librender + + Source Files\films - - Source Files\librender + + Source Files\films - - Source Files\librender + + Source Files\films - - Source Files\librender + + Source Files\integrators\bdpt - - Source Files\librender + + Source Files\integrators\bdpt - - Source Files\librender + + Source Files\integrators\bdpt - - Source Files\librender + + Source Files\integrators\direct - - Source Files\librender + + Source Files\integrators\direct - - Source Files\librender + + Source Files\integrators\erpt - - Source Files\librender + + Source Files\integrators\erpt - - Source Files\librender + + Source Files\integrators\misc - - Source Files\librender + + Source Files\integrators\misc - - Source Files\librender + + Source Files\integrators\misc - - Source Files\librender + + Source Files\integrators\misc - - Source Files\samplers + + Source Files\integrators\misc - - Source Files\samplers + + Source Files\integrators\misc - - Source Files\samplers + + Source Files\integrators\mlt - - Source Files\samplers + + Source Files\integrators\mlt - - Source Files\samplers + + Source Files\integrators\path - - Source Files\samplers + + Source Files\integrators\path - - Source Files\samplers + + Source Files\integrators\path - - Source Files\samplers + + Source Files\integrators\photonmapper - - Source Files\sensors + + Source Files\integrators\photonmapper - - Source Files\sensors + + Source Files\integrators\photonmapper - - Source Files\sensors + + Source Files\integrators\photonmapper - - Source Files\sensors + + Source Files\integrators\pssmlt - - Source Files\sensors + + Source Files\integrators\pssmlt - - Source Files\sensors + + Source Files\integrators\pssmlt - - Source Files\sensors + + Source Files\integrators\ptracer - - Source Files\sensors + + Source Files\integrators\ptracer - - Source Files\libhw + + Source Files\integrators\vpl - - Source Files\libhw + + Source Files\libbidir - - Source Files\libhw + + Source Files\libbidir - - Source Files\libhw + + Source Files\libbidir - - Source Files\libhw + + Source Files\libbidir - - Source Files\libhw + + Source Files\libbidir - - Source Files\libhw + + Source Files\libbidir - - Source Files\libhw + + Source Files\libbidir - - Source Files\libhw + + Source Files\libbidir - - Source Files\libhw + + Source Files\libbidir - - Source Files\libhw + + Source Files\libbidir - - Source Files\libhw + + Source Files\libbidir - - Source Files\libhw + + Source Files\libbidir - - Source Files\libhw + + Source Files\libbidir - - Source Files\libhw + + Source Files\libbidir - - Source Files\libhw - - - Source Files\libhw - - - Source Files\libhw - - - Source Files\libhw - - - Source Files\libhw - - - Source Files\libhw - - - Source Files\libhw - - - Source Files\libhw - - - Source Files\libhw - - - Source Files\mitsuba - - - Source Files\mitsuba - - - Source Files\mitsuba - - - Source Files\libcore - - - Source Files\libcore - - - Source Files\libcore - - - Source Files\libcore - - - Source Files\libcore - - - Source Files\libcore - - - Source Files\libcore - - - Source Files\libcore - - - Source Files\libcore - - - Source Files\libcore - - - Source Files\libcore - - - Source Files\libcore - - - Source Files\libcore - - + Source Files\libcore Source Files\libcore - - Source Files\libcore - - - Source Files\libcore - - - Source Files\libcore - - - Source Files\libcore - - - Source Files\libcore - - - Source Files\libcore - - - Source Files\libcore - - - Source Files\libcore - Source Files\libcore - - Source Files\libcore - - - Source Files\libcore - - - Source Files\libcore - - - Source Files\libcore - - - Source Files\libcore - - - Source Files\libcore - - - Source Files\libcore - - - Source Files\libcore - - - Source Files\libcore - - - Source Files\libcore - Source Files\libcore - - Source Files\libcore - - + Source Files\libcore Source Files\libcore - + Source Files\libcore - + Source Files\libcore - - Source Files\libcore - - - Source Files\libcore - - + Source Files\libcore Source Files\libcore + + Source Files\libcore + + + Source Files\libcore + + + Source Files\libcore + + + Source Files\libcore + + + Source Files\libcore + + + Source Files\libcore + + + Source Files\libcore + + + Source Files\libcore + + + Source Files\libcore + + + Source Files\libcore + + + Source Files\libcore + Source Files\libcore + + Source Files\libcore + + + Source Files\libcore + + + Source Files\libcore + Source Files\libcore - - Source Files\tests + + Source Files\libcore - - Source Files\tests + + Source Files\libcore - - Source Files\tests + + Source Files\libcore - - Source Files\tests + + Source Files\libcore - - Source Files\tests + + Source Files\libcore - - Source Files\tests + + Source Files\libcore - - Source Files\tests + + Source Files\libcore - - Source Files\tests + + Source Files\libcore - - Source Files\tests + + Source Files\libcore - - Source Files\tests + + Source Files\libcore + + + Source Files\libcore + + + Source Files\libcore + + + Source Files\libcore + + + Source Files\libcore + + + Source Files\libcore + + + Source Files\libcore + + + Source Files\libcore + + + Source Files\libcore + + + Source Files\libcore + + + Source Files\libcore + + + Source Files\libhw + + + Source Files\libhw + + + Source Files\libhw + + + Source Files\libhw + + + Source Files\libhw + + + Source Files\libhw + + + Source Files\libhw + + + Source Files\libhw + + + Source Files\libhw + + + Source Files\libhw + + + Source Files\libhw + + + Source Files\libhw + + + Source Files\libhw + + + Source Files\libhw + + + Source Files\libhw + + + Source Files\libhw + + + Source Files\libhw + + + Source Files\libhw + + + Source Files\libhw + + + Source Files\libhw + + + Source Files\libhw + + + Source Files\libhw + + + Source Files\libhw + + + Source Files\libhw + + + Source Files\libpython + + + Source Files\libpython + + + Source Files\librender + + + Source Files\librender + + + Source Files\librender + + + Source Files\librender + + + Source Files\librender + + + Source Files\librender + + + Source Files\librender + + + Source Files\librender + + + Source Files\librender + + + Source Files\librender + + + Source Files\librender + + + Source Files\librender + + + Source Files\librender + + + Source Files\librender + + + Source Files\librender + + + Source Files\librender + + + Source Files\librender + + + Source Files\librender + + + Source Files\librender + + + Source Files\librender + + + Source Files\librender + + + Source Files\librender + + + Source Files\librender + + + Source Files\librender + + + Source Files\librender + + + Source Files\librender + + + Source Files\librender + + + Source Files\librender + + + Source Files\librender + + + Source Files\librender + + + Source Files\librender + + + Source Files\librender + + + Source Files\librender + + + Source Files\librender Source Files\medium @@ -625,132 +722,66 @@ Source Files\medium - - Source Files\emitters + + Source Files\mitsuba - - Source Files\emitters + + Source Files\mitsuba - - Source Files\emitters\sunsky - - - Source Files\emitters - - - Source Files\emitters - - - Source Files\emitters - - - Source Files\emitters - - - Source Files\emitters - - - Source Files\emitters - - - Source Files\emitters - - - Source Files\emitters - - - Source Files\subsurface - - - Source Files\subsurface - - - Source Files\subsurface - - - Source Files\subsurface - - - Source Files\rfilters - - - Source Files\rfilters - - - Source Files\rfilters - - - Source Files\rfilters - - - Source Files\rfilters - - - Source Files\rfilters - - - Source Files\volume - - - Source Files\volume - - - Source Files\volume - - - Source Files\volume - - - Source Files\mtsgui - - - Source Files\mtsgui - - - Source Files\mtsgui - - - Source Files\mtsgui - - - Source Files\mtsgui - - - Source Files\mtsgui - - - Source Files\mtsgui - - - Source Files\mtsgui - - - Source Files\mtsgui - - - Source Files\mtsgui + + Source Files\mitsuba Source Files\mtsgui - - Source Files\mtsgui - Source Files\mtsgui + + Source Files\mtsgui + + + Source Files\mtsgui + Source Files\mtsgui - + Source Files\mtsgui - + Source Files\mtsgui Source Files\mtsgui + + Source Files\mtsgui + + + Source Files\mtsgui + + + Source Files\mtsgui + + + Source Files\mtsgui + + + Source Files\mtsgui + + + Source Files\mtsgui + + + Source Files\mtsgui + + + Source Files\mtsgui + + + Source Files\mtsgui + Source Files\mtsgui @@ -760,33 +791,36 @@ Source Files\mtsgui - + Source Files\mtsgui - + Source Files\mtsgui - + Source Files\mtsgui - + Source Files\mtsgui - - Source Files\mtsgui - - - Source Files\mtsgui - - + Source Files\mtsgui Source Files\mtsgui - + Source Files\mtsgui + + Source Files\mtsgui + + + Source Files\phase + + + Source Files\phase + Source Files\phase @@ -796,410 +830,260 @@ Source Files\phase - - Source Files\phase - Source Files\phase - - Source Files\phase + + Source Files\rfilters - - Source Files\utils + + Source Files\rfilters - - Source Files\utils + + Source Files\rfilters - - Source Files\utils + + Source Files\rfilters - - Source Files\utils + + Source Files\rfilters - - Source Files\utils + + Source Files\rfilters - - Source Files\utils + + Source Files\samplers - - Source Files\films + + Source Files\samplers - - Source Files\films + + Source Files\samplers - - Source Files\films + + Source Files\samplers - - Source Files\films + + Source Files\samplers - - Source Files\shapes\ply + + Source Files\samplers + + + Source Files\samplers + + + Source Files\samplers + + + Source Files\sensors + + + Source Files\sensors + + + Source Files\sensors + + + Source Files\sensors + + + Source Files\sensors + + + Source Files\sensors + + + Source Files\sensors + + + Source Files\sensors + + + Source Files\sensors Source Files\shapes - - Source Files\shapes - - - Source Files\shapes - - - Source Files\shapes - - - Source Files\shapes - - - Source Files\shapes - - - Source Files\shapes - - - Source Files\shapes - - - Source Files\shapes - Source Files\shapes - + Source Files\shapes Source Files\shapes - - Source Files\integrators\vpl + + Source Files\shapes - - Source Files\integrators\misc + + Source Files\shapes - - Source Files\integrators\misc + + Source Files\shapes - - Source Files\integrators\misc + + Source Files\shapes - - Source Files\integrators\direct + + Source Files\shapes\ply - - Source Files\integrators\direct + + Source Files\shapes - - Source Files\integrators\pssmlt + + Source Files\shapes - - Source Files\integrators\pssmlt + + Source Files\shapes - - Source Files\integrators\pssmlt + + Source Files\shapes - - Source Files\integrators\photonmapper + + Source Files\shapes - - Source Files\integrators\photonmapper + + Source Files\subsurface - - Source Files\integrators\photonmapper + + Source Files\subsurface - - Source Files\integrators\photonmapper + + Source Files\subsurface - - Source Files\integrators\path + + Source Files\subsurface - - Source Files\integrators\path + + Source Files\subsurface - - Source Files\integrators\path + + Source Files\tests - - Source Files\integrators\mlt + + Source Files\tests - - Source Files\integrators\mlt + + Source Files\tests - - Source Files\integrators\bdpt + + Source Files\tests - - Source Files\integrators\bdpt + + Source Files\tests - - Source Files\integrators\bdpt + + Source Files\tests - - Source Files\integrators\erpt + + Source Files\tests - - Source Files\integrators\erpt + + Source Files\tests - - Source Files\integrators\ptracer + + Source Files\tests - - Source Files\integrators\ptracer + + Source Files\tests - - Source Files\textures + + Source Files\tests - + Source Files\textures Source Files\textures - - Source Files\textures - - + Source Files\textures Source Files\textures + + Source Files\textures + + + Source Files\textures + Source Files\textures - - Source Files\libbidir + + Source Files\utils - - Source Files\libbidir + + Source Files\utils - - Source Files\libbidir + + Source Files\utils - - Source Files\libbidir + + Source Files\utils - - Source Files\libbidir + + Source Files\utils - - Source Files\libbidir + + Source Files\utils - - Source Files\libbidir + + Source Files\volume - - Source Files\libbidir + + Source Files\volume - - Source Files\libbidir + + Source Files\volume - - Source Files\libbidir - - - Source Files\libbidir - - - Source Files\libbidir - - - Source Files\libbidir - - - Source Files\libbidir - - - Source Files\libpython - - - Source Files\libpython + + Source Files\volume - - Source Files\converter - - + Source Files\bsdfs - + Source Files\bsdfs Source Files\bsdfs - + Source Files\bsdfs - - Source Files\samplers + + Source Files\converter - - Source Files\samplers - - - Source Files\libhw\data - - - Source Files\libhw\data - - - Source Files\libhw\data - - - Source Files\libhw\data - - - Source Files\libhw\data - - - Source Files\medium - - - Source Files\medium - - + Source Files\emitters\sunsky Source Files\emitters\sunsky - + Source Files\emitters\sunsky - - Source Files\subsurface - - - Source Files\subsurface - - - Source Files\subsurface - - - Source Files\mtsgui - - - Source Files\mtsgui - - - Source Files\mtsgui - - - Source Files\mtsgui - - - Source Files\mtsgui - - - Source Files\mtsgui - - - Source Files\mtsgui - - - Source Files\mtsgui - - - Source Files\mtsgui - - - Source Files\mtsgui - - - Source Files\mtsgui - - - Source Files\mtsgui - - - Source Files\mtsgui - - - Source Files\mtsgui - - - Source Files\mtsgui - - - Source Files\mtsgui - - - Source Files\mtsgui - - - Source Files\mtsgui - - - Source Files\mtsgui - - - Source Files\mtsgui - - - Source Files\mtsgui - - - Source Files\mtsgui - - - Source Files\mtsgui - - - Source Files\mtsgui - - - Source Files\mtsgui - - - Source Files\phase - - - Source Files\films - Source Files\films - - Source Files\shapes + + Source Files\films - - Source Files\shapes - - - Source Files\shapes - - - Source Files\integrators\misc - - - Source Files\integrators\pssmlt - - - Source Files\integrators\pssmlt - - - Source Files\integrators\pssmlt - - - Source Files\integrators\photonmapper - - - Source Files\integrators\mlt - - - Source Files\integrators\mlt - - - Source Files\integrators\bdpt + + Source Files\films Source Files\integrators\bdpt + + Source Files\integrators\bdpt + Source Files\integrators\bdpt @@ -1209,334 +1093,292 @@ Source Files\integrators\erpt + + Source Files\integrators\misc + + + Source Files\integrators\mlt + + + Source Files\integrators\mlt + + + Source Files\integrators\photonmapper + + + Source Files\integrators\pssmlt + + + Source Files\integrators\pssmlt + + + Source Files\integrators\pssmlt + Source Files\integrators\ptracer + + Source Files\libhw\data + + + Source Files\libhw\data + + + Source Files\libhw\data + + + Source Files\libhw\data + + + Source Files\libhw\data + Source Files\libpython - - Header Files\mitsuba\render + + Source Files\medium - - Header Files\mitsuba\render + + Source Files\medium - - Header Files\mitsuba\render + + Source Files\mtsgui - - Header Files\mitsuba\render + + Source Files\mtsgui - - Header Files\mitsuba\render + + Source Files\mtsgui - - Header Files\mitsuba\render + + Source Files\mtsgui - - Header Files\mitsuba\render + + Source Files\mtsgui - - Header Files\mitsuba\render + + Source Files\mtsgui - - Header Files\mitsuba\render + + Source Files\mtsgui - - Header Files\mitsuba\render + + Source Files\mtsgui - - Header Files\mitsuba\render + + Source Files\mtsgui - - Header Files\mitsuba\render + + Source Files\mtsgui - - Header Files\mitsuba\render + + Source Files\mtsgui - - Header Files\mitsuba\render + + Source Files\mtsgui - - Header Files\mitsuba\render + + Source Files\mtsgui - - Header Files\mitsuba\render + + Source Files\mtsgui - - Header Files\mitsuba\render + + Source Files\mtsgui - - Header Files\mitsuba\render + + Source Files\mtsgui - - Header Files\mitsuba\render + + Source Files\mtsgui - - Header Files\mitsuba\render + + Source Files\mtsgui - - Header Files\mitsuba\render + + Source Files\mtsgui - - Header Files\mitsuba\render + + Source Files\mtsgui - - Header Files\mitsuba\render + + Source Files\mtsgui - - Header Files\mitsuba\render + + Source Files\mtsgui - - Header Files\mitsuba\render + + Source Files\mtsgui - - Header Files\mitsuba\render + + Source Files\mtsgui - - Header Files\mitsuba\render + + Source Files\mtsgui - - Header Files\mitsuba\render + + Source Files\phase - - Header Files\mitsuba\render + + Source Files\samplers - - Header Files\mitsuba\render + + Source Files\samplers - - Header Files\mitsuba\render + + Source Files\shapes - - Header Files\mitsuba\render + + Source Files\shapes - - Header Files\mitsuba\render + + Source Files\shapes - - Header Files\mitsuba\render + + Source Files\subsurface - - Header Files\mitsuba\render + + Source Files\subsurface - - Header Files\mitsuba\render + + Source Files\subsurface - - Header Files\mitsuba\render + + Header Files\mitsuba\bidir - - Header Files\mitsuba\render + + Header Files\mitsuba\bidir - - Header Files\mitsuba\render + + Header Files\mitsuba\bidir - - Header Files\mitsuba\render + + Header Files\mitsuba\bidir - - Header Files\mitsuba\render + + Header Files\mitsuba\bidir - - Header Files\mitsuba\render + + Header Files\mitsuba\bidir - - Header Files\mitsuba\render + + Header Files\mitsuba\bidir - - Header Files\mitsuba\render + + Header Files\mitsuba\bidir - - Header Files\mitsuba\core + + Header Files\mitsuba\bidir - - Header Files\mitsuba\core + + Header Files\mitsuba\bidir - - Header Files\mitsuba\core + + Header Files\mitsuba\bidir - - Header Files\mitsuba\core + + Header Files\mitsuba\bidir - - Header Files\mitsuba\core + + Header Files\mitsuba\bidir - - Header Files\mitsuba\core + + Header Files\mitsuba\bidir - - Header Files\mitsuba\core + + Header Files\mitsuba\bidir - - Header Files\mitsuba\core - - - Header Files\mitsuba\core - - - Header Files\mitsuba\core - - - Header Files\mitsuba\core - - - Header Files\mitsuba\core - - - Header Files\mitsuba\core - - - Header Files\mitsuba\core - - - Header Files\mitsuba\core - - - Header Files\mitsuba\core - - - Header Files\mitsuba\core + + Header Files\mitsuba\bidir Header Files\mitsuba\core - - Header Files\mitsuba\core - - - Header Files\mitsuba\core - - - Header Files\mitsuba\core - - - Header Files\mitsuba\core - - - Header Files\mitsuba\core - - - Header Files\mitsuba\core - - - Header Files\mitsuba\core - - - Header Files\mitsuba\core - - - Header Files\mitsuba\core - - - Header Files\mitsuba\core - - - Header Files\mitsuba\core - - - Header Files\mitsuba\core - - - Header Files\mitsuba\core - - - Header Files\mitsuba\core - - - Header Files\mitsuba\core - - - Header Files\mitsuba\core - - - Header Files\mitsuba\core - - - Header Files\mitsuba\core - - - Header Files\mitsuba\core - - - Header Files\mitsuba\core - - - Header Files\mitsuba\core - - - Header Files\mitsuba\core - - - Header Files\mitsuba\core - - - Header Files\mitsuba\core - - - Header Files\mitsuba\core - - - Header Files\mitsuba\core - - - Header Files\mitsuba\core - Header Files\mitsuba\core - + Header Files\mitsuba\core - + Header Files\mitsuba\core - + Header Files\mitsuba\core - + Header Files\mitsuba\core - - Header Files\mitsuba\core - - - Header Files\mitsuba\core - - - Header Files\mitsuba\core - - + Header Files\mitsuba\core Header Files\mitsuba\core - + Header Files\mitsuba\core Header Files\mitsuba\core - + + Header Files\mitsuba\core + + + Header Files\mitsuba\core + + + Header Files\mitsuba\core + + + Header Files\mitsuba\core + + + Header Files\mitsuba\core + + + Header Files\mitsuba\core + + + Header Files\mitsuba\core + + + Header Files\mitsuba\core + + Header Files\mitsuba\core Header Files\mitsuba\core - + Header Files\mitsuba\core - + Header Files\mitsuba\core - + Header Files\mitsuba\core - + Header Files\mitsuba\core - + + Header Files\mitsuba\core + + + Header Files\mitsuba\core + + + Header Files\mitsuba\core + + + Header Files\mitsuba\core + + + Header Files\mitsuba\core + + Header Files\mitsuba\core @@ -1545,68 +1387,134 @@ Header Files\mitsuba\core + + Header Files\mitsuba\core + + + Header Files\mitsuba\core + + + Header Files\mitsuba\core + + + Header Files\mitsuba\core + + + Header Files\mitsuba\core + + + Header Files\mitsuba\core + + + Header Files\mitsuba\core + + + Header Files\mitsuba\core + + + Header Files\mitsuba\core + + + Header Files\mitsuba\core + + + Header Files\mitsuba\core + + + Header Files\mitsuba\core + + + Header Files\mitsuba\core + + + Header Files\mitsuba\core + + + Header Files\mitsuba\core + + + Header Files\mitsuba\core + + + Header Files\mitsuba\core + + + Header Files\mitsuba\core + + + Header Files\mitsuba\core + + + Header Files\mitsuba\core + + + Header Files\mitsuba\core + + + Header Files\mitsuba\core + + + Header Files\mitsuba\core + + + Header Files\mitsuba\core + + + Header Files\mitsuba\core + + + Header Files\mitsuba\core + + + Header Files\mitsuba\core + + + Header Files\mitsuba\core + + + Header Files\mitsuba\core + + + Header Files\mitsuba\core + + + Header Files\mitsuba\core + + + Header Files\mitsuba\core + + + Header Files\mitsuba\core + + + Header Files\mitsuba\core + + + Header Files\mitsuba\core + + + Header Files\mitsuba\core + Header Files\mitsuba\core - - Header Files\mitsuba\core - - - Header Files\mitsuba\core - Header Files\mitsuba\core - + Header Files\mitsuba\core - + Header Files\mitsuba\core - + Header Files\mitsuba\core - + Header Files\mitsuba\core - - Header Files\mitsuba\hw - - - Header Files\mitsuba\hw - - - Header Files\mitsuba\hw - - - Header Files\mitsuba\hw - - - Header Files\mitsuba\hw - - - Header Files\mitsuba\hw - - - Header Files\mitsuba\hw - - - Header Files\mitsuba\hw - - - Header Files\mitsuba\hw - - - Header Files\mitsuba\hw - - - Header Files\mitsuba\hw - - - Header Files\mitsuba\hw - - - Header Files\mitsuba\hw + + Header Files\mitsuba\core Header Files\mitsuba\hw @@ -1614,95 +1522,218 @@ Header Files\mitsuba\hw - + Header Files\mitsuba\hw - + Header Files\mitsuba\hw - - Header Files\mitsuba\hw - - - Header Files\mitsuba\hw - - - Header Files\mitsuba\hw - - - Header Files\mitsuba\hw - - + Header Files\mitsuba\hw Header Files\mitsuba\hw + + Header Files\mitsuba\hw + + + Header Files\mitsuba\hw + Header Files\mitsuba\hw + + Header Files\mitsuba\hw + + + Header Files\mitsuba\hw + + + Header Files\mitsuba\hw + + + Header Files\mitsuba\hw + + + Header Files\mitsuba\hw + + + Header Files\mitsuba\hw + + + Header Files\mitsuba\hw + + + Header Files\mitsuba\hw + + + Header Files\mitsuba\hw + + + Header Files\mitsuba\hw + Header Files\mitsuba\hw - + Header Files\mitsuba\hw - + + Header Files\mitsuba\hw + + Header Files\mitsuba\hw Header Files\mitsuba\hw - - Header Files\mitsuba\bidir + + Header Files\mitsuba\hw - - Header Files\mitsuba\bidir + + Header Files\mitsuba\hw - - Header Files\mitsuba\bidir + + Header Files\mitsuba\hw - - Header Files\mitsuba\bidir - - - Header Files\mitsuba\bidir - - - Header Files\mitsuba\bidir - - - Header Files\mitsuba\bidir - - - Header Files\mitsuba\bidir - - - Header Files\mitsuba\bidir - - - Header Files\mitsuba\bidir - - - Header Files\mitsuba\bidir - - - Header Files\mitsuba\bidir - - - Header Files\mitsuba\bidir - - - Header Files\mitsuba\bidir - - - Header Files\mitsuba\bidir - - - Header Files\mitsuba\bidir + + Header Files\mitsuba\hw Header Files\mitsuba + + Header Files\mitsuba\render + + + Header Files\mitsuba\render + + + Header Files\mitsuba\render + + + Header Files\mitsuba\render + + + Header Files\mitsuba\render + + + Header Files\mitsuba\render + + + Header Files\mitsuba\render + + + Header Files\mitsuba\render + + + Header Files\mitsuba\render + + + Header Files\mitsuba\render + + + Header Files\mitsuba\render + + + Header Files\mitsuba\render + + + Header Files\mitsuba\render + + + Header Files\mitsuba\render + + + Header Files\mitsuba\render + + + Header Files\mitsuba\render + + + Header Files\mitsuba\render + + + Header Files\mitsuba\render + + + Header Files\mitsuba\render + + + Header Files\mitsuba\render + + + Header Files\mitsuba\render + + + Header Files\mitsuba\render + + + Header Files\mitsuba\render + + + Header Files\mitsuba\render + + + Header Files\mitsuba\render + + + Header Files\mitsuba\render + + + Header Files\mitsuba\render + + + Header Files\mitsuba\render + + + Header Files\mitsuba\render + + + Header Files\mitsuba\render + + + Header Files\mitsuba\render + + + Header Files\mitsuba\render + + + Header Files\mitsuba\render + + + Header Files\mitsuba\render + + + Header Files\mitsuba\render + + + Header Files\mitsuba\render + + + Header Files\mitsuba\render + + + Header Files\mitsuba\render + + + Header Files\mitsuba\render + + + Header Files\mitsuba\render + + + Header Files\mitsuba\render + + + Header Files\mitsuba\render + + + Header Files\mitsuba\render + + + Header Files\mitsuba\render + diff --git a/data/windows/genproj.py b/data/windows/genproj.py index 5fb30285..d79f6fd2 100644 --- a/data/windows/genproj.py +++ b/data/windows/genproj.py @@ -1,29 +1,29 @@ from lxml import etree import os, string, shutil, uuid -doc2010 = etree.parse('data/windows/mitsuba-msvc2010.vcxproj.template') -doc2010_filters = etree.parse('data/windows/mitsuba-msvc2010.vcxproj.filters.template') +doc2017 = etree.parse('data/windows/mitsuba-msvc2017.vcxproj.template') +doc2017_filters = etree.parse('data/windows/mitsuba-msvc2017.vcxproj.filters.template') ns = {'n' : 'http://schemas.microsoft.com/developer/msbuild/2003'} -headers2010 = etree.XPath('/n:Project/n:ItemGroup[@Label="Header Files"]', namespaces = ns)(doc2010)[0] -sources2010 = etree.XPath('/n:Project/n:ItemGroup[@Label="Source Files"]', namespaces = ns)(doc2010)[0] -headers2010_filters = etree.XPath('/n:Project/n:ItemGroup[@Label="Header Files"]', namespaces = ns)(doc2010_filters)[0] -sources2010_filters = etree.XPath('/n:Project/n:ItemGroup[@Label="Source Files"]', namespaces = ns)(doc2010_filters)[0] -filters2010 = etree.XPath('/n:Project/n:ItemGroup[@Label="Filters"]', namespaces = ns)(doc2010_filters)[0] +headers2017 = etree.XPath('/n:Project/n:ItemGroup[@Label="Header Files"]', namespaces = ns)(doc2017)[0] +sources2017 = etree.XPath('/n:Project/n:ItemGroup[@Label="Source Files"]', namespaces = ns)(doc2017)[0] +headers2017_filters = etree.XPath('/n:Project/n:ItemGroup[@Label="Header Files"]', namespaces = ns)(doc2017_filters)[0] +sources2017_filters = etree.XPath('/n:Project/n:ItemGroup[@Label="Source Files"]', namespaces = ns)(doc2017_filters)[0] +filters2017 = etree.XPath('/n:Project/n:ItemGroup[@Label="Filters"]', namespaces = ns)(doc2017_filters)[0] def traverse(dirname, prefix): for file in [file for file in os.listdir(dirname) if not file in ['.', '..']]: filename = os.path.join(dirname, file) if os.path.isdir(filename): lastname = os.path.split(filename)[1] - # Visual Studio 2010 nodes + # Visual Studio 2017 nodes subprefix = os.path.join(prefix, lastname) - node2010 = etree.SubElement(filters2010, 'Filter') - node2010.set('Include', subprefix.replace('/', '\\')) - ui = etree.SubElement(node2010, 'UniqueIdentifier') + node2017 = etree.SubElement(filters2017, 'Filter') + node2017.set('Include', subprefix.replace('/', '\\')) + ui = etree.SubElement(node2017, 'UniqueIdentifier') ui.text = '{' + str(uuid.uuid4()) + '}' ui.tail = '\n\t\t' - node2010.tail = '\n\t\t' - node2010.text = '\n\t\t\t' + node2017.tail = '\n\t\t' + node2017.text = '\n\t\t\t' traverse(filename, subprefix) else: @@ -32,13 +32,13 @@ def traverse(dirname, prefix): filename = '..\\' + filename.replace('/', '\\') prefix = prefix.replace('/', '\\') - # Visual Studio 2010 nodes + # Visual Studio 2017 nodes if ext == '.cpp' or ext == '.c': - node = etree.SubElement(sources2010, 'ClCompile') + node = etree.SubElement(sources2017, 'ClCompile') node.set('Include', filename) node.tail = '\n\t\t' node.text = '\n\t\t\t' - node = etree.SubElement(sources2010_filters, 'ClCompile') + node = etree.SubElement(sources2017_filters, 'ClCompile') node.set('Include', filename) node.tail = '\n\t\t' node.text = '\n\t\t\t' @@ -46,11 +46,11 @@ def traverse(dirname, prefix): filter.text = prefix filter.tail = '\n\t\t' elif ext == '.h' or ext == '.inl': - node = etree.SubElement(headers2010, 'ClInclude') + node = etree.SubElement(headers2017, 'ClInclude') node.set('Include', filename) node.tail = '\n\t\t' node.text = '\n\t\t\t' - node = etree.SubElement(headers2010_filters, 'ClInclude') + node = etree.SubElement(headers2017_filters, 'ClInclude') node.set('Include', filename) node.tail = '\n\t\t' node.text = '\n\t\t\t' @@ -62,10 +62,10 @@ def traverse(dirname, prefix): traverse('src', 'Source Files') traverse('include', 'Header Files') -of = open('build/mitsuba-msvc2010.vcxproj', 'w') -of.write(etree.tostring(doc2010, pretty_print=True)) +of = open('build/mitsuba-msvc2017.vcxproj', 'w') +of.write(etree.tostring(doc2017, pretty_print=True)) of.close() -of = open('build/mitsuba-msvc2010.vcxproj.filters', 'w') -of.write(etree.tostring(doc2010_filters, pretty_print=True)) +of = open('build/mitsuba-msvc2017.vcxproj.filters', 'w') +of.write(etree.tostring(doc2017_filters, pretty_print=True)) of.close() diff --git a/data/windows/mitsuba-msvc2010.sln.template b/data/windows/mitsuba-msvc2010.sln.template deleted file mode 100644 index 4cccda1f..00000000 --- a/data/windows/mitsuba-msvc2010.sln.template +++ /dev/null @@ -1,26 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mitsuba", "mitsuba-msvc2010.vcxproj", "{BA3C2621-9FB1-4348-9059-AFC8CCAB25E9}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {BA3C2621-9FB1-4348-9059-AFC8CCAB25E9}.Debug|Win32.ActiveCfg = Debug|Win32 - {BA3C2621-9FB1-4348-9059-AFC8CCAB25E9}.Debug|Win32.Build.0 = Debug|Win32 - {BA3C2621-9FB1-4348-9059-AFC8CCAB25E9}.Debug|x64.ActiveCfg = Debug|x64 - {BA3C2621-9FB1-4348-9059-AFC8CCAB25E9}.Debug|x64.Build.0 = Debug|x64 - {BA3C2621-9FB1-4348-9059-AFC8CCAB25E9}.Release|Win32.ActiveCfg = Release|Win32 - {BA3C2621-9FB1-4348-9059-AFC8CCAB25E9}.Release|Win32.Build.0 = Release|Win32 - {BA3C2621-9FB1-4348-9059-AFC8CCAB25E9}.Release|x64.ActiveCfg = Release|x64 - {BA3C2621-9FB1-4348-9059-AFC8CCAB25E9}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/data/windows/mitsuba-msvc2010.vcxproj.template b/data/windows/mitsuba-msvc2010.vcxproj.template deleted file mode 100644 index 106b5c30..00000000 --- a/data/windows/mitsuba-msvc2010.vcxproj.template +++ /dev/null @@ -1,121 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {BA3C2621-9FB1-4348-9059-AFC8CCAB25E9} - mitsuba - MakeFileProj - - - - Makefile - - - Makefile - - - Makefile - - - Makefile - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - Debug\ - Debug\ - cd .. && scons --parallelize --cfg=build\config-win32-msvc2010-debug.py - cd .. && scons --parallelize --cfg=build\config-win32-msvc2010-debug.py -c && scons --parallelize --cfg=build\config-win32-msvc2010-debug.py - cd .. && scons --parallelize --cfg=build\config-win32-msvc2010-debug.py -c - ..\dist\mtsgui.exe - WIN32;_DEBUG;$(NMakePreprocessorDefinitions) - ..\include;$(NMakeIncludeSearchPath) - $(NMakeForcedIncludes) - $(NMakeAssemblySearchPath) - $(NMakeForcedUsingAssemblies) - Release\ - Release\ - cd .. && scons --parallelize --cfg=build\config-win32-msvc2010.py - cd .. && scons --parallelize --cfg=build\config-win32-msvc2010.py -c && scons --parallelize --cfg=build\config-win32-msvc2010.py - cd .. && scons --parallelize --cfg=build\config-win32-msvc2010.py -c - ..\dist\mtsgui.exe - WIN32;NDEBUG;SINGLE_PRECISION;$(NMakePreprocessorDefinitions) - ..\include;$(NMakeIncludeSearchPath) - $(NMakeForcedIncludes) - $(NMakeAssemblySearchPath) - $(NMakeForcedUsingAssemblies) - Debug\ - Debug\ - cd .. && scons --parallelize --cfg=build\config-win64-msvc2010-debug.py - cd .. && scons --parallelize --cfg=build\config-win64-msvc2010-debug.py -c && scons --parallelize --cfg=build\config-win64-msvc2010-debug.py - cd .. && scons --parallelize --cfg=build\config-win64-msvc2010-debug.py -c - ..\dist\mtsgui.exe - WIN32;_DEBUG;$(NMakePreprocessorDefinitions) - ..\include;$(NMakeIncludeSearchPath) - $(NMakeForcedIncludes) - $(NMakeAssemblySearchPath) - $(NMakeForcedUsingAssemblies) - Release\ - Release\ - cd .. && scons --parallelize --cfg=build\config-win64-msvc2010.py - cd .. && scons --parallelize --cfg=build\config-win64-msvc2010.py -c && scons --parallelize --cfg=build\config-win64-msvc2010.py - cd .. && scons --parallelize --cfg=build\config-win64-msvc2010.py -c - ..\dist\mtsgui.exe - WIN32;NDEBUG;SINGLE_PRECISION;$(NMakePreprocessorDefinitions) - ..\include;$(NMakeIncludeSearchPath) - $(NMakeForcedIncludes) - $(NMakeAssemblySearchPath) - $(NMakeForcedUsingAssemblies) - - - - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - - - - - - diff --git a/data/windows/mitsuba-msvc2017.sln.template b/data/windows/mitsuba-msvc2017.sln.template new file mode 100644 index 00000000..d75c6c4f --- /dev/null +++ b/data/windows/mitsuba-msvc2017.sln.template @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.26730.12 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mitsuba-msvc2017", "mitsuba-msvc2017.vcxproj", "{14BF8B5B-8DCA-4A28-83CA-CE9962153946}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {14BF8B5B-8DCA-4A28-83CA-CE9962153946}.Debug|x64.ActiveCfg = Debug|x64 + {14BF8B5B-8DCA-4A28-83CA-CE9962153946}.Debug|x64.Build.0 = Debug|x64 + {14BF8B5B-8DCA-4A28-83CA-CE9962153946}.Release|x64.ActiveCfg = Release|x64 + {14BF8B5B-8DCA-4A28-83CA-CE9962153946}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {881D9083-39B3-458C-965B-C455BED48F34} + EndGlobalSection +EndGlobal diff --git a/data/windows/mitsuba-msvc2010.vcxproj.filters.template b/data/windows/mitsuba-msvc2017.vcxproj.filters.template similarity index 66% rename from data/windows/mitsuba-msvc2010.vcxproj.filters.template rename to data/windows/mitsuba-msvc2017.vcxproj.filters.template index e155cd2d..805fb536 100644 --- a/data/windows/mitsuba-msvc2010.vcxproj.filters.template +++ b/data/windows/mitsuba-msvc2017.vcxproj.filters.template @@ -1,17 +1,21 @@ - - - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - - - + + + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + + + \ No newline at end of file diff --git a/data/windows/mitsuba-msvc2017.vcxproj.template b/data/windows/mitsuba-msvc2017.vcxproj.template new file mode 100644 index 00000000..855f4524 --- /dev/null +++ b/data/windows/mitsuba-msvc2017.vcxproj.template @@ -0,0 +1,124 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {14BF8B5B-8DCA-4A28-83CA-CE9962153946} + MakeFileProj + mitsuba-vs2017 + + + + Makefile + true + v141 + + + Makefile + false + v141 + + + Makefile + true + v141 + + + Makefile + false + v141 + + + + + + + + + + + + + + + + + + + + + WIN32;_DEBUG;$(NMakePreprocessorDefinitions) + + + WIN32;NDEBUG;$(NMakePreprocessorDefinitions) + + + WIN32;_DEBUG;$(NMakePreprocessorDefinitions) + cd .. && scons --parallelize --cfg=build\config-win64-msvc2017-debug.py + cd .. && scons --parallelize --cfg=build\config-win64-msvc2017-debug.py -c && scons --parallelize --cfg=build\config-win64-msvc201-debug.py + cd .. && scons --parallelize --cfg=build\config-win64-msvc2017-debug.py -c + ..\dist\mtsgui.exe + ..\include;$(NMakeIncludeSearchPath) + $(NMakeForcedIncludes) + $(NMakeAssemblySearchPath) + $(NMakeForcedUsingAssemblies) + $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ + + + $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ + cd .. && scons --parallelize --cfg=build\config-win64-msvc2017.py + cd .. && scons --parallelize --cfg=build\config-win64-msvc2017.py -c && scons --parallelize --cfg=build\config-win64-msvc2017.py + cd .. && scons --parallelize --cfg=build\config-win64-msvc2017.py -c + ..\dist\mtsgui.exe + WIN32;NDEBUG;SINGLE_PRECISION;$(NMakePreprocessorDefinitions) + ..\include;$(NMakeIncludeSearchPath) + $(NMakeForcedIncludes) + $(NMakeAssemblySearchPath) + $(NMakeForcedUsingAssemblies) + + + + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + + + + + + + + + \ No newline at end of file