From 35bea51ca2d9ece948c5a084764626ab010c0b76 Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Fri, 11 Feb 2022 13:15:43 -0300 Subject: [PATCH] Jenkins: Return Windows builds to Win32 --- .ci/Jenkinsfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile index a9c11c69e..0fd252253 100644 --- a/.ci/Jenkinsfile +++ b/.ci/Jenkinsfile @@ -24,6 +24,11 @@ def osArchs = [ 'Linux': ['x86', 'x86_64', 'arm32', 'arm64'] ] +def osFlags = [ + 'Windows': '', + 'Linux': '-D QT=ON' +] + def archNames = [ '32': 'x86 (32-bit)', 'x86': 'x86 (32-bit)', @@ -229,7 +234,7 @@ pipeline { /* Run build process. */ def packageName = "${env.JOB_BASE_NAME}${dynarecSlugs[dynarec]}${presetSlugs[preset]}-$os-$arch-b${env.BUILD_NUMBER}" dir("${dynarecNames[dynarec]}/$os - ${archNames[arch]}") { - runBuild("-b \"$packageName\" \"$arch\" ${presetFlags[preset]} ${dynarecFlags[dynarec]} -D QT=ON -D \"BUILD_TYPE=$BUILD_TYPE\" -D \"EMU_BUILD=build ${env.BUILD_NUMBER}\" -D \"EMU_BUILD_NUM=${env.BUILD_NUMBER}\"") + runBuild("-b \"$packageName\" \"$arch\" ${presetFlags[preset]} ${dynarecFlags[dynarec]} ${osFlags[os]} -D \"BUILD_TYPE=$BUILD_TYPE\" -D \"EMU_BUILD=build ${env.BUILD_NUMBER}\" -D \"EMU_BUILD_NUM=${env.BUILD_NUMBER}\"") } /* Archive resulting artifacts. */