From 80428d8e6d8954db70db8763b34185ef26b18a95 Mon Sep 17 00:00:00 2001
From: Amber Brown <hawkowl@atleastfornow.net>
Date: Sat, 14 Jan 2023 14:07:14 +1100
Subject: [PATCH] let cmake deal with VS2022 instead :)

---
 build/win64/build-debug.bat     | 4 +---
 build/win64/build-release.bat   | 4 +---
 build/win64/install-debug.bat   | 3 +--
 build/win64/install-release.bat | 3 +--
 build/win64/msvc_include.bat    | 9 ---------
 build/win64/package-debug.bat   | 3 +--
 build/win64/package-release.bat | 3 +--
 7 files changed, 6 insertions(+), 23 deletions(-)
 delete mode 100644 build/win64/msvc_include.bat

diff --git a/build/win64/build-debug.bat b/build/win64/build-debug.bat
index fdcdce6b8..2db9df402 100644
--- a/build/win64/build-debug.bat
+++ b/build/win64/build-debug.bat
@@ -1,3 +1 @@
-call msvc_include.bat
-%msbuild% /m /p:Platform=x64 /p:Configuration=RelWithDebInfo VC2022/ALL_BUILD.vcxproj
-
+cmake --build VC2022 -t ALL_BUILD -- /m /p:Platform=x64 /p:Configuration=RelWithDebInfo
diff --git a/build/win64/build-release.bat b/build/win64/build-release.bat
index 39174794a..f719d64bc 100644
--- a/build/win64/build-release.bat
+++ b/build/win64/build-release.bat
@@ -1,3 +1 @@
-call msvc_include.bat
-%msbuild% /m /p:Platform=x64 /p:Configuration=Release VC2022/ALL_BUILD.vcxproj
-pause
+cmake --build VC2022 -t ALL_BUILD -- /m /p:Platform=x64 /p:Configuration=Release
diff --git a/build/win64/install-debug.bat b/build/win64/install-debug.bat
index 2fc03eca1..b6c22b0e3 100644
--- a/build/win64/install-debug.bat
+++ b/build/win64/install-debug.bat
@@ -1,2 +1 @@
-call msvc_include.bat
-%msbuild% /m /p:Platform=x64 /p:Configuration=RelWithDebInfo VC2022/INSTALL.vcxproj
+cmake --build VC2022 -t INSTALL -- /m /p:Platform=x64 /p:Configuration=RelWithDebInfo
diff --git a/build/win64/install-release.bat b/build/win64/install-release.bat
index 3194812b8..61aabf771 100644
--- a/build/win64/install-release.bat
+++ b/build/win64/install-release.bat
@@ -1,2 +1 @@
-call msvc_include.bat
-%msbuild% /m /p:Platform=x64 /p:Configuration=Release VC2022/INSTALL.vcxproj
+cmake --build VC2022 -t INSTALL -- /m /p:Platform=x64 /p:Configuration=Release
diff --git a/build/win64/msvc_include.bat b/build/win64/msvc_include.bat
deleted file mode 100644
index 0dbcc90cc..000000000
--- a/build/win64/msvc_include.bat
+++ /dev/null
@@ -1,9 +0,0 @@
-@ECHO OFF
-setlocal enabledelayedexpansion
-
-FOR /F "usebackq tokens=*" %%F IN (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -requires Microsoft.Component.MSBuild -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -version [17.0^,] -products * -find MSBuild\**\Bin\MSBuild.exe`) DO (
-    endlocal & set "MSBUILD="%%F""
-    goto :EOF
-)
-echo "Cannot find a Visual Studio 2022/Build Tools installation"
-exit 1
\ No newline at end of file
diff --git a/build/win64/package-debug.bat b/build/win64/package-debug.bat
index 72ca65a0a..afaec234a 100644
--- a/build/win64/package-debug.bat
+++ b/build/win64/package-debug.bat
@@ -1,3 +1,2 @@
-call msvc_include.bat
-%msbuild% /m /p:Platform=x64 /p:Configuration=RelWithDebInfo VC2022/PACKAGE.vcxproj
+cmake --build VC2022 -t PACKAGE -- /m /p:Platform=x64 /p:Configuration=RelWithDebInfo
 exit %ERRORLEVEL%
diff --git a/build/win64/package-release.bat b/build/win64/package-release.bat
index e796d6481..75b35bcd5 100644
--- a/build/win64/package-release.bat
+++ b/build/win64/package-release.bat
@@ -1,2 +1 @@
-call msvc_include.bat
-%msbuild% /m /p:Platform=x64 /p:Configuration=Release VC2022/PACKAGE.vcxproj
+cmake --build VC2022 -t PACKAGE -- /m /p:Platform=x64 /p:Configuration=Release