From cf37264d9a73e1fdbac1f410f6d4896147e84268 Mon Sep 17 00:00:00 2001
From: William Venner <william@venner.io>
Date: Thu, 9 Jun 2022 14:53:07 +0100
Subject: [PATCH] New gmod update has some binaries in server root

---
 Cargo.lock      |  2 +-
 gmod/Cargo.toml |  2 +-
 gmod/src/lib.rs | 30 ++++++++++++++++++++----------
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6fd854b..3b8b9ff 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -109,7 +109,7 @@ dependencies = [
 
 [[package]]
 name = "gmod"
-version = "15.0.0"
+version = "15.0.1"
 dependencies = [
  "cfg_table",
  "cstr",
diff --git a/gmod/Cargo.toml b/gmod/Cargo.toml
index c7958b5..01c8875 100644
--- a/gmod/Cargo.toml
+++ b/gmod/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "gmod"
-version = "15.0.0"
+version = "15.0.1"
 authors = ["William Venner <william@venner.io>"]
 edition = "2021"
 license = "MIT"
diff --git a/gmod/src/lib.rs b/gmod/src/lib.rs
index 76871bc..69d6f32 100644
--- a/gmod/src/lib.rs
+++ b/gmod/src/lib.rs
@@ -129,20 +129,23 @@ macro_rules! open_library_srv {
 	($name:literal) => {{
 		#[cfg(all(target_os = "windows", target_pointer_width = "64"))] {
 			$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"))] {
 			$crate::__private__gmod_rs__try_chained_open! {
 				$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"))] {
 			$crate::__private__gmod_rs__try_chained_open! {
 				$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"))] {
@@ -156,7 +159,8 @@ macro_rules! open_library_srv {
 				$crate::open_library_raw!("bin/", $name, ".so"),
 				$crate::open_library_raw!("bin/lib", $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/lib", $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) => {{
 		#[cfg(all(target_os = "windows", target_pointer_width = "64"))] {
 			$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"))] {
 			$crate::__private__gmod_rs__try_chained_open! {
 				$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"))] {
 			$crate::__private__gmod_rs__try_chained_open! {
 				$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"))] {
@@ -218,7 +226,8 @@ macro_rules! open_library {
 				$crate::open_library_raw!("bin/", $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/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/lib", $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)
 			}
 		}
 	}};