From 43d52f6293b9bf360095bbd61eed7572b55392ac Mon Sep 17 00:00:00 2001 From: Wenzel Jakob Date: Mon, 22 Aug 2011 10:09:28 -0700 Subject: [PATCH] updated the windows build system to include a SDK in the distribution zip files --- SConstruct | 1 - build/SConscript.install | 10 + build/config-icl12-msv2010-win32.py | 3 +- build/config-icl12-msv2010-win64.py | 3 +- build/config-msvc2008-win32-debug.py | 3 +- build/config-msvc2008-win32.py | 3 +- build/config-msvc2008-win64-debug.py | 3 +- build/config-msvc2008-win64.py | 3 +- build/config-msvc2010-win32-debug.py | 3 +- build/config-msvc2010-win32.py | 3 +- build/config-msvc2010-win64-debug.py | 3 +- build/config-msvc2010-win64.py | 3 +- build/mitsuba-msvc2008.vcproj | 77 ++++++-- build/mitsuba-msvc2010.vcxproj | 124 +++++++++--- build/mitsuba-msvc2010.vcxproj.filters | 252 ++++++++++++++++++------- 15 files changed, 353 insertions(+), 141 deletions(-) diff --git a/SConstruct b/SConstruct index d78dcc9d..8d3ee649 100644 --- a/SConstruct +++ b/SConstruct @@ -50,7 +50,6 @@ converter_objects = build('src/converter/SConscript', ['mainEnv']) build('src/mtsgui/SConscript', ['mainEnv', 'converter_objects'], duplicate=True) env['SHLIBPREFIX']='' -env['LIBPREFIX']='' # ===== Build the plugins ===== diff --git a/build/SConscript.install b/build/SConscript.install index 01df8c9e..2a5bbf3d 100644 --- a/build/SConscript.install +++ b/build/SConscript.install @@ -79,9 +79,19 @@ if sys.platform == 'win32': if hasCollada: install(distDir, ['converter/mtsimport.exe']) + basePath = env.GetBuildPath('#') + sdkDir = os.path.join(distDir, "sdk") + sdkLibDir = os.path.join(sdkDir, "lib") + install(distDir, ['mitsuba/mitsuba.exe', 'mitsuba/mtssrv.exe', 'mitsuba/mtsutil.exe']) install(distDir, ['libcore/libmitsuba-core.dll', 'libhw/libmitsuba-hw.dll', 'librender/libmitsuba-render.dll', 'libbidir/libmitsuba-bidir.dll']) + install(sdkLibDir, ['libcore/mitsuba-core.lib', 'libhw/mitsuba-hw.lib', + 'librender/mitsuba-render.lib', 'libbidir/mitsuba-bidir.lib']) + for entry in os.walk(os.path.join(basePath, "include")): + includeDir = entry[0][len(basePath)+1:] + installTargets += env.Install(os.path.join(sdkDir, includeDir), + [ ('#' + os.path.join(includeDir, fname)) for fname in entry[2] ]) if hasPython: installAs(os.path.join(distDir, 'python/mitsuba.pyd'), 'libpython/mitsuba.dll') install(distDir, ['Iex.dll', 'Half.dll','IlmThread.dll', 'Imath.dll','IlmImf.dll','zlib1.dll', diff --git a/build/config-icl12-msv2010-win32.py b/build/config-icl12-msv2010-win32.py index c324bdd8..b9a98c7f 100644 --- a/build/config-icl12-msv2010-win32.py +++ b/build/config-icl12-msv2010-win32.py @@ -28,9 +28,8 @@ GLFLAGS = ['/D', 'GLEW_MX'] BASELIBDIR = ['#dependencies/windows/lib32', '#dependencies/windows/lib32/vc100'] PYTHONINCLUDE = [os.path.join(os.path.split(sys.executable)[0], 'include')] PYTHONLIBDIR = [os.path.join(os.path.split(sys.executable)[0], 'libs')] -PYTHONLIB = ['boost_python-vc100-mt-1_44'] +PYTHONLIB = ['boost_python-vc100-mt-1_44', 'python26'] SHLIBPREFIX = 'lib' SHLIBSUFFIX = '.dll' -LIBPREFIX = 'lib' LIBSUFFIX = '.lib' PROGSUFFIX = '.exe' diff --git a/build/config-icl12-msv2010-win64.py b/build/config-icl12-msv2010-win64.py index 4a84b072..f31db5ed 100644 --- a/build/config-icl12-msv2010-win64.py +++ b/build/config-icl12-msv2010-win64.py @@ -28,9 +28,8 @@ GLFLAGS = ['/D', 'GLEW_MX'] BASELIBDIR = ['#dependencies/windows/lib64', '#dependencies/windows/lib64/vc100'] PYTHONINCLUDE = [os.path.join(os.path.split(sys.executable)[0], 'include')] PYTHONLIBDIR = [os.path.join(os.path.split(sys.executable)[0], 'libs')] -PYTHONLIB = ['boost_python-vc100-mt-1_44'] +PYTHONLIB = ['boost_python-vc100-mt-1_44', 'python26'] SHLIBPREFIX = 'lib' SHLIBSUFFIX = '.dll' -LIBPREFIX = 'lib' LIBSUFFIX = '.lib' PROGSUFFIX = '.exe' diff --git a/build/config-msvc2008-win32-debug.py b/build/config-msvc2008-win32-debug.py index 2b96ab7f..a5f39335 100644 --- a/build/config-msvc2008-win32-debug.py +++ b/build/config-msvc2008-win32-debug.py @@ -29,9 +29,8 @@ GLFLAGS = ['/D', 'GLEW_MX'] BASELIBDIR = ['#dependencies/windows/lib32', '#dependencies/windows/lib32/vc90'] PYTHONINCLUDE = [os.path.join(os.path.split(sys.executable)[0], 'include')] PYTHONLIBDIR = [os.path.join(os.path.split(sys.executable)[0], 'libs')] -PYTHONLIB = ['boost_python-vc100-mt-1_44'] +PYTHONLIB = ['boost_python-vc100-mt-1_44', 'python26'] SHLIBPREFIX = 'lib' SHLIBSUFFIX = '.dll' -LIBPREFIX = 'lib' LIBSUFFIX = '.lib' PROGSUFFIX = '.exe' diff --git a/build/config-msvc2008-win32.py b/build/config-msvc2008-win32.py index 8803b46d..c1c0e3ed 100644 --- a/build/config-msvc2008-win32.py +++ b/build/config-msvc2008-win32.py @@ -29,10 +29,9 @@ GLFLAGS = ['/D', 'GLEW_MX'] BASELIBDIR = ['#dependencies/windows/lib32', '#dependencies/windows/lib32/vc90'] PYTHONINCLUDE = [os.path.join(os.path.split(sys.executable)[0], 'include')] PYTHONLIBDIR = [os.path.join(os.path.split(sys.executable)[0], 'libs')] -PYTHONLIB = ['boost_python-vc100-mt-1_44'] +PYTHONLIB = ['boost_python-vc100-mt-1_44', 'python26'] SHLIBPREFIX = 'lib' SHLIBSUFFIX = '.dll' -LIBPREFIX = 'lib' LIBSUFFIX = '.lib' LIBPREFIX = 'lib' LIBSUFFIX = '.lib' diff --git a/build/config-msvc2008-win64-debug.py b/build/config-msvc2008-win64-debug.py index 4427d4ff..53557862 100644 --- a/build/config-msvc2008-win64-debug.py +++ b/build/config-msvc2008-win64-debug.py @@ -29,9 +29,8 @@ GLFLAGS = ['/D', 'GLEW_MX'] BASELIBDIR = ['#dependencies/windows/lib64', '#dependencies/windows/lib64/vc90'] PYTHONINCLUDE = [os.path.join(os.path.split(sys.executable)[0], 'include')] PYTHONLIBDIR = [os.path.join(os.path.split(sys.executable)[0], 'libs')] -PYTHONLIB = ['boost_python-vc100-mt-1_44'] +PYTHONLIB = ['boost_python-vc100-mt-1_44', 'python26'] SHLIBPREFIX = 'lib' SHLIBSUFFIX = '.dll' -LIBPREFIX = 'lib' LIBSUFFIX = '.lib' PROGSUFFIX = '.exe' diff --git a/build/config-msvc2008-win64.py b/build/config-msvc2008-win64.py index d487a5e3..b0a48d34 100644 --- a/build/config-msvc2008-win64.py +++ b/build/config-msvc2008-win64.py @@ -29,9 +29,8 @@ GLFLAGS = ['/D', 'GLEW_MX'] BASELIBDIR = ['#dependencies/windows/lib64', '#dependencies/windows/lib64/vc90'] PYTHONINCLUDE = [os.path.join(os.path.split(sys.executable)[0], 'include')] PYTHONLIBDIR = [os.path.join(os.path.split(sys.executable)[0], 'libs')] -PYTHONLIB = ['boost_python-vc100-mt-1_44'] +PYTHONLIB = ['boost_python-vc100-mt-1_44', 'python26'] SHLIBPREFIX = 'lib' SHLIBSUFFIX = '.dll' -LIBPREFIX = 'lib' LIBSUFFIX = '.lib' PROGSUFFIX = '.exe' diff --git a/build/config-msvc2010-win32-debug.py b/build/config-msvc2010-win32-debug.py index d8028dc9..d2125d1c 100644 --- a/build/config-msvc2010-win32-debug.py +++ b/build/config-msvc2010-win32-debug.py @@ -29,9 +29,8 @@ GLFLAGS = ['/D', 'GLEW_MX'] BASELIBDIR = ['#dependencies/windows/lib32', '#dependencies/windows/lib32/vc100'] PYTHONINCLUDE = [os.path.join(os.path.split(sys.executable)[0], 'include')] PYTHONLIBDIR = [os.path.join(os.path.split(sys.executable)[0], 'libs')] -PYTHONLIB = ['boost_python-vc100-mt-1_44'] +PYTHONLIB = ['boost_python-vc100-mt-1_44', 'python26'] SHLIBPREFIX = 'lib' SHLIBSUFFIX = '.dll' -LIBPREFIX = 'lib' LIBSUFFIX = '.lib' PROGSUFFIX = '.exe' diff --git a/build/config-msvc2010-win32.py b/build/config-msvc2010-win32.py index 48fa5047..792c3462 100644 --- a/build/config-msvc2010-win32.py +++ b/build/config-msvc2010-win32.py @@ -29,9 +29,8 @@ GLFLAGS = ['/D', 'GLEW_MX'] BASELIBDIR = ['#dependencies/windows/lib32', '#dependencies/windows/lib32/vc100'] PYTHONINCLUDE = [os.path.join(os.path.split(sys.executable)[0], 'include')] PYTHONLIBDIR = [os.path.join(os.path.split(sys.executable)[0], 'libs')] -PYTHONLIB = ['boost_python-vc100-mt-1_44'] +PYTHONLIB = ['boost_python-vc100-mt-1_44', 'python26'] SHLIBPREFIX = 'lib' SHLIBSUFFIX = '.dll' -LIBPREFIX = 'lib' LIBSUFFIX = '.lib' PROGSUFFIX = '.exe' diff --git a/build/config-msvc2010-win64-debug.py b/build/config-msvc2010-win64-debug.py index d2661a91..4eac7528 100644 --- a/build/config-msvc2010-win64-debug.py +++ b/build/config-msvc2010-win64-debug.py @@ -29,9 +29,8 @@ GLFLAGS = ['/D', 'GLEW_MX'] BASELIBDIR = ['#dependencies/windows/lib64', '#dependencies/windows/lib64/vc100'] PYTHONINCLUDE = [os.path.join(os.path.split(sys.executable)[0], 'include')] PYTHONLIBDIR = [os.path.join(os.path.split(sys.executable)[0], 'libs')] -PYTHONLIB = ['boost_python-vc100-mt-1_44'] +PYTHONLIB = ['boost_python-vc100-mt-1_44', 'python26'] SHLIBPREFIX = 'lib' SHLIBSUFFIX = '.dll' -LIBPREFIX = 'lib' LIBSUFFIX = '.lib' PROGSUFFIX = '.exe' diff --git a/build/config-msvc2010-win64.py b/build/config-msvc2010-win64.py index bb010004..0f6cd5ae 100644 --- a/build/config-msvc2010-win64.py +++ b/build/config-msvc2010-win64.py @@ -29,9 +29,8 @@ GLFLAGS = ['/D', 'GLEW_MX'] BASELIBDIR = ['#dependencies/windows/lib64', '#dependencies/windows/lib64/vc100'] PYTHONINCLUDE = [os.path.join(os.path.split(sys.executable)[0], 'include')] PYTHONLIBDIR = [os.path.join(os.path.split(sys.executable)[0], 'libs')] -PYTHONLIB = ['boost_python-vc100-mt-1_44'] +PYTHONLIB = ['boost_python-vc100-mt-1_44', 'python26'] SHLIBPREFIX = 'lib' SHLIBSUFFIX = '.dll' -LIBPREFIX = 'lib' LIBSUFFIX = '.lib' PROGSUFFIX = '.exe' diff --git a/build/mitsuba-msvc2008.vcproj b/build/mitsuba-msvc2008.vcproj index 89b235b4..536e4830 100644 --- a/build/mitsuba-msvc2008.vcproj +++ b/build/mitsuba-msvc2008.vcproj @@ -24,6 +24,9 @@ + + + @@ -43,7 +46,6 @@ - @@ -72,8 +74,8 @@ - + @@ -87,10 +89,12 @@ + + @@ -123,7 +127,6 @@ - @@ -172,23 +175,33 @@ - + + + + + + + - - - + + - - - + + + + + + + + @@ -234,11 +247,15 @@ + + + + @@ -260,6 +277,7 @@ + @@ -273,6 +291,7 @@ + @@ -300,6 +319,11 @@ + + + + + @@ -348,11 +372,16 @@ + + + + + @@ -360,13 +389,6 @@ - - - - - - - @@ -412,13 +434,26 @@ + + + + + + + + + + + + + @@ -437,6 +472,7 @@ + @@ -458,19 +494,22 @@ + + + + - - + diff --git a/build/mitsuba-msvc2010.vcxproj b/build/mitsuba-msvc2010.vcxproj index f0a3ecf4..224102c3 100644 --- a/build/mitsuba-msvc2010.vcxproj +++ b/build/mitsuba-msvc2010.vcxproj @@ -111,7 +111,11 @@ - + + + + + @@ -131,9 +135,13 @@ - + - + + + + + @@ -181,8 +189,14 @@ + + + + + + @@ -191,6 +205,8 @@ + + @@ -227,8 +243,6 @@ - - @@ -285,10 +299,10 @@ - - + + @@ -315,10 +329,14 @@ + + + + @@ -379,8 +397,6 @@ - - @@ -469,34 +485,50 @@ - + + + + + - + - + + + + + - - - + - + - + - + + + + + + + + + + + @@ -543,6 +575,8 @@ + + @@ -551,6 +585,8 @@ + + @@ -593,6 +629,8 @@ + + @@ -615,6 +653,8 @@ + + @@ -659,6 +699,10 @@ + + + + @@ -749,8 +793,14 @@ + + + + + + @@ -761,14 +811,6 @@ - - - - - - - - @@ -811,12 +853,30 @@ + + + + + + + + + + + + + + + + + + @@ -865,6 +925,10 @@ + + + + @@ -875,13 +939,15 @@ - + - + + + - + diff --git a/build/mitsuba-msvc2010.vcxproj.filters b/build/mitsuba-msvc2010.vcxproj.filters index bfe91231..8427225f 100644 --- a/build/mitsuba-msvc2010.vcxproj.filters +++ b/build/mitsuba-msvc2010.vcxproj.filters @@ -9,107 +9,122 @@ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - {e5a397d7-3fee-4fdb-af27-3c1592f23865} + {6c07bae8-63e7-4e18-9e5d-1df48b3b26b3} - {77676724-c505-492b-87d4-7f2afc711fa0} + {ac891347-6568-48ac-bc24-6ef7d4f0b3b5} - {fc03c9d3-a5c1-4bdb-b4ab-bd996cf1996e} + {5421306b-2e73-48de-8df8-8bd360546b7f} - {ef280573-ed89-4fee-a484-176c24c9a3b5} + {e8f4f49f-7671-4f3e-a4a6-ad1fc9b46367} - {27a9c637-7cd3-4f5b-80fe-0f0a25d686c3} + {70629522-a446-43c9-880e-357576e48593} - {b2219db5-124e-4756-9ff5-e43199837979} + {7351afe2-8193-4c65-930e-3a5241d19bda} - {09202e48-67c2-4d8f-b3b4-1db1ca84f73d} + {5fe61d4c-37c0-4bd9-8766-700d2d59c3e3} - {59f57db0-b0b8-4815-b9d7-1f60d95969f8} + {f2e68c20-0394-4d11-aee4-70cff7ca9e06} - {52e70061-0374-4316-8082-d1eb420d2097} + {f06038f7-97ed-45ad-b9f9-e0bd06ec6ed8} - {61b9addc-3d40-47d2-a6c9-b92954dabb49} + {ec9e8ea8-8a89-4998-9d4e-6f696dbf325e} + + + {fb06cac4-40bf-407f-8ba8-6073c9ed9d9c} - {9a855649-2c23-4503-9d33-5a62d04b47d2} + {c7fa3c5e-d139-438a-b605-3d9683de1bd9} - {b219ad2c-e2a2-4e73-a88d-b305a9d5441c} + {3694ee69-9ae2-45f1-ae20-e2559ad0be3c} + + + {bf43784e-b8b8-426c-bf3f-f662157c9d1a} - {e05c54de-78fa-49f7-a645-451c8a2a4743} + {b8a203d1-f935-4aff-a983-c033d3aad1fc} - {15f4abe8-dd81-4317-ad68-09ec10730fb1} + {79cfc733-d7c6-4ba0-a8b0-e5c72294e23a} - {6b9b9112-d06c-47fc-9828-991a52a4dd97} + {df4191a0-91d2-43e4-afa8-7448ec5e91df} - {d73ea77c-04c7-424a-885f-6014322d08be} - - - {629f51ab-8f77-4abd-9c1c-38e13b2db010} + {dc5c2941-9cac-4f98-9178-102f4c02ae23} - {7922cc88-966d-4a2a-ad99-0f932bf0eda3} + {76850a49-1f59-44bc-9fc9-73a784359d9e} - {12abdb4a-638a-4680-b01d-af8075fc74ee} + {7f4bbfaf-564b-436c-9385-18e6e93cbf0a} + + + {09d91281-e325-4aef-a397-c5fa73ef0c53} - {c2953411-4eea-45b1-9181-cd2cecde85be} + {675aa19c-a601-4737-aae9-002c2eb2fafe} - {ed72bd93-2aed-4f7d-b572-69b902530be8} + {9a928d9e-a53d-4deb-9fa7-f9c549b73d0d} - {24390d9e-aa63-404b-b587-52692e958954} + {f1fb3dcc-4a94-4298-b4a9-0d7b96c7b211} - {ca7616e7-d5fb-445d-a964-847b1dd02d95} + {102624fd-85af-45ab-8d7e-a0674c5843d7} - {f820d453-643a-48fa-9366-5909df6e17e2} + {f4402c4d-cf9d-4168-bfdb-44b499c1c894} - {81218ac9-9a3b-44f5-a63f-03fc0df4c5a5} + {0ad03353-0d32-4201-bcb5-b799de78fdab} - {cd74c6a0-3343-4510-90a4-fe383ead5926} + {3d903f9c-d57b-44a0-8ba2-fb5841fc1bf3} - {5220b652-4f79-40a8-a42d-50d334358f81} + {b6b5ca13-2cfa-4215-8201-95fc9ea81fdd} - {e1ca3dd3-4dff-4860-96fd-6aca1bcb4dab} + {64dc3e77-81ea-4937-aad3-8b965b0952ff} - {f9b4d83c-2fcd-4340-81c0-a7e3233c2abe} + {e7cf16c6-ecbf-4fd9-96e4-d18dda073ffb} - {2d9e6031-454a-4fbc-81c8-e12d4aee6846} + {35faeac7-e9ba-41e0-9984-a42507815ab4} + + + {16ea0322-f77c-4147-9916-84aea858fc82} - {6d76fac9-0455-4324-bf0e-eaca3b59bb53} + {530163a5-47a8-45e0-bf21-a59fde9d477e} - {f00ee13c-7e58-4247-95d5-2b1a4b81e279} + {8381460f-5406-42af-ba1b-9f1f21295d5d} - {1318e3a9-6b1e-4013-a462-598910e27fa4} + {548bf973-9299-48c9-9b21-48d79a70af4a} - + + Source Files\bsdfs + + + Source Files\bsdfs + + Source Files\bsdfs @@ -118,31 +133,46 @@ 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 @@ -151,6 +181,9 @@ Source Files\bsdfs + + Source Files\cameras + Source Files\cameras @@ -220,6 +253,9 @@ Source Files\integrators\vpl + + Source Files\libbidir + Source Files\libcore @@ -232,6 +268,9 @@ Source Files\libcore + + Source Files\libcore + Source Files\libcore @@ -295,6 +334,9 @@ Source Files\libcore + + Source Files\libcore + Source Files\libcore @@ -328,6 +370,9 @@ Source Files\libcore + + Source Files\libhw + Source Files\libhw @@ -394,6 +439,12 @@ Source Files\libhw + + Source Files\libpython + + + Source Files\libpython + Source Files\librender @@ -529,9 +580,18 @@ Source Files\luminaires + + Source Files\luminaires + Source Files\luminaires + + Source Files\luminaires + + + Source Files\luminaires + Source Files\medium @@ -547,18 +607,6 @@ Source Files\mitsuba - - Source Files\phase - - - Source Files\phase - - - Source Files\phase - - - Source Files\phase - Source Files\mtsgui @@ -622,15 +670,42 @@ 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 + + + Source Files\phase + + + Source Files\phase + + + Source Files\phase + Source Files\rfilters @@ -703,6 +778,12 @@ Source Files\subsurface + + Source Files\subsurface + + + Source Files\tests + Source Files\tests @@ -718,16 +799,19 @@ Source Files\tests - + + Source Files\tests + + Source Files\textures - + Source Files\textures Source Files\textures - + Source Files\textures @@ -768,7 +852,13 @@ - + + Source Files\bsdfs + + + Source Files\bsdfs + + Source Files\bsdfs @@ -798,11 +888,17 @@ Source Files\libhw - + + Source Files\libpython + + + Source Files\luminaires + + Source Files\medium - - Source Files\phase + + Source Files\medium Source Files\mtsgui @@ -873,9 +969,18 @@ Source Files\mtsgui + + Source Files\mtsgui + Source Files\mtsgui + + Source Files\phase + + + Source Files\shapes + Source Files\shapes @@ -888,6 +993,9 @@ Source Files\subsurface + + Header Files\mitsuba\bidir + Header Files\mitsuba\core @@ -942,9 +1050,6 @@ Header Files\mitsuba\core - - Header Files\mitsuba\core - Header Files\mitsuba\core @@ -1029,10 +1134,10 @@ Header Files\mitsuba\core - + Header Files\mitsuba\core - + Header Files\mitsuba\core @@ -1074,12 +1179,18 @@ Header Files\mitsuba\core + + Header Files\mitsuba\core + Header Files\mitsuba\core Header Files\mitsuba\core + + Header Files\mitsuba\hw + Header Files\mitsuba\hw @@ -1170,9 +1281,6 @@ Header Files\mitsuba\render - - Header Files\mitsuba\render - Header Files\mitsuba\render