update

.cargo/config.toml

@@ -0,0 +1,8 @@
+[target.x86_64-unknown-linux-gnu]
+rustflags = ["-C", "target-feature=+crt-static"]
+
+[target.aarch64-unknown-linux-gnu]
+rustflags = ["-C", "target-feature=+crt-static"]
+
+[target.riscv64gc-unknown-linux-gnu]
+rustflags = ["-C", "target-feature=+crt-static"]

.gitignore

@@ -12,10 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-/cs/build
-/cs/release
-/cs/dep/_msquic/out
-/cs/dep/_google-webrtc/src/out
+/libcs/build
+/libcs/release
+/libcs/dep/_msquic/out
+/libcs/dep/_google-webrtc/src/out
 /target/
 .dockerignore
 .DS_Store

Cargo.toml

@@ -0,0 +1,14 @@
+[workspace]
+members = ["bin"]
+resolver = "2"
+
+[workspace.package]
+authors = ["Zhiyi Weng"]
+version = "2.1.6"
+edition = "2021"
+description = "Fast WebSocket(s)/HTTP(s)/TCP relay proxy with WebRTC P2P supports."
+
+[patch.crates-io]
+webrtc = { git = "https://github.com/vyloy/webrtc.git", branch = "master" }
+rcgen = { git = "https://github.com/vyloy/rcgen.git", branch = "main" }
+x509-parser = { git = "https://github.com/vyloy/x509-parser.git", branch = "master" }

Makefile

@@ -1,13 +1,13 @@
 linux:
-	cd ./cs && TARGET=aarch64-linux-gnu GOOS=linux GOARCH=arm64 make release_lib
+	cd ./libcs && TARGET=aarch64-linux-gnu GOOS=linux GOARCH=arm64 make release_lib
 	cargo build --target aarch64-unknown-linux-gnu -r
-	cd ./cs && TARGET=x86_64-linux-gnu GOOS=linux GOARCH=amd64 make release_lib
-	cargo build --target x86_64-unknown-linux-gnu -r
-	cd ./cs && TARGET=riscv64-linux-gnu GOOS=linux GOARCH=riscv64 make release_lib
-	cargo build --target riscv64gc-unknown-linux-gnu -r
+	#cd ./libcs && TARGET=x86_64-linux-gnu GOOS=linux GOARCH=amd64 make release_lib
+	#cargo build --target x86_64-unknown-linux-gnu -r
+	#cd ./libcs && TARGET=riscv64-linux-gnu GOOS=linux GOARCH=riscv64 make release_lib
+#	cargo build --target riscv64gc-unknown-linux-gnu -r
 
 mac:
-	cd ./cs &&  TARGET=aarch64-apple-darwin GOOS=darwin GOARCH=arm64 arch -arch arm64 make release_lib
+	cd ./libcs &&  TARGET=aarch64-apple-darwin GOOS=darwin GOARCH=arm64 arch -arch arm64 make release_lib
 	cargo build --target aarch64-apple-darwin -r
-	cd ./cs && TARGET=x86_64-apple-darwin GOOS=darwin GOARCH=amd64 arch -arch x86_64 make release_lib
-	cargo build --target x86_64-apple-darwin -r
+	#cd ./libcs && TARGET=x86_64-apple-darwin GOOS=darwin GOARCH=amd64 arch -arch x86_64 make release_lib
+	#cargo build --target x86_64-apple-darwin -r

bin/Cargo.toml

@@ -1,7 +1,9 @@
 [package]
 name = "gt"
-version = "2.1.6"
-edition = "2021"
+version.workspace = true
+edition.workspace = true
+authors.workspace = true
+description.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -21,8 +23,3 @@ url = "2.5.0"
 webrtc = "0.9.0"
 serde_yaml = "0.9.30"
 notify = { version = "6.1.1", default-features = false, features = ["macos_kqueue"] }
-
-[patch.crates-io]
-webrtc = { git = "https://github.com/vyloy/webrtc.git", branch = "master" }
-rcgen = { git = "https://github.com/vyloy/rcgen.git", branch = "main" }
-x509-parser = { git = "https://github.com/vyloy/x509-parser.git", branch = "master" }