From 12395d994ce1a83b8f3feb8b95c8c610b1f76890 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Sun, 3 Mar 2019 04:13:43 +0100 Subject: tunnel: do not rely on submodule --- Makefile | 29 +++++------------------------ 1 file changed, 5 insertions(+), 24 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index ec369b65..f83a18cd 100644 --- a/Makefile +++ b/Makefile @@ -3,35 +3,16 @@ CFLAGS += -Wall -std=gnu11 all: wireguard.exe -BUILDDIR := .tmp -rwildcard=$(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst *,%,$2),$d)) -DOWNSTREAM_FILES := $(filter-out %/.tmp wireguard-go/%,$(call rwildcard,,*.go *.c *.h)) go.mod -UPSTREAM_FILES := $(filter-out $(addprefix %/,$(DOWNSTREAM_FILES)) %/.tmp %/main_windows.go,$(call rwildcard,wireguard-go/,*.go)) +resources.syso: ui/icon/icon.ico ui/manifest.xml go.mod + go run github.com/akavel/rsrc -manifest ui/manifest.xml -ico ui/icon/icon.ico -arch amd64 -o resources.syso -define copy-src-to-build -$(BUILDDIR)/$(3)/$(patsubst $(1)%,%,$(2)): $(2) - @mkdir -vp "$$(dir $$@)" - @cp -vp "$$<" "$$@" - @$$(if $(3),sed -i 's:golang.zx2c4.com/wireguard:golang.zx2c4.com/wireguard/windows/$(3):;s:package main:package $(3):' "$$@",) -$(BUILDDIR)/.prepared: $(BUILDDIR)/$(3)/$(patsubst $(1)%,%,$(2)) -endef - -$(foreach FILE,$(UPSTREAM_FILES),$(eval $(call copy-src-to-build,wireguard-go/,$(FILE),service))) -$(foreach FILE,$(DOWNSTREAM_FILES),$(eval $(call copy-src-to-build,,$(FILE)))) - -$(BUILDDIR)/.prepared: - touch "$@" - -$(BUILDDIR)/resources.syso: ui/icon/icon.ico ui/manifest.xml $(BUILDDIR)/go.mod - cd "$(BUILDDIR)" && go run github.com/akavel/rsrc -manifest ../ui/manifest.xml -ico ../ui/icon/icon.ico -arch amd64 -o resources.syso - -wireguard.exe: $(BUILDDIR)/.prepared $(BUILDDIR)/resources.syso - cd "$(BUILDDIR)" && CC=x86_64-w64-mingw32-gcc CGO_ENABLED=1 GOOS=windows GOARCH=amd64 go build -ldflags="-H windowsgui" -o ../$@ +wireguard.exe: resources.syso + CC=x86_64-w64-mingw32-gcc CGO_ENABLED=1 GOOS=windows GOARCH=amd64 go build -ldflags="-H windowsgui" -o $@ run: wireguard.exe wine wireguard.exe clean: - rm -rf "$(BUILDDIR)" wireguard.exe + rm -rf resources.syso wireguard.exe .PHONY: run clean all -- cgit v1.2.3-59-g8ed1b