diff --git a/build/jenkins/pipelines/windows.Jenkinsfile b/build/jenkins/pipelines/windows.Jenkinsfile index c001798c5d..a321d52b01 100644 --- a/build/jenkins/pipelines/windows.Jenkinsfile +++ b/build/jenkins/pipelines/windows.Jenkinsfile @@ -18,7 +18,7 @@ // This pipeline builds the game on Windows (which uses the MSVC 15.0 compiler from Visual Studio 2017) and runs tests. def visualStudioPath = "\"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\MSBuild\\15.0\\Bin\\MSBuild.exe\"" -def buildOptions = "/p:PlatformToolset=v141_xp /p:XPDeprecationWarning=false /t:pyrogenesis /t:AtlasUI /t:test /nologo -clp:NoSummary" +def buildOptions = "/p:PlatformToolset=v141_xp /p:XPDeprecationWarning=false /t:pyrogenesis /t:AtlasUI /t:test /m:2 /nologo -clp:NoSummary" pipeline { // Stop previous build in pull requests, but not in branches diff --git a/build/premake/premake5.lua b/build/premake/premake5.lua index ab7ffefd6f..37f8d31b6f 100644 --- a/build/premake/premake5.lua +++ b/build/premake/premake5.lua @@ -418,6 +418,8 @@ function project_create(project_name, target_type) filter "action:vs*" buildoptions "/utf-8" + -- disable LNK4221 warning, to avoid spending energy ordering projects in linker invocations + linkoptions "/ignore:4221" filter {} project_set_target(project_name)