diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2016-11-23 23:53:55 +0100 |
|---|---|---|
| committer | David Ostrovsky <david@ostrovsky.org> | 2017-02-15 08:23:53 +0000 |
| commit | b862cbdd345ec57c2595629ded6a3969e1e65d56 (patch) | |
| tree | f210409f37e7d8d452f49042beceaffd6b58afc5 /scp2 | |
| parent | 60542769488cbf31339e86dc2688a064c6e07917 (diff) | |
Support MSVC 15.0
New compiler changes quite some stuff:
* Compiler detection done based on different registry key
* .NET SDK detection done based on different registry key
* Msbuild installation directory changed
* Merge modules installation directory changed
* SDK number in registry doesn't match the directory name:
(registry key: 10.0.14393, directory name: 10.0.14393.0)
* Compiler, include and library location directories changed
* Architecture specific directory changed: x64 instead of amd64
* Compiler own include directory must be added with -I option
* To force usage of SDK 10 (8.1 is selected per default) new
switch WindowsTargetPlatformVersion is passed to msbuild, to
avoid patching VC project files with this line:
<WindowsTargetPlatformVersion><SDK>/WindowsTargetPlatformVersion>
Known issues:
* Firebird is broken: http://paste.openstack.org/show/594333
Change-Id: I148d7932aff43bbbd07bd493504df974726234c2
Reviewed-on: https://gerrit.libreoffice.org/31279
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/vc_redist.scp | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp index 8f2112498dca..160e73e25c91 100644 --- a/scp2/source/ooo/vc_redist.scp +++ b/scp2/source/ooo/vc_redist.scp @@ -56,3 +56,22 @@ End #endif +#if defined(WITH_VC150_REDIST) + +#if defined WINDOWS_X64 +MergeModule gid_MergeModule_Microsoft_VC150_CRT_x64 +#else +MergeModule gid_MergeModule_Microsoft_VC150_CRT_x86 +#endif + Feature = gm_Root; +#if defined WINDOWS_X64 + Name = "Microsoft_VC150_CRT_x64.msm"; +#else + Name = "Microsoft_VC150_CRT_x86.msm"; +#endif + RootDir = "TARGETDIR"; + ComponentCondition = "VC_REDIST=1"; +End + +#endif + |