From 34bdb870af521e56f0a4fb75d761494e04c6a596 Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Sun, 1 May 2022 18:17:59 -0300 Subject: [PATCH] Jenkins: Forgot the Jenkinsfile for universal builds --- .ci/Jenkinsfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile index e9fd8b986..e8a3612a8 100644 --- a/.ci/Jenkinsfile +++ b/.ci/Jenkinsfile @@ -25,7 +25,7 @@ def buildBranch = env.JOB_BASE_NAME.contains('-') ? 1 : 0 def osArchs = [ 'Windows': ['32', '64'], 'Linux': ['x86', 'x86_64', 'arm32', 'arm64'], - 'macOS': ['x86_64'] + 'macOS': ['x86_64+arm64'] ] def osFlags = [ @@ -45,7 +45,8 @@ def archNames = [ def archNamesMac = [ 'x86_64': 'Intel', - 'arm64': 'Apple Silicon' + 'arm64': 'Apple Silicon', + 'x86_64+arm64': 'Universal (Intel and Apple Silicon)' ] def dynarecNames = [ @@ -60,7 +61,8 @@ def dynarecArchs = [ '64': ['ODR', 'NDR'], 'x86_64': ['ODR', 'NDR'], 'arm32': ['NDR'], - 'arm64': ['NDR'] + 'arm64': ['NDR'], + 'x86_64+arm64': ['ODR', 'NDR'] ] def dynarecFlags = [