Skip to content

Commit

Permalink
building fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
kost committed Nov 10, 2023
1 parent 0503e24 commit ac0ad62
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 7 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand All @@ -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
)
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down

0 comments on commit ac0ad62

Please sign in to comment.