From 0148e6df8877b6d94ae76c509a31a2a82fe67686 Mon Sep 17 00:00:00 2001 From: William Venner Date: Wed, 22 Sep 2021 04:18:34 +0100 Subject: [PATCH] Fix open_library macros on linux32 --- Cargo.lock | 2 +- gmod/Cargo.toml | 2 +- gmod/src/lib.rs | 8 ++++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c603de7..8ecd9fa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -68,7 +68,7 @@ dependencies = [ [[package]] name = "gmod" -version = "2.0.0" +version = "2.0.1" dependencies = [ "cstr", "ctor", diff --git a/gmod/Cargo.toml b/gmod/Cargo.toml index a69eb17..8fa52f1 100644 --- a/gmod/Cargo.toml +++ b/gmod/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "gmod" -version = "2.0.0" +version = "2.0.1" authors = ["William Venner "] edition = "2018" license = "MIT" diff --git a/gmod/src/lib.rs b/gmod/src/lib.rs index c4f33aa..32020f2 100644 --- a/gmod/src/lib.rs +++ b/gmod/src/lib.rs @@ -80,8 +80,12 @@ macro_rules! open_library_srv { .or_else(|_| $crate::open_library_raw!("bin/linux32/lib", $name, ".so")) .or_else(|_| $crate::open_library_raw!("bin/", $name, "_srv.so")) .or_else(|_| $crate::open_library_raw!("bin/lib", $name, "_srv.so")) + .or_else(|_| $crate::open_library_raw!("garrysmod/bin/", $name, "_srv.so")) + .or_else(|_| $crate::open_library_raw!("garrysmod/bin/lib", $name, "_srv.so")) .or_else(|_| $crate::open_library_raw!("bin/", $name, ".so")) .or_else(|_| $crate::open_library_raw!("bin/lib", $name, ".so")) + .or_else(|_| $crate::open_library_raw!("garrysmod/bin/", $name, ".so")) + .or_else(|_| $crate::open_library_raw!("garrysmod/bin/lib", $name, ".so")) } }}; } @@ -119,8 +123,12 @@ macro_rules! open_library { .or_else(|_| $crate::open_library_raw!("bin/linux32/lib", $name, ".so")) .or_else(|_| $crate::open_library_raw!("bin/", $name, ".so")) .or_else(|_| $crate::open_library_raw!("bin/lib", $name, ".so")) + .or_else(|_| $crate::open_library_raw!("garrysmod/bin/", $name, ".so")) + .or_else(|_| $crate::open_library_raw!("garrysmod/bin/lib", $name, ".so")) .or_else(|_| $crate::open_library_raw!("bin/", $name, "_srv.so")) .or_else(|_| $crate::open_library_raw!("bin/lib", $name, "_srv.so")) + .or_else(|_| $crate::open_library_raw!("garrysmod/bin/", $name, "_srv.so")) + .or_else(|_| $crate::open_library_raw!("garrysmod/bin/lib", $name, "_srv.so")) } }}; } \ No newline at end of file