@@ -27,7 +27,7 @@ call :Download https://www.7-zip.org/a/%version%-src.7z %version%-src.7z
27
27
28
28
:Patch
29
29
if defined APPVEYOR goto :Patch_Appveyor
30
- busybox 2 > nul > nul || call :Download https://frippery.org/files/busybox/busybox.exe
30
+ busybox 2 > nul > nul || call :Download https://frippery.org/files/busybox/busybox.exe busybox.exe
31
31
busybox sh 7-zip-patch.sh
32
32
goto :Patch_Done
33
33
@@ -39,15 +39,15 @@ C:\msys64\usr\bin\bash -lc "cd \"$APPVEYOR_BUILD_FOLDER\" && exec ./7-zip-patch.
39
39
:Init_VC_LTL
40
40
git clone https://github.com/Chuyu-Team/VC-LTL.git --depth=1
41
41
set " VC_LTL_PATH = %CD% \VC-LTL"
42
- set " CL_VER = 14.0.24210"
42
+ set " VC_VER = 14.0.24210"
43
43
set " SDK_VER = 10.0.10240.0"
44
44
45
45
:Env_x64
46
46
call " %VS140COMNTOOLS% ..\..\VC\vcvarsall.bat" amd64
47
47
set BITS = x64
48
- set " PATH = %VC_LTL_PATH% ;%VC_LTL_PATH% \VC\%CL_VER % \include;%VC_LTL_PATH% \%BITS% ;%VC_LTL_PATH% \VC\%CL_VER % \lib\%BITS% ;%PATH% "
49
- set " INCLUDE = %VC_LTL_PATH% \VC\%CL_VER % \include;%INCLUDE% "
50
- set " LIB = %VC_LTL_PATH% \%BITS% ;%VC_LTL_PATH% \VC\%CL_VER % \lib\%BITS% ;%VC_LTL_PATH% \ucrt\%SDK_VER% \lib\%BITS% ;%LIB% "
48
+ set " PATH = %VC_LTL_PATH% ;%VC_LTL_PATH% \VC\%VC_VER % \include;%VC_LTL_PATH% \%BITS% ;%VC_LTL_PATH% \VC\%VC_VER % \lib\%BITS% ;%PATH% "
49
+ set " INCLUDE = %VC_LTL_PATH% \VC\%VC_VER % \include;%INCLUDE% "
50
+ set " LIB = %VC_LTL_PATH% \%BITS% ;%VC_LTL_PATH% \VC\%VC_VER % \lib\%BITS% ;%VC_LTL_PATH% \ucrt\%SDK_VER% \lib\%BITS% ;%LIB% "
51
51
52
52
:Build_x64
53
53
cd CPP\7zip
@@ -65,9 +65,9 @@ nmake /F makefile_con NEW_COMPILER=1 CPU=AMD64
65
65
:Env_x86
66
66
call " %VS140COMNTOOLS% \vsvars32.bat"
67
67
set BITS = x86
68
- set " PATH = %VC_LTL_PATH% ;%VC_LTL_PATH% \VC\%CL_VER % \include;%VC_LTL_PATH% \%BITS% ;%VC_LTL_PATH% \VC\%CL_VER % \lib\%BITS% ;%PATH% "
69
- set " INCLUDE = %VC_LTL_PATH% \VC\%CL_VER % \include;%INCLUDE% "
70
- set " LIB = %VC_LTL_PATH% \%BITS% ;%VC_LTL_PATH% \VC\%CL_VER % \lib\%BITS% ;%VC_LTL_PATH% \ucrt\%SDK_VER% \lib\%BITS% ;%LIB% "
68
+ set " PATH = %VC_LTL_PATH% ;%VC_LTL_PATH% \VC\%VC_VER % \include;%VC_LTL_PATH% \%BITS% ;%VC_LTL_PATH% \VC\%VC_VER % \lib\%BITS% ;%PATH% "
69
+ set " INCLUDE = %VC_LTL_PATH% \VC\%VC_VER % \include;%INCLUDE% "
70
+ set " LIB = %VC_LTL_PATH% \%BITS% ;%VC_LTL_PATH% \VC\%VC_VER % \lib\%BITS% ;%VC_LTL_PATH% \ucrt\%SDK_VER% \lib\%BITS% ;%LIB% "
71
71
72
72
:Build_x86
73
73
nmake NEW_COMPILER=1
0 commit comments