From 6ca9fb7e1543d8a1c087f510ac82ab4a4b08d759 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Sat, 11 Mar 2023 18:32:36 +0000
Subject: [PATCH 1/2] Use multithreaded Bullet libraries on Windows

---
 CI/before_script.msvc.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index b6e0a6d827..d4930dce9c 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -377,7 +377,7 @@ case $VS_VERSION in
 		MYGUI_MSVC_YEAR="2019"
 		LUA_MSVC_YEAR="2019"
 		QT_MSVC_YEAR="2019"
-		BULLET_MSVC_YEAR="2015"
+		BULLET_MSVC_YEAR="2019"
 
 		BOOST_VER="1.80.0"
 		BOOST_VER_URL="1_80_0"
@@ -395,7 +395,7 @@ case $VS_VERSION in
 		MYGUI_MSVC_YEAR="2019"
 		LUA_MSVC_YEAR="2019"
 		QT_MSVC_YEAR="2019"
-		BULLET_MSVC_YEAR="2015"
+		BULLET_MSVC_YEAR="2019"
 
 		BOOST_VER="1.80.0"
 		BOOST_VER_URL="1_80_0"
@@ -596,8 +596,8 @@ if [ -z $SKIP_DOWNLOAD ]; then
 
 	# Bullet
 	download "Bullet ${BULLET_VER}" \
-		"https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/Bullet-${BULLET_VER}-msvc${BULLET_MSVC_YEAR}-win${BITS}-double.7z" \
-		"Bullet-${BULLET_VER}-msvc${BULLET_MSVC_YEAR}-win${BITS}-double.7z"
+		"https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/Bullet-${BULLET_VER}-msvc${BULLET_MSVC_YEAR}-win${BITS}-double-mt.7z" \
+		"Bullet-${BULLET_VER}-msvc${BULLET_MSVC_YEAR}-win${BITS}-double-mt.7z"
 
 	# FFmpeg
 	download "FFmpeg ${FFMPEG_VER}" \
@@ -742,8 +742,8 @@ printf "Bullet ${BULLET_VER}... "
 		printf -- "Exists. (No version checking) "
 	elif [ -z $SKIP_EXTRACT ]; then
 		rm -rf Bullet
-		eval 7z x -y "${DEPS}/Bullet-${BULLET_VER}-msvc${BULLET_MSVC_YEAR}-win${BITS}-double.7z" $STRIP
-		mv "Bullet-${BULLET_VER}-msvc${BULLET_MSVC_YEAR}-win${BITS}-double" Bullet
+		eval 7z x -y "${DEPS}/Bullet-${BULLET_VER}-msvc${BULLET_MSVC_YEAR}-win${BITS}-double-mt.7z" $STRIP
+		mv "Bullet-${BULLET_VER}-msvc${BULLET_MSVC_YEAR}-win${BITS}-double-mt" Bullet
 	fi
 	add_cmake_opts -DBULLET_ROOT="$(real_pwd)/Bullet"
 	echo Done.

From 946e905d5818899caa59d9e84c6a59ff04de1207 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Sat, 11 Mar 2023 18:36:06 +0000
Subject: [PATCH 2/2] Bump cache key for new Bullet binaries

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3d4a3ee193..7d572ca771 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -470,7 +470,7 @@ macOS12_Xcode13:
   after_script:
     - Copy-Item C:\ProgramData\chocolatey\logs\chocolatey.log
   cache:
-    key: ninja-v5
+    key: ninja-v6
     paths:
     - ccache
     - deps
@@ -571,7 +571,7 @@ macOS12_Xcode13:
   after_script:
     - Copy-Item C:\ProgramData\chocolatey\logs\chocolatey.log
   cache:
-    key: msbuild-v5
+    key: msbuild-v6
     paths:
     - ccache
     - deps