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

Fix macro related build errors

This commit is contained in:
William Venner 2022-01-27 19:41:24 +00:00
parent 39ca92216b
commit 06a9058442
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -129,7 +129,7 @@ dependencies = [
[[package]] [[package]]
name = "gmod" name = "gmod"
version = "14.0.0" version = "14.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 = "14.0.0" version = "14.0.1"
authors = ["William Venner <william@venner.io>"] authors = ["William Venner <william@venner.io>"]
edition = "2021" edition = "2021"
license = "MIT" license = "MIT"

8
gmod/src/lib.rs
View File

@ -152,7 +152,7 @@ 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")
} }
} }
}}; }};
@ -182,14 +182,14 @@ macro_rules! open_library {
#[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")
} }
} }
#[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")
} }
} }
#[cfg(all(target_os = "linux", target_pointer_width = "32"))] { #[cfg(all(target_os = "linux", target_pointer_width = "32"))] {
@ -203,7 +203,7 @@ 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")
} }
} }
}}; }};