File tree Expand file tree Collapse file tree 3 files changed +18
-4
lines changed Expand file tree Collapse file tree 3 files changed +18
-4
lines changed Original file line number Diff line number Diff line change @@ -6,7 +6,11 @@ The Steps to Build Git with VS2015 or VS2017 from the command line.
66 Prompt or from an SDK bash window:
77
88 $ cd <repo_root>
9- $ ./compat/vcbuild/vcpkg_install.bat
9+ $ ./compat/vcbuild/vcpkg_install.bat x64-windows
10+
11+ or
12+
13+ $ ./compat/vcbuild/vcpkg_install.bat arm64-windows
1014
1115 The vcpkg tools and all of the third-party sources will be installed
1216 in this folder:
Original file line number Diff line number Diff line change @@ -15,7 +15,12 @@ REM ================================================================
1515 @ FOR /F " delims=" %% D IN (" %~dp0 " ) DO @ SET cwd = %% ~fD
1616 cd %cwd%
1717
18- SET arch = x64-windows
18+ SET arch = %2
19+ IF NOT DEFINED arch (
20+ echo defaulting to 'x64-windows`. Invoke %0 with 'x86-windows', 'x64-windows', or 'arm64-windows'
21+ set arch = x64-windows
22+ )
23+
1924 SET inst = %cwd% vcpkg\installed\%arch%
2025
2126 IF [%1 ]== [release] (
Original file line number Diff line number Diff line change @@ -31,6 +31,12 @@ REM ================================================================
3131
3232 SETLOCAL EnableDelayedExpansion
3333
34+ SET arch = %1
35+ IF NOT DEFINED arch (
36+ echo defaulting to 'x64-windows`. Invoke %0 with 'x86-windows', 'x64-windows', or 'arm64-windows'
37+ set arch = x64-windows
38+ )
39+
3440 @ FOR /F " delims=" %% D IN (" %~dp0 " ) DO @ SET cwd = %% ~fD
3541 cd %cwd%
3642
@@ -55,9 +61,8 @@ REM ================================================================
5561 echo Successfully installed %cwd% vcpkg\vcpkg.exe
5662
5763:install_libraries
58- SET arch = x64-windows
5964
60- echo Installing third-party libraries...
65+ echo Installing third-party libraries( %arch% ) ...
6166 FOR %%i IN (zlib expat libiconv openssl libssh2 curl) DO (
6267 cd %cwd% vcpkg
6368 IF NOT EXIST " packages\%%i _%arch% " CALL :sub__install_one %%i
You can’t perform that action at this time.
0 commit comments