From b862cbdd345ec57c2595629ded6a3969e1e65d56 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Wed, 23 Nov 2016 23:53:55 +0100 Subject: 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> Known issues: * Firebird is broken: http://paste.openstack.org/show/594333 Change-Id: I148d7932aff43bbbd07bd493504df974726234c2 Reviewed-on: https://gerrit.libreoffice.org/31279 Tested-by: Jenkins Reviewed-by: David Ostrovsky --- scp2/source/ooo/vc_redist.scp | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'scp2') 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 + -- cgit