Merge pull request #26 from ACBob/main

Fix compiling on Linux
Pinsplash · Apr 20, 2023 · 8ba6e4c · 8ba6e4c
2 parents bdaa596 + d62d802
commit 8ba6e4c
Show file tree

Hide file tree

Showing 13 changed files with 216 additions and 206 deletions.
diff --git a/sp/src/creategameprojects b/sp/src/creategameprojects
diff --git a/sp/src/devtools/bin/linux/ccache b/sp/src/devtools/bin/linux/ccache
diff --git a/sp/src/devtools/bin/vpc b/sp/src/devtools/bin/vpc
diff --git a/sp/src/devtools/bin/vpc_linux b/sp/src/devtools/bin/vpc_linux
diff --git a/sp/src/devtools/gendbg.sh b/sp/src/devtools/gendbg.sh
diff --git a/sp/src/devtools/makefile_base_posix.mak b/sp/src/devtools/makefile_base_posix.mak
diff --git a/sp/src/game/server/hl2/hl2_player.cpp b/sp/src/game/server/hl2/hl2_player.cpp
@@ -6,7 +6,12 @@
 /*
 */
 
+// ACBOB: HACK! Commenting this include works on Linux. It does not work on windows.
+// Preprocessor time!
+#ifdef _WIN32
 #include "cbase.h"
+#endif
+
 #include <string>
 #include <cmath>
 #include "hl2_player.h"

diff --git a/sp/src/game/server/hl2/hl2_player.h b/sp/src/game/server/hl2/hl2_player.h
@@ -34,6 +34,8 @@ enum HL2PlayerPhysFlag_e
 class IPhysicsPlayerController;
 class CLogicPlayerProxy;
 
+class CChaosEffect;
+
 struct commandgoal_t
 {
 	Vector		m_vecGoalLocation;

diff --git a/sp/src/game/server/triggers.cpp b/sp/src/game/server/triggers.cpp
@@ -40,6 +40,8 @@
 // memdbgon must be the last include file in a .cpp file!!!
 #include "tier0/memdbgon.h"
 
+bool g_bEndSolidTriggers = false;
+
 #define DEBUG_TRANSITIONS_VERBOSE	2
 ConVar g_debug_transitions( "g_debug_transitions", "0", FCVAR_NONE, "Set to 1 and restart the map to be warned if the map has no trigger_transition volumes. Set to 2 to see a dump of all entities & associated results during a transition." );
 

diff --git a/sp/src/game/server/triggers.h b/sp/src/game/server/triggers.h
@@ -14,7 +14,10 @@
 #include "basetoggle.h"
 #include "entityoutput.h"
 #include "EntityParticleTrail.h"
-bool g_bEndSolidTriggers = false;
+
+// ACBOB: This is global scope in a header, so should be externed...
+extern bool g_bEndSolidTriggers;
+
 //
 // Spawnflags
 //

diff --git a/sp/src/public/tier1/utlblockmemory.h b/sp/src/public/tier1/utlblockmemory.h
@@ -135,10 +135,13 @@ CUtlBlockMemory<T,I>::~CUtlBlockMemory()
 template< class T, class I >
 void CUtlBlockMemory<T,I>::Swap( CUtlBlockMemory< T, I > &mem )
 {
-	swap( m_pMemory, mem.m_pMemory );
-	swap( m_nBlocks, mem.m_nBlocks );
-	swap( m_nIndexMask, mem.m_nIndexMask );
-	swap( m_nIndexShift, mem.m_nIndexShift );
+	// ACBOB: specifying this-> silences a LOT of warnings
+	//        And I usually wouldn't care, but it makes the output unreadable and unusable junk.
+	// SO https://stackoverflow.com/a/15531940
+	this->swap( m_pMemory, mem.m_pMemory );
+	this->swap( m_nBlocks, mem.m_nBlocks );
+	this->swap( m_nIndexMask, mem.m_nIndexMask );
+	this->swap( m_nIndexShift, mem.m_nIndexShift );
 }
 
 

diff --git a/sp/src/tier1/math_proxy.cpp b/sp/src/tier1/math_proxy.cpp
@@ -0,0 +1,50 @@
+/**
+ *
+ * math_proxy.cpp - Implements certain unresolved symbols and points them to their proper endpoints
+ *
+ */ 
+#include <math.h>
+
+#if __GNUC__ > 5
+
+extern "C" float __powf_finite(float x, float y)
+{
+	return powf(x, y);
+}
+
+extern "C" double __atan2_finite(double y, double x)
+{
+	return atan2(y, x);
+}
+
+extern "C" float __logf_finite(float f)
+{
+	return logf(f);
+}
+
+extern "C" float __acosf_finite(float f)
+{
+	return acosf(f);
+}
+
+extern "C" double __exp_finite(double f)
+{
+	return exp(f);
+}
+
+extern "C" float __expf_finite(float f)
+{
+	return expf(f);
+}
+
+extern "C" double __pow_finite(double x, double y)
+{
+	return pow(x, y);
+}
+
+extern "C" double __log_finite(double f)
+{
+	return log(f);
+}
+
+#endif
diff --git a/sp/src/tier1/tier1.vpc b/sp/src/tier1/tier1.vpc
@@ -47,6 +47,7 @@ $Project "tier1"
 		$File	"memstack.cpp"
 		$File	"NetAdr.cpp"
 		$File	"splitstring.cpp"
+		$File	"math_proxy.cpp" [$POSIX]
 		$File	"processor_detect.cpp" [$WINDOWS||$X360]
 		{
 			$Configuration