From 2b3de9234c80a5699d4e956dee7b7a63509b3cac Mon Sep 17 00:00:00 2001
From: William Venner <william@venner.io>
Date: Wed, 27 Oct 2021 20:46:13 +0100
Subject: [PATCH] re-export gmserverplugin with new feature flag

---
 Cargo.lock      | 43 ++++++++++++++++++++++++++++++++++++++++++-
 gmod/Cargo.toml |  4 +++-
 gmod/src/lib.rs |  3 +++
 3 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index aa3ddee..9edb8a6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -110,6 +110,8 @@ dependencies = [
 [[package]]
 name = "gmod"
 version = "8.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "715c1eec3ce86b2871086e9577f6e6a68ea1e58a188422826d50d18f3d15d0e4"
 dependencies = [
  "cfg_table",
  "cstr",
@@ -118,7 +120,26 @@ dependencies = [
  "fn_abi",
  "fn_has_this",
  "fn_type_alias",
- "gmod-macros",
+ "gmod-macros 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static",
+ "libloading",
+ "null_fn",
+ "skidscan",
+]
+
+[[package]]
+name = "gmod"
+version = "9.0.0"
+dependencies = [
+ "cfg_table",
+ "cstr",
+ "ctor",
+ "detour",
+ "fn_abi",
+ "fn_has_this",
+ "fn_type_alias",
+ "gmod-macros 1.0.0",
+ "gmserverplugin",
  "lazy_static",
  "libloading",
  "null_fn",
@@ -134,6 +155,26 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "gmod-macros"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b791745998b09a16260e803bb0cca1a641e9b70e2aae94d7a485d34259b29279"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "gmserverplugin"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "481dc5ce867d0ac9c140b3c900e97ff532436045f3d29c8e5d51e8df3b64b336"
+dependencies = [
+ "gmod 8.0.0",
+]
+
 [[package]]
 name = "kernel32-sys"
 version = "0.2.2"
diff --git a/gmod/Cargo.toml b/gmod/Cargo.toml
index 8e6ba9c..6a65c09 100644
--- a/gmod/Cargo.toml
+++ b/gmod/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "gmod"
-version = "8.0.0"
+version = "9.0.0"
 authors = ["William Venner <william@venner.io>"]
 edition = "2018"
 license = "MIT"
@@ -12,9 +12,11 @@ categories = ["api-bindings", "external-ffi-bindings", "game-development", "deve
 [features]
 default = ["hax"]
 hax = ["ctor", "skidscan", "detour", "fn_type_alias", "fn_abi", "cfg_table", "null_fn", "fn_has_this"]
+server-plugin = ["gmserverplugin"]
 
 [dependencies]
 gmod-macros = { version = "1.0.0", path = "../gmod-macros" }
+gmserverplugin = { version = "1", optional = true }
 
 libloading = "0"
 cstr = "0"
diff --git a/gmod/src/lib.rs b/gmod/src/lib.rs
index be702f1..ad2c6bd 100644
--- a/gmod/src/lib.rs
+++ b/gmod/src/lib.rs
@@ -20,6 +20,9 @@ mod haxports {
 #[cfg(feature = "hax")]
 pub use haxports::*;
 
+#[cfg(feature = "server-plugin")]
+pub use gmserverplugin as serverplugin;
+
 /// Lua interface
 pub mod lua;