From 161a6757af2ac30049e9c863534086430a12cb53 Mon Sep 17 00:00:00 2001
From: johnche <johnche@tencent.com>
Date: Mon, 20 Mar 2023 11:34:04 +0800
Subject: [PATCH] =?UTF-8?q?github=20action=E5=B7=B2=E7=BB=8F=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89vs2015=E7=8E=AF=E5=A2=83=EF=BC=8C=E7=BC=96=E8=AF=91?=
 =?UTF-8?q?=E5=8D=87=E7=BA=A7vs2019?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build/make_uwp.bat          | 8 ++++----
 build/make_uwp_lua54.bat    | 8 ++++----
 build/make_win32_lua53.bat  | 2 +-
 build/make_win32_luajit.bat | 6 +++---
 build/make_win64_lua53.bat  | 2 +-
 build/make_win64_luajit.bat | 6 +++---
 build/make_win_lua54.bat    | 4 ++--
 7 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/build/make_uwp.bat b/build/make_uwp.bat
index 5c969cab2..969005e13 100644
--- a/build/make_uwp.bat
+++ b/build/make_uwp.bat
@@ -1,26 +1,26 @@
 mkdir build_uwp & pushd build_uwp
-cmake -G "Visual Studio 15 2017" -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ..
+cmake -G "Visual Studio 16 2019" -A Win32 -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ..
 popd
 cmake --build build_uwp --config Release
 md plugin_lua53\Plugins\WSA\x86
 copy /Y build_uwp\Release\xlua.dll plugin_lua53\Plugins\WSA\x86\xlua.dll
 
 mkdir build_uwp64 & pushd build_uwp64
-cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ..
+cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ..
 popd
 cmake --build build_uwp64 --config Release
 md plugin_lua53\Plugins\WSA\x64
 copy /Y build_uwp64\Release\xlua.dll plugin_lua53\Plugins\WSA\x64\xlua.dll
 
 mkdir build_uwp_arm & pushd build_uwp_arm
-cmake -G "Visual Studio 15 2017 ARM" -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ..
+cmake -G "Visual Studio 16 2019" -A ARM -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ..
 popd
 cmake --build build_uwp_arm --config Release
 md plugin_lua53\Plugins\WSA\ARM
 copy /Y build_uwp_arm\Release\xlua.dll plugin_lua53\Plugins\WSA\ARM\xlua.dll
 
 mkdir build_uwp_arm64 & pushd build_uwp_arm64
-cmake -G "Visual Studio 15 2017" -A ARM64 -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ..
+cmake -G "Visual Studio 16 2019" -A ARM64 -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ..
 popd
 cmake --build build_uwp_arm64 --config Release
 md plugin_lua53\Plugins\WSA\ARM64
diff --git a/build/make_uwp_lua54.bat b/build/make_uwp_lua54.bat
index a47076632..671ea27a4 100644
--- a/build/make_uwp_lua54.bat
+++ b/build/make_uwp_lua54.bat
@@ -1,26 +1,26 @@
 mkdir build_uwp_54 & pushd build_uwp_54
-cmake -DLUA_VERSION=5.4.1 -G "Visual Studio 15 2017" -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ..
+cmake -DLUA_VERSION=5.4.1 -G "Visual Studio 16 2019" -A Win32 -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ..
 popd
 cmake --build build_uwp_54 --config Release
 md plugin_lua54\Plugins\WSA\x86
 copy /Y build_uwp_54\Release\xlua.dll plugin_lua54\Plugins\WSA\x86\xlua.dll
 
 mkdir build_uwp64_54 & pushd build_uwp64_54
-cmake -DLUA_VERSION=5.4.1 -G "Visual Studio 15 2017 Win64" -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ..
+cmake -DLUA_VERSION=5.4.1 -G "Visual Studio 16 2019" -A x64 -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ..
 popd
 cmake --build build_uwp64_54 --config Release
 md plugin_lua54\Plugins\WSA\x64
 copy /Y build_uwp64_54\Release\xlua.dll plugin_lua54\Plugins\WSA\x64\xlua.dll
 
 mkdir build_uwp_arm_54 & pushd build_uwp_arm_54
-cmake -DLUA_VERSION=5.4.1 -G "Visual Studio 15 2017 ARM" -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ..
+cmake -DLUA_VERSION=5.4.1 -G "Visual Studio 16 2019" -A ARM -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ..
 popd
 cmake --build build_uwp_arm_54 --config Release
 md plugin_lua54\Plugins\WSA\ARM
 copy /Y build_uwp_arm_54\Release\xlua.dll plugin_lua54\Plugins\WSA\ARM\xlua.dll
 
 mkdir build_uwp_arm64_54 & pushd build_uwp_arm64_54
-cmake -DLUA_VERSION=5.4.1 -G "Visual Studio 15 2017" -A ARM64 -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ..
+cmake -DLUA_VERSION=5.4.1 -G "Visual Studio 16 2019" -A ARM64 -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ..
 popd
 cmake --build build_uwp_arm64_54 --config Release
 md plugin_lua54\Plugins\WSA\ARM64
diff --git a/build/make_win32_lua53.bat b/build/make_win32_lua53.bat
index e9217476d..e5211e067 100644
--- a/build/make_win32_lua53.bat
+++ b/build/make_win32_lua53.bat
@@ -1,5 +1,5 @@
 mkdir build32 & pushd build32
-cmake -G "Visual Studio 15 2017" ..
+cmake -G "Visual Studio 16 2019" -A Win32 ..
 popd
 cmake --build build32 --config Release
 md plugin_lua53\Plugins\x86
diff --git a/build/make_win32_luajit.bat b/build/make_win32_luajit.bat
index 1e57c58f2..d48113815 100644
--- a/build/make_win32_luajit.bat
+++ b/build/make_win32_luajit.bat
@@ -1,6 +1,6 @@
 @echo off
 
-call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat"
+call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars32.bat"
 
 echo Swtich to x86 build env
 cd %~dp0\luajit-2.1.0b3\src
@@ -8,8 +8,8 @@ call msvcbuild_mt.bat static
 cd ..\..
 
 mkdir build_lj32 & pushd build_lj32
-cmake -DUSING_LUAJIT=ON -G "Visual Studio 15 2017" ..
-IF %ERRORLEVEL% NEQ 0 cmake -DUSING_LUAJIT=ON -G "Visual Studio 15 2017" ..
+cmake -DUSING_LUAJIT=ON -G "Visual Studio 16 2019" -A Win32 ..
+IF %ERRORLEVEL% NEQ 0 cmake -DUSING_LUAJIT=ON -G "Visual Studio 16 2019" -A Win32 ..
 popd
 cmake --build build_lj32 --config Release
 md plugin_luajit\Plugins\x86
diff --git a/build/make_win64_lua53.bat b/build/make_win64_lua53.bat
index 9d1af589a..6ffd9f658 100644
--- a/build/make_win64_lua53.bat
+++ b/build/make_win64_lua53.bat
@@ -1,5 +1,5 @@
 mkdir build64 & pushd build64
-cmake -G "Visual Studio 15 2017 Win64" ..
+cmake -G "Visual Studio 16 2019" -A x64 ..
 popd
 cmake --build build64 --config Release
 md plugin_lua53\Plugins\x86_64
diff --git a/build/make_win64_luajit.bat b/build/make_win64_luajit.bat
index d03aa78b7..9d7943088 100644
--- a/build/make_win64_luajit.bat
+++ b/build/make_win64_luajit.bat
@@ -1,6 +1,6 @@
 @echo off
 
-call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
+call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
 
 echo Swtich to x64 build env
 cd %~dp0\luajit-2.1.0b3\src
@@ -8,8 +8,8 @@ call msvcbuild_mt.bat static
 cd ..\..
 
 mkdir build_lj64 & pushd build_lj64
-cmake -DUSING_LUAJIT=ON -G "Visual Studio 15 2017 Win64" ..
-IF %ERRORLEVEL% NEQ 0 cmake -DUSING_LUAJIT=ON -G "Visual Studio 15 2017 Win64" ..
+cmake -DUSING_LUAJIT=ON -G "Visual Studio 16 2019" -A x64 ..
+IF %ERRORLEVEL% NEQ 0 cmake -DUSING_LUAJIT=ON -G "Visual Studio 16 2019" -A x64 ..
 popd
 cmake --build build_lj64 --config Release
 md plugin_luajit\Plugins\x86_64
diff --git a/build/make_win_lua54.bat b/build/make_win_lua54.bat
index 497264aee..629385ada 100644
--- a/build/make_win_lua54.bat
+++ b/build/make_win_lua54.bat
@@ -1,12 +1,12 @@
 mkdir build64_54 & pushd build64_54
-cmake -DLUA_VERSION=5.4.1 -G "Visual Studio 15 2017 Win64" ..
+cmake -DLUA_VERSION=5.4.1 -G "Visual Studio 16 2019" -A x64  ..
 popd
 cmake --build build64_54 --config Release
 md plugin_lua54\Plugins\x86_64
 copy /Y build64_54\Release\xlua.dll plugin_lua54\Plugins\x86_64\xlua.dll
 
 mkdir build32_54 & pushd build32_54
-cmake -DLUA_VERSION=5.4.1 -G "Visual Studio 15 2017" ..
+cmake -DLUA_VERSION=5.4.1 -G "Visual Studio 16 2019" -A Win32 ..
 popd
 cmake --build build32_54 --config Release
 md plugin_lua54\Plugins\x86