diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2020-11-07 18:16:12 +0100 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2020-11-13 14:42:54 +0100 |
| commit | b71ffd1f09114936e3708bc1f914b2896950922b (patch) | |
| tree | 765e201a57e16f0167e93fbf94d6d5367b0937c4 /Makefile | |
| parent | build: add wintun 0.9 and arm support to makefile (diff) | |
| download | wireguard-windows-b71ffd1f09114936e3708bc1f914b2896950922b.tar.xz wireguard-windows-b71ffd1f09114936e3708bc1f914b2896950922b.zip | |
build: work with llvm-rc and use numbered icons
It's hard to keep these stable between resource compilers, so just use
numbers, and roll with 7 to match rsrc/walk.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -5,8 +5,10 @@ export CGO_LDFLAGS := -Wl,--dynamicbase -Wl,--nxcompat -Wl,--export-all-symbols export GOOS := windows VERSION := $(shell sed -n 's/^\s*Number\s*=\s*"\([0-9.]\+\)"$$/\1/p' version/version.go) +empty := +space := $(empty) $(empty) comma := , -RCFLAGS := -DWIREGUARD_WINDOWS_VERSION_ARRAY=$(subst .,$(comma),$(VERSION)) -DWIREGUARD_WINDOWS_VERSION_STR=$(VERSION) -O coff +RCFLAGS := -DWIREGUARD_VERSION_ARRAY=$(subst $(space),$(comma),$(wordlist 1,4,$(subst .,$(space),$(VERSION)) 0 0 0 0)) -DWIREGUARD_VERSION_STR=$(VERSION) -O coff rwildcard=$(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst *,%,$2),$d)) SOURCE_FILES := $(call rwildcard,,*.go *.c *.h) .deps/goroot/prepared go.mod go.sum @@ -42,7 +44,7 @@ resources_386.syso: $(RESOURCE_FILES) i686-w64-mingw32-windres $(RCFLAGS) -I .deps/wintun/bin/x86 -i $< -o $@ resources_arm.syso: $(RESOURCE_FILES) - arm-w64-mingw32-windres $(RCFLAGS) -I .deps/wintun/bin/arm -i $< -o $@ + armv7-w64-mingw32-windres $(RCFLAGS) -I .deps/wintun/bin/arm -i $< -o $@ amd64/wireguard.exe: export CC := x86_64-w64-mingw32-gcc amd64/wireguard.exe: export GOARCH := amd64 @@ -55,7 +57,7 @@ x86/wireguard.exe: export GOARCH := 386 x86/wireguard.exe: resources_386.syso $(SOURCE_FILES) GOROOT="$(CURDIR)/.deps/goroot" go build $(GOFLAGS) -o $@ -arm/wireguard.exe: export CC := arm-w64-mingw32-gcc +arm/wireguard.exe: export CC := armv7-w64-mingw32-gcc arm/wireguard.exe: export GOARCH := arm arm/wireguard.exe: export GOARM := 7 arm/wireguard.exe: resources_arm.syso $(SOURCE_FILES) |