Remove annoying circular dependency

This commit is contained in:
William Venner 2022-01-27 19:42:50 +00:00
parent 06a9058442
commit f8554b3402
3 changed files with 1 additions and 47 deletions

43
Cargo.lock generated
View File

@ -107,26 +107,6 @@ dependencies = [
"version_check", "version_check",
] ]
[[package]]
name = "gmod"
version = "12.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a3573d8d390480fc201b868996f348812fda75351ffd12efc140a1df3459a944"
dependencies = [
"cfg_table",
"cstr",
"ctor",
"detour",
"fn_abi",
"fn_has_this",
"fn_type_alias",
"gmod-macros 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static",
"libloading",
"null_fn",
"skidscan",
]
[[package]] [[package]]
name = "gmod" name = "gmod"
version = "14.0.1" version = "14.0.1"
@ -138,8 +118,7 @@ dependencies = [
"fn_abi", "fn_abi",
"fn_has_this", "fn_has_this",
"fn_type_alias", "fn_type_alias",
"gmod-macros 2.0.1", "gmod-macros",
"gmserverplugin",
"lazy_static", "lazy_static",
"libloading", "libloading",
"null_fn", "null_fn",
@ -155,26 +134,6 @@ dependencies = [
"syn", "syn",
] ]
[[package]]
name = "gmod-macros"
version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4f379e64e2b37dc89becb8ac4e1a67211a1a8989b866a71d8365dc16459224a8"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "gmserverplugin"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "671fbd0ef21d6ee8c4b980ec8a814c4f0ca87317bc7efbaa97413741369bb828"
dependencies = [
"gmod 12.0.1",
]
[[package]] [[package]]
name = "kernel32-sys" name = "kernel32-sys"
version = "0.2.2" version = "0.2.2"

View File

@ -12,12 +12,10 @@ categories = ["api-bindings", "external-ffi-bindings", "game-development", "deve
[features] [features]
default = ["hax"] default = ["hax"]
hax = ["ctor", "skidscan", "detour", "fn_type_alias", "fn_abi", "cfg_table", "null_fn", "fn_has_this"] hax = ["ctor", "skidscan", "detour", "fn_type_alias", "fn_abi", "cfg_table", "null_fn", "fn_has_this"]
server-plugin = ["gmserverplugin"]
gmcl = ["gmod-macros/gmcl"] gmcl = ["gmod-macros/gmcl"]
[dependencies] [dependencies]
gmod-macros = { version = "2.0.1", path = "../gmod-macros" } gmod-macros = { version = "2.0.1", path = "../gmod-macros" }
gmserverplugin = { version = "2", optional = true }
libloading = "0" libloading = "0"
cstr = "0" cstr = "0"

View File

@ -24,9 +24,6 @@ mod haxports {
#[cfg(feature = "hax")] #[cfg(feature = "hax")]
pub use haxports::*; pub use haxports::*;
#[cfg(feature = "server-plugin")]
pub use gmserverplugin as serverplugin;
/// Lua interface /// Lua interface
pub mod lua; pub mod lua;