From e923f6ccca25926be836b8de3397b88fa4de7723 Mon Sep 17 00:00:00 2001
From: Kelly Kinkade <kelly.lynn.martin@gmail.com>
Date: Mon, 12 Dec 2022 04:00:35 -0600
Subject: [PATCH] update batch files for vs2022 compat

---
 build/win64/build-debug.bat           | 2 +-
 build/win64/build-release.bat         | 4 ++--
 build/win64/generate-MSVC-gui.bat     | 6 +++---
 build/win64/generate-MSVC-minimal.bat | 6 +++---
 build/win64/generate-MSVC-release.bat | 6 +++---
 build/win64/install-debug.bat         | 4 ++--
 build/win64/install-release.bat       | 4 ++--
 build/win64/package-debug.bat         | 4 ++--
 build/win64/package-release.bat       | 4 ++--
 9 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/build/win64/build-debug.bat b/build/win64/build-debug.bat
index b8bcff6e9..a04cb9984 100644
--- a/build/win64/build-debug.bat
+++ b/build/win64/build-debug.bat
@@ -1,4 +1,4 @@
-call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64
+call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
 cd VC2022
 msbuild /m /p:Platform=x64 /p:Configuration=RelWithDebInfo ALL_BUILD.vcxproj
 cd ..
diff --git a/build/win64/build-release.bat b/build/win64/build-release.bat
index dfeb108b3..8068e5074 100644
--- a/build/win64/build-release.bat
+++ b/build/win64/build-release.bat
@@ -1,5 +1,5 @@
-call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
-cd VC2015
+call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
+cd VC2022
 msbuild /m /p:Platform=x64 /p:Configuration=Release ALL_BUILD.vcxproj
 cd ..
 pause
diff --git a/build/win64/generate-MSVC-gui.bat b/build/win64/generate-MSVC-gui.bat
index d48087931..cd18006d0 100644
--- a/build/win64/generate-MSVC-gui.bat
+++ b/build/win64/generate-MSVC-gui.bat
@@ -1,7 +1,7 @@
 IF EXIST DF_PATH.txt SET /P _DF_PATH=<DF_PATH.txt
 IF NOT EXIST DF_PATH.txt SET _DF_PATH=%CD%\DF
-mkdir VC2015
-cd VC2015
+mkdir VC2022
+cd VC2022
 echo Pre-generating a build folder
-cmake ..\..\.. -G"Visual Studio 17" -A x64 -T v190 -DCMAKE_INSTALL_PREFIX="%_DF_PATH%"
+cmake ..\..\.. -G"Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX="%_DF_PATH%"
 cmake-gui .
diff --git a/build/win64/generate-MSVC-minimal.bat b/build/win64/generate-MSVC-minimal.bat
index 861d37eea..30e9b91ee 100644
--- a/build/win64/generate-MSVC-minimal.bat
+++ b/build/win64/generate-MSVC-minimal.bat
@@ -1,6 +1,6 @@
 IF EXIST DF_PATH.txt SET /P _DF_PATH=<DF_PATH.txt
 IF NOT EXIST DF_PATH.txt SET _DF_PATH=%CD%\DF
-mkdir VC2015
-cd VC2015
+mkdir VC2022
+cd VC2022
 echo generating a build folder
-cmake ..\..\.. -G"Visual Studio 14 Win64" -T v140_xp -DCMAKE_INSTALL_PREFIX="%_DF_PATH%" -DBUILD_DEVEL=0 -DBUILD_DEV_PLUGINS=0 -DBUILD_STONESENSE=0
+cmake ..\..\.. -G"Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX="%_DF_PATH%" -DBUILD_DEVEL=0 -DBUILD_DEV_PLUGINS=0 -DBUILD_STONESENSE=0
diff --git a/build/win64/generate-MSVC-release.bat b/build/win64/generate-MSVC-release.bat
index 8782583a0..ef0b3dbbf 100644
--- a/build/win64/generate-MSVC-release.bat
+++ b/build/win64/generate-MSVC-release.bat
@@ -1,6 +1,6 @@
 IF EXIST DF_PATH.txt SET /P _DF_PATH=<DF_PATH.txt
 IF NOT EXIST DF_PATH.txt SET _DF_PATH=%CD%\DF
-mkdir VC2015
-cd VC2015
+mkdir VC2022
+cd VC2022
 echo generating a build folder
-cmake ..\..\.. -G"Visual Studio 14 Win64" -T v140_xp -DCMAKE_INSTALL_PREFIX="%_DF_PATH%" -DBUILD_DEVEL=0 -DBUILD_DEV_PLUGINS=0 -DBUILD_DOCS=1 -DBUILD_STONESENSE=1
+cmake ..\..\.. -G"Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX="%_DF_PATH%" -DBUILD_DEVEL=0 -DBUILD_DEV_PLUGINS=0 -DBUILD_DOCS=1 -DBUILD_STONESENSE=1
diff --git a/build/win64/install-debug.bat b/build/win64/install-debug.bat
index 34668945c..2724990fc 100644
--- a/build/win64/install-debug.bat
+++ b/build/win64/install-debug.bat
@@ -1,4 +1,4 @@
-call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
-cd VC2015
+call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
+cd VC2022
 msbuild /m /p:Platform=x64 /p:Configuration=RelWithDebInfo INSTALL.vcxproj
 cd ..
diff --git a/build/win64/install-release.bat b/build/win64/install-release.bat
index 24acd5de8..30dc1f6ff 100644
--- a/build/win64/install-release.bat
+++ b/build/win64/install-release.bat
@@ -1,4 +1,4 @@
-call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
-cd VC2015
+call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
+cd VC2022
 msbuild /m /p:Platform=x64 /p:Configuration=Release INSTALL.vcxproj
 cd ..
diff --git a/build/win64/package-debug.bat b/build/win64/package-debug.bat
index eb583ba0d..450db0dfd 100644
--- a/build/win64/package-debug.bat
+++ b/build/win64/package-debug.bat
@@ -1,6 +1,6 @@
 @echo off
-call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
-cd VC2015
+call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
+cd VC2022
 msbuild /m /p:Platform=x64 /p:Configuration=RelWithDebInfo PACKAGE.vcxproj
 cd ..
 exit %ERRORLEVEL%
diff --git a/build/win64/package-release.bat b/build/win64/package-release.bat
index c974ccd49..1c81ccf92 100644
--- a/build/win64/package-release.bat
+++ b/build/win64/package-release.bat
@@ -1,5 +1,5 @@
 @echo off
-call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
-cd VC2015
+call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
+cd VC2022
 msbuild /m /p:Platform=x64 /p:Configuration=Release PACKAGE.vcxproj
 cd ..