aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2019-12-26 14:17:29 +0100
committerJason A. Donenfeld <Jason@zx2c4.com>2020-01-08 02:29:25 -0500
commit2e31e0fd0cf2d75839631abd44f50dae47e52a53 (patch)
tree58e59d2f1fdf32008ad849b286a999cd68abf74f
parentversion: bump (diff)
downloadwireguard-windows-2e31e0fd0cf2d75839631abd44f50dae47e52a53.tar.xz
wireguard-windows-2e31e0fd0cf2d75839631abd44f50dae47e52a53.zip
build: use updated tools location
-rw-r--r--build.bat8
1 files changed, 4 insertions, 4 deletions
diff --git a/build.bat b/build.bat
index 5bee6c4..d2b52e4 100644
--- a/build.bat
+++ b/build.bat
@@ -22,7 +22,7 @@ if exist .deps\prepared goto :render
call :download imagemagick.zip https://download.wireguard.com/windows-toolchain/distfiles/ImageMagick-7.0.8-42-portable-Q16-x64.zip 584e069f56456ce7dde40220948ff9568ac810688c892c5dfb7f6db902aa05aa "convert.exe colors.xml delegates.xml" || goto :error
rem Mirror of https://sourceforge.net/projects/ezwinports/files/make-4.2.1-without-guile-w32-bin.zip
call :download make.zip https://download.wireguard.com/windows-toolchain/distfiles/make-4.2.1-without-guile-w32-bin.zip 30641be9602712be76212b99df7209f4f8f518ba764cf564262bc9d6e4047cc7 "--strip-components 1 bin" || goto :error
- call :download wireguard-tools.zip https://git.zx2c4.com/WireGuard/snapshot/WireGuard-0.0.20190905.zip 6683eb4ed83a6b5b18ea4c36276e68457ca4c611e40392685c2e9da562e9c837 "--exclude wg-quick --strip-components 1" || goto :error
+ call :download wireguard-tools.zip https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-1.0.20200102.zip fffee62b8c5520658895d9f94b420fd62204d2f8b223fa683416906600f62517 "--exclude wg-quick --strip-components 1" || goto :error
copy /y NUL prepared > NUL || goto :error
cd .. || goto :error
@@ -74,9 +74,9 @@ if exist .deps\prepared goto :render
go build -ldflags="-H windowsgui -s -w" -tags walk_use_cgo -trimpath -v -o "%~1\wireguard.exe" || exit /b 1
if not exist "%~1\wg.exe" (
echo [+] Building command line tools %1
- del .deps\src\tools\*.exe .deps\src\tools\*.o .deps\src\tools\wincompat\*.o 2> NUL
- make --no-print-directory -C .deps\src\tools PLATFORM=windows CC=%CC% V=1 LDFLAGS=-s RUNSTATEDIR= SYSTEMDUNITDIR= -j%NUMBER_OF_PROCESSORS% || exit /b 1
- move /Y .deps\src\tools\wg.exe "%~1\wg.exe" > NUL || exit /b 1
+ del .deps\src\*.exe .deps\src\*.o .deps\src\wincompat\*.o 2> NUL
+ make --no-print-directory -C .deps\src PLATFORM=windows CC=%CC% V=1 LDFLAGS=-s RUNSTATEDIR= SYSTEMDUNITDIR= -j%NUMBER_OF_PROCESSORS% || exit /b 1
+ move /Y .deps\src\wg.exe "%~1\wg.exe" > NUL || exit /b 1
)
goto :eof