From ac0ad62dcc4e36639e280c8160a3b1a0c41899a4 Mon Sep 17 00:00:00 2001
From: Vlatko Kosturjak <kost@linux.hr>
Date: Fri, 10 Nov 2023 08:18:03 +0100
Subject: [PATCH] building fixes

---
 Makefile  | 6 +++---
 README.md | 2 --
 go.mod    | 2 +-
 main.go   | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 2f936a8..328e269 100644
--- a/Makefile
+++ b/Makefile
@@ -28,13 +28,13 @@ dist:
 	mkdir -p dist
 
 gox:
-	CGO_ENABLED=0 gox -osarch="!darwin/386" ldflags="-s -w -X main.Version=$(VERSION) -X main.CommitID=$(GIT_COMMIT)" -output="dist/{{.Dir}}_{{.OS}}_{{.Arch}}"
+	CGO_ENABLED=0 gox -osarch="!darwin/386" -ldflags="-s -w -X main.Version=$(VERSION) -X main.CommitID=$(GIT_COMMIT)" -output="dist/{{.Dir}}_{{.OS}}_{{.Arch}}"
 
 goxwin:
-	CGO_ENABLED=0 gox -osarch="windows/amd64" ldflags="-s -w -X main.Version=$(VERSION) -X main.CommitID=$(GIT_COMMIT)" -output="dist/{{.Dir}}_{{.OS}}_{{.Arch}}"
+	CGO_ENABLED=0 gox -osarch="windows/amd64 windows/386" -ldflags="-s -w -X main.Version=$(VERSION) -X main.CommitID=$(GIT_COMMIT)" -output="dist/{{.Dir}}_{{.OS}}_{{.Arch}}"
 
 dokbuild:
-	docker run -it --rm -v $(PWD):/app golang:alpine /bin/sh -c 'apk add make file git && git config --global --add safe.directory /app && cd /app && make tools && make -B all && make gox && make gowwin'
+	docker run -it --rm -v $(PWD):/app golang:alpine /bin/sh -c 'apk add make file git && git config --global --add safe.directory /app && cd /app && make -B tools && make gox && make goxwin'
 
 draft:
 	ghr -draft v$(VERSION) dist/
diff --git a/README.md b/README.md
index ab7f6a3..4f8310f 100644
--- a/README.md
+++ b/README.md
@@ -84,8 +84,6 @@ Complete list of command line options
     	Delay/sleep time between requests (200ms by default)
   -dnslisten string
     	Where should DNS server listen
-  -envproxy
-    	get proxy information from environment
   -listen string
     	listen port for receiver address:port
   -pass string
diff --git a/go.mod b/go.mod
index f60ee7f..40a5ccc 100644
--- a/go.mod
+++ b/go.mod
@@ -7,6 +7,7 @@ require (
 	github.com/hashicorp/yamux v0.1.1
 	github.com/kost/dnstun v0.0.0-20230511164951-6e7f5656a900
 	github.com/kost/go-ntlmssp v0.0.0-20190601005913-a22bdd33b2a4
+	nhooyr.io/websocket v1.8.10
 )
 
 require (
@@ -22,5 +23,4 @@ require (
 	golang.org/x/sys v0.13.0 // indirect
 	golang.org/x/tools v0.9.1 // indirect
 	google.golang.org/protobuf v1.30.0 // indirect
-	nhooyr.io/websocket v1.8.10 // indirect
 )
diff --git a/main.go b/main.go
index fd82667..48a938f 100644
--- a/main.go
+++ b/main.go
@@ -44,7 +44,7 @@ func main() {
 
 	rect := flag.Int("rect", 30, "reconnection delay")
 	flag.BoolVar(&CurOptions.debug, "debug", false, "display debug info")
-	flag.BoolVar(&CurOptions.envproxy, "envproxy", false, "get proxy information from environment")
+	// flag.BoolVar(&CurOptions.envproxy, "envproxy", false, "get proxy information from environment")
 	flag.BoolVar(&CurOptions.usetls, "tls", false, "use TLS for connection")
 	flag.BoolVar(&CurOptions.usewebsocket, "ws", false, "use websocket for connection")
 	flag.BoolVar(&CurOptions.verify, "verify", false, "verify TLS connection")