Downgrade to Steamworks 1.50 for February gmod patch

WilliamVenner · Feb 2, 2022 · 7e7cebd · 7e7cebd
1 parent 9338401
commit 7e7cebd
Show file tree

Hide file tree

Showing 6 changed files with 1,030 additions and 1,917 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "gmsv_workshop"
-version = "2.2.0"
+version = "2.2.1"
 edition = "2021"
 authors = ["William Venner <[email protected]>"]
 publish = false

diff --git a/steamworks-rs/src/lib.rs b/steamworks-rs/src/lib.rs
@@ -1,6 +1,7 @@
 #![allow(unused)]
 #![feature(hash_drain_filter)]
 
+/*
 #[macro_export]
 #[cfg(target_pointer_width = "64")]
 macro_rules! sys_ugc {
@@ -24,6 +25,17 @@ macro_rules! sys_ugc {
 macro_rules! sys_gameserver {
 	() => { $crate::sys::SteamAPI_SteamGameServer_v014() }
 }
+*/
+
+#[macro_export]
+macro_rules! sys_ugc {
+	() => { $crate::sys::SteamAPI_SteamGameServerUGC_v014() }
+}
+
+#[macro_export]
+macro_rules! sys_gameserver {
+	() => { $crate::sys::SteamAPI_SteamGameServer_v013() }
+}
 
 #[macro_use]
 extern crate thiserror;

diff --git a/steamworks-rs/steamworks-sys/build.rs b/steamworks-rs/steamworks-sys/build.rs
@@ -10,13 +10,17 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     let out_path = PathBuf::from(env::var("OUT_DIR").unwrap());
 
+	/*
     let sdk_loc = if build_cfg!(target_pointer_width = "32") {
 		"../../lib/steamworks_153a"
 	} else if build_cfg!(target_pointer_width = "64") {
 		"../../lib/steamworks_150"
 	} else {
 		unimplemented!()
 	};
+	*/
+
+    let sdk_loc = "../../lib/steamworks_150";
 
     let sdk_loc = Path::new(&sdk_loc);
     println!("cargo:rerun-if-env-changed=STEAM_SDK_LOCATION");

diff --git a/steamworks-rs/steamworks-sys/src/bindings_linux32.rs b/steamworks-rs/steamworks-sys/src/bindings_linux32.rs