diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2019-12-06 20:12:03 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2019-12-06 20:12:03 +0300 |
| commit | 6df2ede3414422372ac3b0b229b401e973b98509 (patch) | |
| tree | 66c356a060b4a6c9b9aec40fa2e7e492ee283cb0 /release/windows | |
| parent | 19a89797c3a37f0e5b8957857536b539e2ea938a (diff) | |
Cleanup/Windows: Separate out the MS-CRT into a subfolder
In older versions the ms crt was only a few dlls, in recent versions
this jumped to over 40 leading to quite a bit of clutter in our
bin folder.
This change moves the CRT into its own folder.
For developers that generally already have the runtime globaly
available on their machine, there is a new cmake option
(WITH_WINDOWS_BUNDLE_CRT, default ON) that you can use to toggle
installing the runtime to the blender bin folder, and save some
time during the initial build, this option is off by default for
only the developer profile.
Reviewed By: brecht
Differential Revision: https://developer.blender.org/D6132
Diffstat (limited to 'release/windows')
| -rw-r--r-- | release/windows/manifest/Blender.CRT.MANIFEST.in | 4 | ||||
| -rw-r--r-- | release/windows/manifest/blender.exe.manifest.in (renamed from release/windows/icons/blender.exe.manifest) | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/release/windows/manifest/Blender.CRT.MANIFEST.in b/release/windows/manifest/Blender.CRT.MANIFEST.in new file mode 100644 index 00000000000..27c4a6bce56 --- /dev/null +++ b/release/windows/manifest/Blender.CRT.MANIFEST.in @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity type="win32" name="Blender.CRT" version="1.0.0.0" /> +@CRTLIBS@</assembly>
\ No newline at end of file diff --git a/release/windows/icons/blender.exe.manifest b/release/windows/manifest/blender.exe.manifest.in index ceee357ecda..e73ddf3267b 100644 --- a/release/windows/icons/blender.exe.manifest +++ b/release/windows/manifest/blender.exe.manifest.in @@ -33,4 +33,5 @@ /> </dependentAssembly> </dependency> + @BUNDLECRT@ </assembly>
\ No newline at end of file |