Skip to content

Commit 161a675

Browse files
chexiongshengchexiongsheng
committed
github action已经没有vs2015环境，编译升级vs2019
1 parent fb8d968 commit 161a675

File tree

7 files changed

+18
-18
lines changed

7 files changed

+18
-18
lines changed

‎build/make_uwp.bat

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
mkdir build_uwp & pushd build_uwp
2-
cmake -G "Visual Studio 15 2017" -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ..
2+
cmake -G "Visual Studio 16 2019" -A Win32 -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ..
33
popd
44
cmake --build build_uwp --config Release
55
md plugin_lua53\Plugins\WSA\x86
66
copy /Y build_uwp\Release\xlua.dll plugin_lua53\Plugins\WSA\x86\xlua.dll
77

88
mkdir build_uwp64 & pushd build_uwp64
9-
cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ..
9+
cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ..
1010
popd
1111
cmake --build build_uwp64 --config Release
1212
md plugin_lua53\Plugins\WSA\x64
1313
copy /Y build_uwp64\Release\xlua.dll plugin_lua53\Plugins\WSA\x64\xlua.dll
1414

1515
mkdir build_uwp_arm & pushd build_uwp_arm
16-
cmake -G "Visual Studio 15 2017 ARM" -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ..
16+
cmake -G "Visual Studio 16 2019" -A ARM -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ..
1717
popd
1818
cmake --build build_uwp_arm --config Release
1919
md plugin_lua53\Plugins\WSA\ARM
2020
copy /Y build_uwp_arm\Release\xlua.dll plugin_lua53\Plugins\WSA\ARM\xlua.dll
2121

2222
mkdir build_uwp_arm64 & pushd build_uwp_arm64
23-
cmake -G "Visual Studio 15 2017" -A ARM64 -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ..
23+
cmake -G "Visual Studio 16 2019" -A ARM64 -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ..
2424
popd
2525
cmake --build build_uwp_arm64 --config Release
2626
md plugin_lua53\Plugins\WSA\ARM64

‎build/make_uwp_lua54.bat

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
mkdir build_uwp_54 & pushd build_uwp_54
2-
cmake -DLUA_VERSION=5.4.1 -G "Visual Studio 15 2017" -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ..
2+
cmake -DLUA_VERSION=5.4.1 -G "Visual Studio 16 2019" -A Win32 -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ..
33
popd
44
cmake --build build_uwp_54 --config Release
55
md plugin_lua54\Plugins\WSA\x86
66
copy /Y build_uwp_54\Release\xlua.dll plugin_lua54\Plugins\WSA\x86\xlua.dll
77

88
mkdir build_uwp64_54 & pushd build_uwp64_54
9-
cmake -DLUA_VERSION=5.4.1 -G "Visual Studio 15 2017 Win64" -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ..
9+
cmake -DLUA_VERSION=5.4.1 -G "Visual Studio 16 2019" -A x64 -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ..
1010
popd
1111
cmake --build build_uwp64_54 --config Release
1212
md plugin_lua54\Plugins\WSA\x64
1313
copy /Y build_uwp64_54\Release\xlua.dll plugin_lua54\Plugins\WSA\x64\xlua.dll
1414

1515
mkdir build_uwp_arm_54 & pushd build_uwp_arm_54
16-
cmake -DLUA_VERSION=5.4.1 -G "Visual Studio 15 2017 ARM" -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ..
16+
cmake -DLUA_VERSION=5.4.1 -G "Visual Studio 16 2019" -A ARM -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ..
1717
popd
1818
cmake --build build_uwp_arm_54 --config Release
1919
md plugin_lua54\Plugins\WSA\ARM
2020
copy /Y build_uwp_arm_54\Release\xlua.dll plugin_lua54\Plugins\WSA\ARM\xlua.dll
2121

2222
mkdir build_uwp_arm64_54 & pushd build_uwp_arm64_54
23-
cmake -DLUA_VERSION=5.4.1 -G "Visual Studio 15 2017" -A ARM64 -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ..
23+
cmake -DLUA_VERSION=5.4.1 -G "Visual Studio 16 2019" -A ARM64 -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ..
2424
popd
2525
cmake --build build_uwp_arm64_54 --config Release
2626
md plugin_lua54\Plugins\WSA\ARM64

‎build/make_win32_lua53.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
mkdir build32 & pushd build32
2-
cmake -G "Visual Studio 15 2017" ..
2+
cmake -G "Visual Studio 16 2019" -A Win32 ..
33
popd
44
cmake --build build32 --config Release
55
md plugin_lua53\Plugins\x86

‎build/make_win32_luajit.bat

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
@echo off
22

3-
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat"
3+
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars32.bat"
44

55
echo Swtich to x86 build env
66
cd %~dp0\luajit-2.1.0b3\src
77
call msvcbuild_mt.bat static
88
cd ..\..
99

1010
mkdir build_lj32 & pushd build_lj32
11-
cmake -DUSING_LUAJIT=ON -G "Visual Studio 15 2017" ..
12-
IF %ERRORLEVEL% NEQ 0 cmake -DUSING_LUAJIT=ON -G "Visual Studio 15 2017" ..
11+
cmake -DUSING_LUAJIT=ON -G "Visual Studio 16 2019" -A Win32 ..
12+
IF %ERRORLEVEL% NEQ 0 cmake -DUSING_LUAJIT=ON -G "Visual Studio 16 2019" -A Win32 ..
1313
popd
1414
cmake --build build_lj32 --config Release
1515
md plugin_luajit\Plugins\x86

‎build/make_win64_lua53.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
mkdir build64 & pushd build64
2-
cmake -G "Visual Studio 15 2017 Win64" ..
2+
cmake -G "Visual Studio 16 2019" -A x64 ..
33
popd
44
cmake --build build64 --config Release
55
md plugin_lua53\Plugins\x86_64

‎build/make_win64_luajit.bat

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
@echo off
22

3-
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
3+
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
44

55
echo Swtich to x64 build env
66
cd %~dp0\luajit-2.1.0b3\src
77
call msvcbuild_mt.bat static
88
cd ..\..
99

1010
mkdir build_lj64 & pushd build_lj64
11-
cmake -DUSING_LUAJIT=ON -G "Visual Studio 15 2017 Win64" ..
12-
IF %ERRORLEVEL% NEQ 0 cmake -DUSING_LUAJIT=ON -G "Visual Studio 15 2017 Win64" ..
11+
cmake -DUSING_LUAJIT=ON -G "Visual Studio 16 2019" -A x64 ..
12+
IF %ERRORLEVEL% NEQ 0 cmake -DUSING_LUAJIT=ON -G "Visual Studio 16 2019" -A x64 ..
1313
popd
1414
cmake --build build_lj64 --config Release
1515
md plugin_luajit\Plugins\x86_64

‎build/make_win_lua54.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
mkdir build64_54 & pushd build64_54
2-
cmake -DLUA_VERSION=5.4.1 -G "Visual Studio 15 2017 Win64" ..
2+
cmake -DLUA_VERSION=5.4.1 -G "Visual Studio 16 2019" -A x64 ..
33
popd
44
cmake --build build64_54 --config Release
55
md plugin_lua54\Plugins\x86_64
66
copy /Y build64_54\Release\xlua.dll plugin_lua54\Plugins\x86_64\xlua.dll
77

88
mkdir build32_54 & pushd build32_54
9-
cmake -DLUA_VERSION=5.4.1 -G "Visual Studio 15 2017" ..
9+
cmake -DLUA_VERSION=5.4.1 -G "Visual Studio 16 2019" -A Win32 ..
1010
popd
1111
cmake --build build32_54 --config Release
1212
md plugin_lua54\Plugins\x86

0 commit comments

Comments
 (0)