modeco80
/
gmod-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New gmod update has some binaries in server root

This commit is contained in:
William Venner 2022-06-09 14:53:07 +01:00
parent f541b9bd4c
commit cf37264d9a
3 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -109,7 +109,7 @@ dependencies = [
[[package]] [[package]]
name = "gmod" name = "gmod"
version = "15.0.0" version = "15.0.1"
dependencies = [ dependencies = [
"cfg_table", "cfg_table",
"cstr", "cstr",

2
gmod/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "gmod" name = "gmod"
version = "15.0.0" version = "15.0.1"
authors = ["William Venner <william@venner.io>"] authors = ["William Venner <william@venner.io>"]
edition = "2021" edition = "2021"
license = "MIT" license = "MIT"

30
gmod/src/lib.rs
View File

@ -129,20 +129,23 @@ macro_rules! open_library_srv {
($name:literal) => {{ ($name:literal) => {{
#[cfg(all(target_os = "windows", target_pointer_width = "64"))] { #[cfg(all(target_os = "windows", target_pointer_width = "64"))] {
$crate::__private__gmod_rs__try_chained_open! { $crate::__private__gmod_rs__try_chained_open! {
$crate::open_library_raw!("bin/win64/", $name, ".dll") $crate::open_library_raw!("bin/win64/", $name, ".dll"),
$crate::open_library_raw!($name)
} }
} }
#[cfg(all(target_os = "windows", target_pointer_width = "32"))] { #[cfg(all(target_os = "windows", target_pointer_width = "32"))] {
$crate::__private__gmod_rs__try_chained_open! { $crate::__private__gmod_rs__try_chained_open! {
$crate::open_library_raw!("bin/", $name, ".dll"), $crate::open_library_raw!("bin/", $name, ".dll"),
$crate::open_library_raw!("garrysmod/bin/", $name, ".dll") $crate::open_library_raw!("garrysmod/bin/", $name, ".dll"),
$crate::open_library_raw!($name)
} }
} }
#[cfg(all(target_os = "linux", target_pointer_width = "64"))] { #[cfg(all(target_os = "linux", target_pointer_width = "64"))] {
$crate::__private__gmod_rs__try_chained_open! { $crate::__private__gmod_rs__try_chained_open! {
$crate::open_library_raw!("bin/linux64/", $name, ".so"), $crate::open_library_raw!("bin/linux64/", $name, ".so"),
$crate::open_library_raw!("bin/linux64/lib", $name, ".so") $crate::open_library_raw!("bin/linux64/lib", $name, ".so"),
$crate::open_library_raw!($name)
} }
} }
#[cfg(all(target_os = "linux", target_pointer_width = "32"))] { #[cfg(all(target_os = "linux", target_pointer_width = "32"))] {
@ -156,7 +159,8 @@ macro_rules! open_library_srv {
$crate::open_library_raw!("bin/", $name, ".so"), $crate::open_library_raw!("bin/", $name, ".so"),
$crate::open_library_raw!("bin/lib", $name, ".so"), $crate::open_library_raw!("bin/lib", $name, ".so"),
$crate::open_library_raw!("garrysmod/bin/", $name, ".so"), $crate::open_library_raw!("garrysmod/bin/", $name, ".so"),
$crate::open_library_raw!("garrysmod/bin/lib", $name, ".so") $crate::open_library_raw!("garrysmod/bin/lib", $name, ".so"),
$crate::open_library_raw!($name)
} }
} }
@ -171,7 +175,8 @@ macro_rules! open_library_srv {
$crate::open_library_raw!("bin/", $name, ".dylib"), $crate::open_library_raw!("bin/", $name, ".dylib"),
$crate::open_library_raw!("bin/lib", $name, ".dylib"), $crate::open_library_raw!("bin/lib", $name, ".dylib"),
$crate::open_library_raw!("garrysmod/bin/", $name, ".dylib"), $crate::open_library_raw!("garrysmod/bin/", $name, ".dylib"),
$crate::open_library_raw!("garrysmod/bin/lib", $name, ".dylib") $crate::open_library_raw!("garrysmod/bin/lib", $name, ".dylib"),
$crate::open_library_raw!($name)
} }
} }
}}; }};
@ -191,20 +196,23 @@ macro_rules! open_library {
($name:literal) => {{ ($name:literal) => {{
#[cfg(all(target_os = "windows", target_pointer_width = "64"))] { #[cfg(all(target_os = "windows", target_pointer_width = "64"))] {
$crate::__private__gmod_rs__try_chained_open! { $crate::__private__gmod_rs__try_chained_open! {
$crate::open_library_raw!("bin/win64/", $name, ".dll") $crate::open_library_raw!("bin/win64/", $name, ".dll"),
$crate::open_library_raw!($name)
} }
} }
#[cfg(all(target_os = "windows", target_pointer_width = "32"))] { #[cfg(all(target_os = "windows", target_pointer_width = "32"))] {
$crate::__private__gmod_rs__try_chained_open! { $crate::__private__gmod_rs__try_chained_open! {
$crate::open_library_raw!("bin/", $name, ".dll"), $crate::open_library_raw!("bin/", $name, ".dll"),
$crate::open_library_raw!("garrysmod/bin/", $name, ".dll") $crate::open_library_raw!("garrysmod/bin/", $name, ".dll"),
$crate::open_library_raw!($name)
} }
} }
#[cfg(all(target_os = "linux", target_pointer_width = "64"))] { #[cfg(all(target_os = "linux", target_pointer_width = "64"))] {
$crate::__private__gmod_rs__try_chained_open! { $crate::__private__gmod_rs__try_chained_open! {
$crate::open_library_raw!("bin/linux64/", $name, ".so"), $crate::open_library_raw!("bin/linux64/", $name, ".so"),
$crate::open_library_raw!("bin/linux64/lib", $name, ".so") $crate::open_library_raw!("bin/linux64/lib", $name, ".so"),
$crate::open_library_raw!($name)
} }
} }
#[cfg(all(target_os = "linux", target_pointer_width = "32"))] { #[cfg(all(target_os = "linux", target_pointer_width = "32"))] {
@ -218,7 +226,8 @@ macro_rules! open_library {
$crate::open_library_raw!("bin/", $name, "_srv.so"), $crate::open_library_raw!("bin/", $name, "_srv.so"),
$crate::open_library_raw!("bin/lib", $name, "_srv.so"), $crate::open_library_raw!("bin/lib", $name, "_srv.so"),
$crate::open_library_raw!("garrysmod/bin/", $name, "_srv.so"), $crate::open_library_raw!("garrysmod/bin/", $name, "_srv.so"),
$crate::open_library_raw!("garrysmod/bin/lib", $name, "_srv.so") $crate::open_library_raw!("garrysmod/bin/lib", $name, "_srv.so"),
$crate::open_library_raw!($name)
} }
} }
@ -233,7 +242,8 @@ macro_rules! open_library {
$crate::open_library_raw!("bin/", $name, "_srv.dylib"), $crate::open_library_raw!("bin/", $name, "_srv.dylib"),
$crate::open_library_raw!("bin/lib", $name, "_srv.dylib"), $crate::open_library_raw!("bin/lib", $name, "_srv.dylib"),
$crate::open_library_raw!("garrysmod/bin/", $name, "_srv.dylib"), $crate::open_library_raw!("garrysmod/bin/", $name, "_srv.dylib"),
$crate::open_library_raw!("garrysmod/bin/lib", $name, "_srv.dylib") $crate::open_library_raw!("garrysmod/bin/lib", $name, "_srv.dylib"),
$crate::open_library_raw!($name)
} }
} }
}}; }};