diff options
author | 2019-10-18 16:30:48 +0200 | |
---|---|---|
committer | 2019-10-18 10:30:48 -0400 | |
commit | 93a1cde67d59325cb541adef03a532bb08155230 (patch) | |
tree | 0ca0d7cf45de3fee5ec67d80d778d6a6cb02da9e /3rdparty/genie/src | |
parent | 14f2ce1a37dee5f8ba2e774dcb04778fd3b4da69 (diff) |
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
Diffstat (limited to '3rdparty/genie/src')
-rw-r--r-- | 3rdparty/genie/src/actions/vstudio/vstudio_vcxproj.lua | 2 |
1 files changed, 1 insertions, 1 deletions
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, '<Keyword>Win32Proj</Keyword>') 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,'<PreferredToolArchitecture>x64</PreferredToolArchitecture>') end if (_ACTION:sub(3) == "2017" or _ACTION:sub(3) == "llvm") |