From 608831265c92c23f1347b51fd904a151c1a79cd8 Mon Sep 17 00:00:00 2001
From: Sarah Sunday <1644563-ssunday@users.noreply.gitlab.com>
Date: Sat, 14 Jun 2025 14:10:28 -0500
Subject: [PATCH] [CI] Attempt to add intel mac builds with separate build step

---
 .gitlab-ci.yml           | 11 +++++++++++
 CI/before_install.osx.sh |  2 +-
 CI/before_script.osx.sh  |  6 ++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d55e554905..d715956a25 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -534,6 +534,17 @@ Ubuntu_GCC_integration_tests_asan:
     paths:
       - build/OpenMW-*.dmg
 
+macOS14_Xcode15_x86-64:
+  extends: .MacOS
+  image: macos-14-xcode-15
+  tags:
+    - saas-macos-medium-m1
+  cache:
+    key: macOS14_Xcode15_x86-64.v1
+  variables:
+    CCACHE_SIZE: 3G
+    MACOS_X86_64: true
+
 macOS14_Xcode15_arm64:
   extends: .MacOS
   image: macos-14-xcode-15
diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh
index 30822f5d00..b1666690ef 100755
--- a/CI/before_install.osx.sh
+++ b/CI/before_install.osx.sh
@@ -20,7 +20,7 @@ ccache --version
 cmake --version
 qmake --version
 
-if [[ "${MACOS_AMD64}" ]]; then
+if [[ "${MACOS_X86_64}" ]]; then
     curl -fSL -R -J https://gitlab.com/OpenMW/openmw-deps/-/raw/main/macos/openmw-deps-20240802.zip -o ~/openmw-deps.zip
     unzip -o ~/openmw-deps.zip -d /tmp > /dev/null
 else
diff --git a/CI/before_script.osx.sh b/CI/before_script.osx.sh
index 9be91f1632..7957514e88 100755
--- a/CI/before_script.osx.sh
+++ b/CI/before_script.osx.sh
@@ -29,6 +29,12 @@ declare -a CMAKE_CONF_OPTS=(
 -D OPENMW_OSX_DEPLOYMENT=TRUE
 )
 
+if [[ "${MACOS_X86_64}" ]]; then
+    CMAKE_CONF_OPTS+=(
+        -D CMAKE_OSX_ARCHITECTURES="x86_64"
+    )
+fi
+
 if [[ "${CMAKE_BUILD_TYPE}" ]]; then
     CMAKE_CONF_OPTS+=(
         -D CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}