Skip to content

Commit 84b42c4

Browse files
kekyokekyo
committed
Updated cmake to 3.17.3. #80 
1 parent 1c154c3 commit 84b42c4

File tree

3 files changed

+65
-41
lines changed

3 files changed

+65
-41
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.12
5+
set CMAKE_ROOT=%TOOLCHAINPATH%\share\cmake-3.17
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 15 2017" -DCMAKE_TOOLCHAIN_FILE=../../cmake/msvc-win.cmake -DPLATFORM=Win32 -DRUNTIMELIB=rts -DCONFIGURATION=%Configuration% ../..
53+
cmake -G "Visual Studio 16 2019" -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 15 2017 Win64" -DCMAKE_TOOLCHAIN_FILE=../../cmake/msvc-win.cmake -DPLATFORM=x64 -DRUNTIMELIB=rts -DCONFIGURATION=%Configuration% ../..
76+
cmake -G "Visual Studio 16 2019" -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 15 2017" -DCMAKE_TOOLCHAIN_FILE=../../cmake/msvc-win.cmake -DPLATFORM=Win32 -DRUNTIMELIB=rtd -DCONFIGURATION=%Configuration% ../..
99+
cmake -G "Visual Studio 16 2019" -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 15 2017 Win64" -DCMAKE_TOOLCHAIN_FILE=../../cmake/msvc-win.cmake -DPLATFORM=x64 -DRUNTIMELIB=rtd -DCONFIGURATION=%Configuration% ../..
122+
cmake -G "Visual Studio 16 2019" -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 15 2017" -DCMAKE_TOOLCHAIN_FILE=../../cmake/msvc-uefi.cmake -DPLATFORM=Win32 -DCONFIGURATION=%Configuration% ../..
145+
cmake -G "Visual Studio 16 2019" -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 15 2017 Win64" -DCMAKE_TOOLCHAIN_FILE=../../cmake/msvc-uefi.cmake -DPLATFORM=x64 -DCONFIGURATION=%Configuration% ../..
168+
cmake -G "Visual Studio 16 2019" -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

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
@echo off
2+
3+
rem ========================================================
4+
rem Download preconfigured gcc4 toolchain from GitHub.
5+
rem It contains:
6+
rem -----------------
7+
rem mingwBaseUrl = "https://jaist.dl.sourceforge.net/project/mingw/MinGW";
8+
rem bsdTarUrl = mingwBaseUrl + "/Extension/bsdtar/basic-bsdtar-2.8.3-1/basic-bsdtar-2.8.3-1-mingw32-bin.zip";
9+
rem gccRequirementUrls =
10+
rem mingwBaseUrl + "/Base/binutils/binutils-2.28/binutils-2.28-1-mingw32-bin.tar.xz",
11+
rem mingwBaseUrl + "/Base/mingwrt/mingwrt-3.20/mingwrt-3.20-2-mingw32-dev.tar.lzma",
12+
rem mingwBaseUrl + "/Base/mingwrt/mingwrt-3.20/mingwrt-3.20-2-mingw32-dll.tar.lzma",
13+
rem mingwBaseUrl + "/Base/w32api/w32api-3.17/w32api-3.17-2-mingw32-dev.tar.lzma",
14+
rem mingwBaseUrl + "/Base/mpc/mpc-1.0.1-2/mpc-1.0.1-2-mingw32-dll.tar.lzma",
15+
rem mingwBaseUrl + "/Base/mpfr/mpfr-3.1.2-2/mpfr-3.1.2-2-mingw32-dll.tar.lzma",
16+
rem mingwBaseUrl + "/Base/gmp/gmp-5.1.2/gmp-5.1.2-1-mingw32-dll.tar.lzma",
17+
rem mingwBaseUrl + "/Base/libiconv/libiconv-1.14-3/libiconv-1.14-3-mingw32-dll.tar.lzma",
18+
rem mingwBaseUrl + "/Base/pthreads-w32/pthreads-w32-2.9.1/pthreads-w32-2.9.1-1-mingw32-dev.tar.lzma",
19+
rem mingwBaseUrl + "/Base/pthreads-w32/pthreads-w32-2.9.1/pthreads-w32-2.9.1-1-mingw32-dll.tar.lzma",
20+
rem mingwBaseUrl + "/Base/zlib/zlib-1.2.8/zlib-1.2.8-1-mingw32-dll.tar.lzma",
21+
rem mingwBaseUrl + "/Base/gettext/gettext-0.18.3.1-1/gettext-0.18.3.1-1-mingw32-dll.tar.lzma",
22+
rem mingwBaseUrl + "/Base/gcc/Version4/gcc-4.8.1-4/gcc-core-4.8.1-4-mingw32-bin.tar.lzma",
23+
rem mingwBaseUrl + "/Base/gcc/Version4/gcc-4.8.1-4/gcc-core-4.8.1-4-mingw32-dev.tar.lzma",
24+
rem mingwBaseUrl + "/Base/gcc/Version4/gcc-4.8.1-4/gcc-core-4.8.1-4-mingw32-dll.tar.lzma",
25+
rem // Require C++
26+
rem //mingwBaseUrl + "/Base/gcc/Version4/gcc-4.8.1-4/gcc-c++-4.8.1-4-mingw32-bin.tar.lzma",
27+
rem //mingwBaseUrl + "/Base/gcc/Version4/gcc-4.8.1-4/gcc-c++-4.8.1-4-mingw32-dev.tar.lzma",
28+
rem //mingwBaseUrl + "/Base/gcc/Version4/gcc-4.8.1-4/gcc-c++-4.8.1-4-mingw32-dll.tar.lzma",
29+
rem mingwBaseUrl + "/Extension/make/make-3.82-mingw32/make-3.82-5-mingw32-bin.tar.lzma",
30+
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",
32+
rem "https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-win.zip"
33+
34+
cd toolchain
35+
36+
curl -L -O https://github.com/kekyo/IL2C/releases/download/IL2C-toolchain-gcc4-mingw32-3/7z-19.00.exe
37+
if errorlevel 1 (
38+
exit /b %errorlevel%
39+
)
40+
41+
7z-19.00.exe
42+
if errorlevel 1 (
43+
exit /b %errorlevel%
44+
)
45+
46+
del /q 7z-19.00.exe
47+
if errorlevel 1 (
48+
exit /b %errorlevel%
49+
)
50+
51+
7z\7za.exe a -mx9 -sfx ..\artifacts\IL2C-toolchain-gcc4-mingw32-3.exe gcc4
52+
53+
rem ========================================================
54+
55+
cd ..

‎init-tools.bat

+3-34
Original file line numberDiff line numberDiff line change
@@ -6,49 +6,18 @@ mkdir toolchain
66

77
cd toolchain
88

9-
rem ========================================================
10-
rem Download preconfigured gcc4 toolchain from GitHub.
11-
rem It contains:
12-
rem -----------------
13-
rem mingwBaseUrl = "https://jaist.dl.sourceforge.net/project/mingw/MinGW";
14-
rem bsdTarUrl = mingwBaseUrl + "/Extension/bsdtar/basic-bsdtar-2.8.3-1/basic-bsdtar-2.8.3-1-mingw32-bin.zip";
15-
rem gccRequirementUrls =
16-
rem mingwBaseUrl + "/Base/binutils/binutils-2.28/binutils-2.28-1-mingw32-bin.tar.xz",
17-
rem mingwBaseUrl + "/Base/mingwrt/mingwrt-3.20/mingwrt-3.20-2-mingw32-dev.tar.lzma",
18-
rem mingwBaseUrl + "/Base/mingwrt/mingwrt-3.20/mingwrt-3.20-2-mingw32-dll.tar.lzma",
19-
rem mingwBaseUrl + "/Base/w32api/w32api-3.17/w32api-3.17-2-mingw32-dev.tar.lzma",
20-
rem mingwBaseUrl + "/Base/mpc/mpc-1.0.1-2/mpc-1.0.1-2-mingw32-dll.tar.lzma",
21-
rem mingwBaseUrl + "/Base/mpfr/mpfr-3.1.2-2/mpfr-3.1.2-2-mingw32-dll.tar.lzma",
22-
rem mingwBaseUrl + "/Base/gmp/gmp-5.1.2/gmp-5.1.2-1-mingw32-dll.tar.lzma",
23-
rem mingwBaseUrl + "/Base/libiconv/libiconv-1.14-3/libiconv-1.14-3-mingw32-dll.tar.lzma",
24-
rem mingwBaseUrl + "/Base/pthreads-w32/pthreads-w32-2.9.1/pthreads-w32-2.9.1-1-mingw32-dev.tar.lzma",
25-
rem mingwBaseUrl + "/Base/pthreads-w32/pthreads-w32-2.9.1/pthreads-w32-2.9.1-1-mingw32-dll.tar.lzma",
26-
rem mingwBaseUrl + "/Base/zlib/zlib-1.2.8/zlib-1.2.8-1-mingw32-dll.tar.lzma",
27-
rem mingwBaseUrl + "/Base/gettext/gettext-0.18.3.1-1/gettext-0.18.3.1-1-mingw32-dll.tar.lzma",
28-
rem mingwBaseUrl + "/Base/gcc/Version4/gcc-4.8.1-4/gcc-core-4.8.1-4-mingw32-bin.tar.lzma",
29-
rem mingwBaseUrl + "/Base/gcc/Version4/gcc-4.8.1-4/gcc-core-4.8.1-4-mingw32-dev.tar.lzma",
30-
rem mingwBaseUrl + "/Base/gcc/Version4/gcc-4.8.1-4/gcc-core-4.8.1-4-mingw32-dll.tar.lzma",
31-
rem // Require C++
32-
rem //mingwBaseUrl + "/Base/gcc/Version4/gcc-4.8.1-4/gcc-c++-4.8.1-4-mingw32-bin.tar.lzma",
33-
rem //mingwBaseUrl + "/Base/gcc/Version4/gcc-4.8.1-4/gcc-c++-4.8.1-4-mingw32-dev.tar.lzma",
34-
rem //mingwBaseUrl + "/Base/gcc/Version4/gcc-4.8.1-4/gcc-c++-4.8.1-4-mingw32-dll.tar.lzma",
35-
rem mingwBaseUrl + "/Extension/make/make-3.82-mingw32/make-3.82-5-mingw32-bin.tar.lzma",
36-
rem mingwBaseUrl + "/Extension/gdb/gdb-7.6.1-1/gdb-7.6.1-1-mingw32-bin.tar.lzma",
37-
rem "https://cmake.org/files/v3.12/cmake-3.12.3-win32-x86.zip",
38-
rem "https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-win.zip"
39-
40-
curl -L -O https://github.com/kekyo/IL2C/releases/download/IL2C-toolchain-gcc4-mingw32-2/IL2C-toolchain-gcc4-mingw32-2.exe
9+
curl -L -O https://github.com/kekyo/IL2C/releases/download/IL2C-toolchain-gcc4-mingw32-3/IL2C-toolchain-gcc4-mingw32-3.exe
4110
if errorlevel 1 (
4211
exit /b %errorlevel%
4312
)
4413

4514
rem It zipped by 7z sfx.
46-
IL2C-toolchain-gcc4-mingw32-2.exe
15+
IL2C-toolchain-gcc4-mingw32-3.exe
4716
if errorlevel 1 (
4817
exit /b %errorlevel%
4918
)
5019

51-
del /q IL2C-toolchain-gcc4-mingw32-2.exe
20+
del /q IL2C-toolchain-gcc4-mingw32-3.exe
5221
if errorlevel 1 (
5322
exit /b %errorlevel%
5423
)

0 commit comments

Comments
 (0)