Skip to content

Commit da6b0c4

Browse files
committedMay 3, 2022

5 files changed

+17
-16
lines changed
 

‎build-runtime.bat

+7-7
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
setlocal enabledelayedexpansion
33

44
set TOOLCHAINPATH=%~dp0toolchain\gcc4
5-
set CMAKE_ROOT=%TOOLCHAINPATH%\share\cmake-3.17
5+
set CMAKE_ROOT=%TOOLCHAINPATH%\share\cmake-3.23
66

77
if not exist %TOOLCHAINPATH% (
88
echo Native toolchain not found.
@@ -50,7 +50,7 @@ echo.
5050
mkdir msvc-win-win32-rts-%Configuration%
5151
cd msvc-win-win32-rts-%Configuration%
5252

53-
cmake -G "Visual Studio 16 2019" -A Win32 -DCMAKE_TOOLCHAIN_FILE=../../cmake/msvc-win.cmake -DPLATFORM=Win32 -DRUNTIMELIB=rts -DCONFIGURATION=%Configuration% ../..
53+
cmake -G "Visual Studio 17 2022" -A Win32 -DCMAKE_TOOLCHAIN_FILE=../../cmake/msvc-win.cmake -DPLATFORM=Win32 -DRUNTIMELIB=rts -DCONFIGURATION=%Configuration% ../..
5454
if errorlevel 1 (
5555
exit /b %errorlevel%
5656
)
@@ -73,7 +73,7 @@ echo.
7373
mkdir msvc-win-x64-rts-%Configuration%
7474
cd msvc-win-x64-rts-%Configuration%
7575

76-
cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_TOOLCHAIN_FILE=../../cmake/msvc-win.cmake -DPLATFORM=x64 -DRUNTIMELIB=rts -DCONFIGURATION=%Configuration% ../..
76+
cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_TOOLCHAIN_FILE=../../cmake/msvc-win.cmake -DPLATFORM=x64 -DRUNTIMELIB=rts -DCONFIGURATION=%Configuration% ../..
7777
if errorlevel 1 (
7878
exit /b %errorlevel%
7979
)
@@ -96,7 +96,7 @@ echo.
9696
mkdir msvc-win-win32-rtd-%Configuration%
9797
cd msvc-win-win32-rtd-%Configuration%
9898

99-
cmake -G "Visual Studio 16 2019" -A Win32 -DCMAKE_TOOLCHAIN_FILE=../../cmake/msvc-win.cmake -DPLATFORM=Win32 -DRUNTIMELIB=rtd -DCONFIGURATION=%Configuration% ../..
99+
cmake -G "Visual Studio 17 2022" -A Win32 -DCMAKE_TOOLCHAIN_FILE=../../cmake/msvc-win.cmake -DPLATFORM=Win32 -DRUNTIMELIB=rtd -DCONFIGURATION=%Configuration% ../..
100100
if errorlevel 1 (
101101
exit /b %errorlevel%
102102
)
@@ -119,7 +119,7 @@ echo.
119119
mkdir msvc-win-x64-rtd-%Configuration%
120120
cd msvc-win-x64-rtd-%Configuration%
121121

122-
cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_TOOLCHAIN_FILE=../../cmake/msvc-win.cmake -DPLATFORM=x64 -DRUNTIMELIB=rtd -DCONFIGURATION=%Configuration% ../..
122+
cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_TOOLCHAIN_FILE=../../cmake/msvc-win.cmake -DPLATFORM=x64 -DRUNTIMELIB=rtd -DCONFIGURATION=%Configuration% ../..
123123
if errorlevel 1 (
124124
exit /b %errorlevel%
125125
)
@@ -142,7 +142,7 @@ echo.
142142
mkdir msvc-uefi-win32-%Configuration%
143143
cd msvc-uefi-win32-%Configuration%
144144

145-
cmake -G "Visual Studio 16 2019" -A Win32 -DCMAKE_TOOLCHAIN_FILE=../../cmake/msvc-uefi.cmake -DPLATFORM=Win32 -DCONFIGURATION=%Configuration% ../..
145+
cmake -G "Visual Studio 17 2022" -A Win32 -DCMAKE_TOOLCHAIN_FILE=../../cmake/msvc-uefi.cmake -DPLATFORM=Win32 -DCONFIGURATION=%Configuration% ../..
146146
if errorlevel 1 (
147147
exit /b %errorlevel%
148148
)
@@ -165,7 +165,7 @@ echo.
165165
mkdir msvc-uefi-x64-%Configuration%
166166
cd msvc-uefi-x64-%Configuration%
167167

168-
cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_TOOLCHAIN_FILE=../../cmake/msvc-uefi.cmake -DPLATFORM=x64 -DCONFIGURATION=%Configuration% ../..
168+
cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_TOOLCHAIN_FILE=../../cmake/msvc-uefi.cmake -DPLATFORM=x64 -DCONFIGURATION=%Configuration% ../..
169169
if errorlevel 1 (
170170
exit /b %errorlevel%
171171
)

‎build-tools-pack.bat

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ rem //mingwBaseUrl + "/Base/gcc/Version4/gcc-4.8.1-4/gcc-c++-4.8.1-4-mingw32
2828
rem //mingwBaseUrl + "/Base/gcc/Version4/gcc-4.8.1-4/gcc-c++-4.8.1-4-mingw32-dll.tar.lzma",
2929
rem mingwBaseUrl + "/Extension/make/make-3.82-mingw32/make-3.82-5-mingw32-bin.tar.lzma",
3030
rem mingwBaseUrl + "/Extension/gdb/gdb-7.6.1-1/gdb-7.6.1-1-mingw32-bin.tar.lzma",
31-
rem "https://cmake.org/files/v3.17/cmake-3.17.3-win32-x86.zip",
31+
rem "https://cmake.org/files/v3.23/cmake-3.23.1-windows-i386.zip",
3232
rem "https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-win.zip"
3333

3434
cd toolchain
@@ -48,7 +48,7 @@ if errorlevel 1 (
4848
exit /b %errorlevel%
4949
)
5050

51-
7z\7za.exe a -mx9 -sfx ..\artifacts\IL2C-toolchain-gcc4-mingw32-3.exe gcc4
51+
7z\7za.exe a -mx9 -sfx ..\artifacts\IL2C-toolchain-gcc4-mingw32-4.exe gcc4
5252

5353
rem ========================================================
5454

‎il2c.sln

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio Version 16
3-
VisualStudioVersion = 16.0.29306.81
2+
# Visual Studio Version 17
3+
VisualStudioVersion = 17.1.32414.318
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IL2C", "src\IL2C\IL2C.csproj", "{2CBC90EC-5581-452F-8231-086E4553D20E}"
66
EndProject
@@ -9,6 +9,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
99
.gitignore = .gitignore
1010
build-runtime.bat = build-runtime.bat
1111
build-runtime.sh = build-runtime.sh
12+
build-tools-pack.bat = build-tools-pack.bat
1213
il2c.sln.licenseheader = il2c.sln.licenseheader
1314
init-tools.bat = init-tools.bat
1415
init-tools.sh = init-tools.sh

‎init-tools.bat

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ mkdir toolchain
77

88
cd toolchain
99

10-
curl -L -O https://github.com/kekyo/IL2C/releases/download/IL2C-toolchain-gcc4-mingw32-3/IL2C-toolchain-gcc4-mingw32-3.exe
10+
curl -L -O https://github.com/kekyo/IL2C/releases/download/IL2C-toolchain-gcc4-mingw32-4/IL2C-toolchain-gcc4-mingw32-4.exe
1111
if errorlevel 1 (
1212
exit /b %errorlevel%
1313
)
1414

1515
rem It zipped by 7z sfx.
16-
IL2C-toolchain-gcc4-mingw32-3.exe
16+
IL2C-toolchain-gcc4-mingw32-4.exe
1717
if errorlevel 1 (
1818
exit /b %errorlevel%
1919
)
2020

21-
del /q IL2C-toolchain-gcc4-mingw32-3.exe
21+
del /q IL2C-toolchain-gcc4-mingw32-4.exe
2222
if errorlevel 1 (
2323
exit /b %errorlevel%
2424
)

‎init-tools.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

3-
# Required: .NET 5.0 SDK
4-
# https://dotnet.microsoft.com/download/dotnet/5.0
3+
# Required: .NET 6.0 SDK
4+
# https://dotnet.microsoft.com/en-us/download/dotnet/6.0
55

66
echo "Setup native binary toolchain ..."
77

0 commit comments

Comments
 (0)
Please sign in to comment.