Improve newish clang/zig support

Author: rtldg

Makefile.toml

@@ -81,8 +81,9 @@ SRCWRTIMER_ROOT_DIR="${CARGO_MAKE_WORKING_DIRECTORY}"
 EXTERNALDIR="${SRCWRTIMER_ROOT_DIR}/_external"
 PACKAGEDIR="${CARGO_MAKE_WORKING_DIRECTORY}/_package"
 
-# Problem with master (as of 2024-09-30):
+# Problem with 0.14.0 (as of 2024-09-30 (and still as of 2025-03-06)):
 #  `zig: error: version '.2.26' in target triple 'x86-unknown-linux-gnu.2.26' is invalid`
+#  (also when using '.2.29')
 #  Probably related: https://github.com/ziglang/zig/issues/16630
 #  Back to "0.13.0" for now...
 ZIGDLVER="0.13.0" ### UPDATE .github/workflows/build-everything.yml whenever this is updated.
@@ -364,6 +365,7 @@ fn do_everything
 	exec git clone "${EXTERNALDIR}/alliedmodders/hl2sdk-proxy-repo" "${EXTERNALDIR}/alliedmodders/hl2sdk-css" -b css
 	cd "${EXTERNALDIR}/alliedmodders/hl2sdk-css/"
 	exec git apply --whitespace=fix ../../../extshared_build_helper/src/c++23-for-hl2sdk-css-1.patch
+	exec git apply --whitespace=fix ../../../extshared_build_helper/src/0001-Fix-non-const-reference-cannot-bind-to-bit-field-err.patch
 end
 do_everything
 '''

extshared/src/extension.cpp

@@ -179,7 +179,7 @@ const char *MyExtension::GetExtensionAuthor()
 
 const char *MyExtension::GetExtensionDateString()
 {
-	return SMEXT_CONF_DATESTRING;
+	return rust_conf_datestring();
 }
 
 const char *MyExtension::GetExtensionDescription()

extshared/src/rust_exports.h

@@ -14,6 +14,7 @@ void rust_sdk_on_all_loaded();
 void rust_on_core_map_start(void* edict_list, int edict_count, int client_max);
 void rust_on_core_map_end();
 const char* rust_conf_name();
+const char* rust_conf_datestring();
 const char* rust_conf_description();
 const char* rust_conf_version();
 const char* rust_conf_author();

extshared/src/smext_conf_boilerplate.rs

@@ -42,6 +42,10 @@ macro_rules! smext_conf_boilerplate_extension_info {
 			concat!(env!("CARGO_PKG_AUTHORS"), "\0").as_ptr()
 		}
 		#[unsafe(no_mangle)]
+		pub extern "C" fn rust_conf_datestring() -> *const u8 {
+			concat!(env!("VERGEN_BUILD_DATE"), "\0").as_ptr()
+		}
+		#[unsafe(no_mangle)]
 		pub extern "C" fn rust_conf_url() -> *const u8 {
 			concat!(
 				env!("CARGO_PKG_HOMEPAGE"),

extshared/src/smsdk_config.h

@@ -11,7 +11,8 @@
 #define SMEXT_CONF_URL			"https://github.com/srcwr/srcwrtimer (THIS ISN'T USED)"
 #define SMEXT_CONF_LOGTAG		"SRCWR (THIS ISN'T USED)"
 #define SMEXT_CONF_LICENSE		"GPL-3.0-or-later (THIS ISN'T USED)"
-#define SMEXT_CONF_DATESTRING	__DATE__
+//#define SMEXT_CONF_DATESTRING	__DATE__
+#define SMEXT_CONF_DATESTRING	"UNKNOWN (THIS ISN'T USED)"
 
 #ifndef SOURCE_ENGINE
 #define META_NO_HL2SDK

extshared_build_helper/src/0001-Fix-non-const-reference-cannot-bind-to-bit-field-err.patch

@@ -0,0 +1,51 @@
+From f3db078d94224f4bebd9c7a8615a277e55b92efe Mon Sep 17 00:00:00 2001
+From: rtldg <[email protected]>
+Date: Thu, 6 Mar 2025 08:14:39 +0000
+Subject: [PATCH] Fix 'non-const reference cannot bind to bit-field' error with
+ newer clang versions
+
+This specifically shows up when trying to use zig 0.14.0 (llvm 19.1.7) to cross-compile to Linux.
+
+  In file included from H:\code\srcwr\srcwrtimer/_external/alliedmodders/sourcemod/public/CDetour/detours.cpp:1:
+  In file included from H:\code\srcwr\srcwrtimer/_external/alliedmodders/sourcemod/public/CDetour/detours.h:36:
+  In file included from H:\code\srcwr\srcwrtimer/_external/alliedmodders/sourcemod/public/smsdk_ext.h:100:
+  In file included from H:\code\srcwr\srcwrtimer/_external/alliedmodders/mmsource/core/ISmmPlugin.h:39:
+  In file included from H:\code\srcwr\srcwrtimer/_external/alliedmodders/mmsource/core/ISmmAPI.h:47:
+  In file included from H:\code\srcwr\srcwrtimer/_external/alliedmodders/hl2sdk-css/public/eiface.h:16:
+  In file included from H:\code\srcwr\srcwrtimer/_external/alliedmodders/hl2sdk-css/public/tier1/convar.h:21:
+  In file included from H:\code\srcwr\srcwrtimer/_external/alliedmodders/hl2sdk-css/public/tier1/utlvector.h:25:
+  H:\code\srcwr\srcwrtimer/_external/alliedmodders/hl2sdk-css/public/tier1/utlblockmemory.h:141:10: error: non-const reference cannot bind to bit-field 'm_nIndexShift'
+    141 |         V_swap( m_nIndexShift, mem.m_nIndexShift );
+        |                 ^~~~~~~~~~~~~
+  H:\code\srcwr\srcwrtimer/_external/alliedmodders/hl2sdk-css/public/tier1/utlblockmemory.h:111:6: note: bit-field is declared here
+    111 |         int m_nIndexShift : 5;
+        |             ^
+  H:\code\srcwr\srcwrtimer/_external/alliedmodders/hl2sdk-css/public/mathlib/mathlib.h:717:29: note: passing argument to parameter 'x' here
+    717 | FORCEINLINE void V_swap( T& x, T& y )
+        |                             ^                           ^
+---
+ public/tier1/utlblockmemory.h | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/public/tier1/utlblockmemory.h b/public/tier1/utlblockmemory.h
+index 8d86c59e..4782e235 100644
+--- a/public/tier1/utlblockmemory.h
++++ b/public/tier1/utlblockmemory.h
+@@ -137,8 +137,12 @@ void CUtlBlockMemory<T,I>::Swap( CUtlBlockMemory< T, I > &mem )
+ {
+ 	V_swap( m_pMemory, mem.m_pMemory );
+ 	V_swap( m_nBlocks, mem.m_nBlocks );
+-	V_swap( m_nIndexMask, mem.m_nIndexMask );
+-	V_swap( m_nIndexShift, mem.m_nIndexShift );
++	int tmp = m_nIndexMask;
++	m_nIndexMask = mem.m_nIndexMask;
++	mem.m_nIndexMask = tmp;
++	tmp = m_nIndexShift;
++	m_nIndexShift = mem.m_nIndexShift;
++	mem.m_nIndexShift = tmp;
+ }
+ 
+ 
+-- 
+2.47.1.windows.1
+