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 --- basic/CppunitTest_basic_macros.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'basic/CppunitTest_basic_macros.mk') diff --git a/basic/CppunitTest_basic_macros.mk b/basic/CppunitTest_basic_macros.mk index 8d64f40a65f7..343522418cd5 100644 --- a/basic/CppunitTest_basic_macros.mk +++ b/basic/CppunitTest_basic_macros.mk @@ -42,7 +42,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_macros, \ ifeq ($(OS),WNT) $(eval $(call gb_CppunitTest_use_system_win32_libs,basic_macros, \ oleaut32 \ - $(if $(filter 140,$(VCVER)),legacy_stdio_definitions) \ + $(if $(filter 140 150,$(VCVER)),legacy_stdio_definitions) \ odbc32 \ odbccp32 \ )) -- cgit