From 93a1cde67d59325cb541adef03a532bb08155230 Mon Sep 17 00:00:00 2001 From: Julian Sikorski Date: Fri, 18 Oct 2019 16:30:48 +0200 Subject: Continuous integration improvements (#5703) * Add workaround for imgtool and jedutil failing vs2019 debug builds with /ZI * No longer allow msvc build to fail * Enable tools build for travis to make it more useful * Switch travis to Xcode 11 in order to fix nltool linking failure * Prefer 64-bit compiler with VS 2019 too * Setting PreferredToolArchitecture to x64 is not needed, genie puts it into the project files for vs2015 or later * OPTIMIZE=1 build is faster that OPTIMIZE=0 for some reason. So fast in fact, that TOOLS=1 can be enabled without hitting the 60 minute timeout * Switch MINGW build to VS 2017 image until appveyor figure out why builds on VS 2019 are almost twice as slow * Run pacman twice to account for core system upgrades --- 3rdparty/genie/src/actions/vstudio/vstudio_vcxproj.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '3rdparty') diff --git a/3rdparty/genie/src/actions/vstudio/vstudio_vcxproj.lua b/3rdparty/genie/src/actions/vstudio/vstudio_vcxproj.lua index 106996909da..847a8cbb93d 100644 --- a/3rdparty/genie/src/actions/vstudio/vstudio_vcxproj.lua +++ b/3rdparty/genie/src/actions/vstudio/vstudio_vcxproj.lua @@ -66,7 +66,7 @@ else _p(2, 'Win32Proj') end - if _ACTION:sub(3) == "2015" or _ACTION:sub(3) == "2017" or _ACTION:sub(3) == "llvm" then + if _ACTION:sub(3) == "2015" or _ACTION:sub(3) == "2017" or _ACTION:sub(3) == "2019" or _ACTION:sub(3) == "llvm" then _p(2,'x64') end if (_ACTION:sub(3) == "2017" or _ACTION:sub(3) == "llvm") -- cgit v1.2.3-70-g09d2