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

better macro hygiene

This commit is contained in:
William Venner 2021-09-19 22:44:35 +01:00
parent bea6748666
commit e47f7409e7
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
gmod/src/lib.rs
View File

@ -40,7 +40,7 @@ pub fn is_x86_64() -> bool {
#[macro_export] #[macro_export]
macro_rules! open_library_raw { macro_rules! open_library_raw {
($($path:literal),+) => { ($($path:literal),+) => {
::gmod::libloading::Library::new(concat!($($path),+)).map(|lib| (lib, concat!($($path),+))) $crate::libloading::Library::new(concat!($($path),+)).map(|lib| (lib, concat!($($path),+)))
} }
} }
@ -61,24 +61,24 @@ macro_rules! open_library_srv {
} }
#[cfg(all(target_os = "windows", target_pointer_width = "64"))] { #[cfg(all(target_os = "windows", target_pointer_width = "64"))] {
::gmod::open_library_raw!("bin/win64/", $name, ".dll") $crate::open_library_raw!("bin/win64/", $name, ".dll")
} }
#[cfg(all(target_os = "windows", target_pointer_width = "32"))] { #[cfg(all(target_os = "windows", target_pointer_width = "32"))] {
::gmod::open_library_raw!("bin/", $name, ".dll") $crate::open_library_raw!("bin/", $name, ".dll")
.or_else(|_| ::gmod::open_library_raw!("garrysmod/bin/", $name, ".dll")) .or_else(|_| $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"))] {
::gmod::open_library_raw!("bin/linux64/", $name, ".so") $crate::open_library_raw!("bin/linux64/", $name, ".so")
.or_else(|_| ::gmod::open_library_raw!("bin/linux64/lib", $name, ".so")) .or_else(|_| $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"))] {
::gmod::open_library_raw!("bin/linux32/", $name, ".so") $crate::open_library_raw!("bin/linux32/", $name, ".so")
.or_else(|_| ::gmod::open_library_raw!("bin/linux32/lib", $name, ".so")) .or_else(|_| $crate::open_library_raw!("bin/linux32/lib", $name, ".so"))
.or_else(|_| ::gmod::open_library_raw!("bin/", $name, "_srv.so")) .or_else(|_| $crate::open_library_raw!("bin/", $name, "_srv.so"))
.or_else(|_| ::gmod::open_library_raw!("bin/lib", $name, "_srv.so")) .or_else(|_| $crate::open_library_raw!("bin/lib", $name, "_srv.so"))
.or_else(|_| ::gmod::open_library_raw!("bin/", $name, ".so")) .or_else(|_| $crate::open_library_raw!("bin/", $name, ".so"))
.or_else(|_| ::gmod::open_library_raw!("bin/lib", $name, ".so")) .or_else(|_| $crate::open_library_raw!("bin/lib", $name, ".so"))
} }
}}; }};
} }
@ -100,24 +100,24 @@ macro_rules! open_library {
} }
#[cfg(all(target_os = "windows", target_pointer_width = "64"))] { #[cfg(all(target_os = "windows", target_pointer_width = "64"))] {
::gmod::open_library_raw!("bin/win64/", $name, ".dll") $crate::open_library_raw!("bin/win64/", $name, ".dll")
} }
#[cfg(all(target_os = "windows", target_pointer_width = "32"))] { #[cfg(all(target_os = "windows", target_pointer_width = "32"))] {
::gmod::open_library_raw!("bin/", $name, ".dll") $crate::open_library_raw!("bin/", $name, ".dll")
.or_else(|_| ::gmod::open_library_raw!("garrysmod/bin/", $name, ".dll")) .or_else(|_| $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"))] {
::gmod::open_library_raw!("bin/linux64/", $name, ".so") $crate::open_library_raw!("bin/linux64/", $name, ".so")
.or_else(|_| ::gmod::open_library_raw!("bin/linux64/lib", $name, ".so")) .or_else(|_| $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"))] {
::gmod::open_library_raw!("bin/linux32/", $name, ".so") $crate::open_library_raw!("bin/linux32/", $name, ".so")
.or_else(|_| ::gmod::open_library_raw!("bin/linux32/lib", $name, ".so")) .or_else(|_| $crate::open_library_raw!("bin/linux32/lib", $name, ".so"))
.or_else(|_| ::gmod::open_library_raw!("bin/", $name, ".so")) .or_else(|_| $crate::open_library_raw!("bin/", $name, ".so"))
.or_else(|_| ::gmod::open_library_raw!("bin/lib", $name, ".so")) .or_else(|_| $crate::open_library_raw!("bin/lib", $name, ".so"))
.or_else(|_| ::gmod::open_library_raw!("bin/", $name, "_srv.so")) .or_else(|_| $crate::open_library_raw!("bin/", $name, "_srv.so"))
.or_else(|_| ::gmod::open_library_raw!("bin/lib", $name, "_srv.so")) .or_else(|_| $crate::open_library_raw!("bin/lib", $name, "_srv.so"))
} }
}}; }};
} }