From 043ab62587ec3c0b914bfabc2bda38a1696d43a0 Mon Sep 17 00:00:00 2001
From: fatedier <fatedier@gmail.com>
Date: Wed, 4 Jan 2017 22:56:08 +0800
Subject: [PATCH] build: update Makefile.cross-compiles

---
 Makefile.cross-compiles     | 22 +++++++++++++++-------
 src/models/client/client.go |  2 +-
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/Makefile.cross-compiles b/Makefile.cross-compiles
index 5f4daf6..71d634e 100644
--- a/Makefile.cross-compiles
+++ b/Makefile.cross-compiles
@@ -3,15 +3,23 @@ export GO15VENDOREXPERIMENT := 1
 
 all: build
 
-build: gox app more
-
-gox:
-	go get github.com/mitchellh/gox
+build: app
 
 app:
-	gox -osarch "darwin/386 darwin/amd64 linux/386 linux/amd64 linux/arm windows/386 windows/amd64" ./src/...
-
-more:
+	env GOOS=darwin GOARCH=386 go build -o ./frpc_darwin_386 ./src/cmd/frpc
+	env GOOS=darwin GOARCH=386 go build -o ./frps_darwin_386 ./src/cmd/frps
+	env GOOS=darwin GOARCH=amd64 go build -o ./frpc_darwin_amd64 ./src/cmd/frpc
+	env GOOS=darwin GOARCH=amd64 go build -o ./frps_darwin_amd64 ./src/cmd/frps
+	env GOOS=linux GOARCH=386 go build -o ./frpc_linux_386 ./src/cmd/frpc
+	env GOOS=linux GOARCH=386 go build -o ./frps_linux_386 ./src/cmd/frps
+	env GOOS=linux GOARCH=amd64 go build -o ./frpc_linux_amd64 ./src/cmd/frpc
+	env GOOS=linux GOARCH=amd64 go build -o ./frps_linux_amd64 ./src/cmd/frps
+	env GOOS=linux GOARCH=arm go build -o ./frpc_linux_arm ./src/cmd/frpc
+	env GOOS=linux GOARCH=arm go build -o ./frps_linux_arm ./src/cmd/frps
+	env GOOS=windows GOARCH=386 go build -o ./frpc_windows_386.exe ./src/cmd/frpc
+	env GOOS=windows GOARCH=386 go build -o ./frps_windows_386.exe ./src/cmd/frps
+	env GOOS=windows GOARCH=amd64 go build -o ./frpc_windows_amd64.exe ./src/cmd/frpc
+	env GOOS=windows GOARCH=amd64 go build -o ./frps_windows_amd64.exe ./src/cmd/frps
 	env GOOS=linux GOARCH=mips64 go build -o ./frpc_linux_mips64 ./src/cmd/frpc
 	env GOOS=linux GOARCH=mips64 go build -o ./frps_linux_mips64 ./src/cmd/frps
 	env GOOS=linux GOARCH=mips64le go build -o ./frpc_linux_mips64le ./src/cmd/frpc
diff --git a/src/models/client/client.go b/src/models/client/client.go
index f5fe7d7..2e9dbf9 100644
--- a/src/models/client/client.go
+++ b/src/models/client/client.go
@@ -59,7 +59,7 @@ func (pc *ProxyClient) StartUdpTunnelOnce(addr string, port int64) {
 					time.Sleep(10 * time.Second)
 					continue
 				}
-				log.Info("ProxyName [%s], udp tunnel reconnect to server [%s:%d] success", pc.Name, addr, port)
+				log.Info("ProxyName [%s], udp tunnel connect to server [%s:%d] success", pc.Name, addr, port)
 
 				nowTime := time.Now().Unix()
 				req := &msg.ControlReq{