Merge https://github.com/TheSuperHackers/GeneralsGameCode into develop

Author: x64-dev

Core/CMakeLists.txt

@@ -16,9 +16,9 @@ target_link_libraries(corei_always INTERFACE
 
 # Do we want to build extra SDK stuff or just the game binary?
 option(RTS_BUILD_CORE_TOOLS "Build core tools" ON)
-add_feature_info(CoreTools GENZH_BUILD_ZEROHOUR_TOOLS "Build Core Mod Tools")
+add_feature_info(CoreTools RTS_BUILD_CORE_TOOLS "Build Core Mod Tools")
 option(RTS_BUILD_CORE_EXTRAS "Build core extra tools/tests" OFF)
-add_feature_info(CoreExtras GENZH_BUILD_ZEROHOUR_EXTRAS "Build Core Extra Tools/Tests")
+add_feature_info(CoreExtras RTS_BUILD_CORE_EXTRAS "Build Core Extra Tools/Tests")
 
 # Set where the build results will end up
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})

Core/Libraries/Include/Lib/BaseTypeCore.h

@@ -37,6 +37,7 @@
 // TheSuperHackers @compile feliwir 07/04/2025 Adds utility macros for cross-platform compatibility
 #include <Utility/compat.h>
 #include <Utility/CppMacros.h>
+#include <Utility/stdint_adapter.h>
 
 /*
 **	Turn off some unneeded warnings.
@@ -124,22 +125,17 @@
 //--------------------------------------------------------------------
 // Fundamental type definitions
 //--------------------------------------------------------------------
-typedef float							Real;							// 4 bytes 
-typedef int								Int;							// 4 bytes 
-typedef unsigned int			UnsignedInt;	  	// 4 bytes 
-typedef unsigned short		UnsignedShort;		// 2 bytes 
-typedef short							Short;					  // 2 bytes 
-typedef unsigned char			UnsignedByte;			// 1 byte		USED TO BE "Byte"
-typedef char							Byte;							// 1 byte		USED TO BE "SignedByte"
-typedef char							Char;							// 1 byte of text
-typedef bool							Bool;							// 
+typedef float						Real;					// 4 bytes 
+typedef int32_t						Int;					// 4 bytes 
+typedef uint32_t	                UnsignedInt;	  	    // 4 bytes 
+typedef uint16_t	                UnsignedShort;		    // 2 bytes 
+typedef int16_t						Short;					// 2 bytes 
+typedef unsigned char	            UnsignedByte;			// 1 byte		USED TO BE "Byte"
+typedef char						Byte;					// 1 byte		USED TO BE "SignedByte"
+typedef char						Char;					// 1 byte of text
+typedef bool						Bool;					// 
 // note, the types below should use "long long", but MSVC doesn't support it yet
-#ifdef _MSC_VER
-typedef __int64						Int64;							// 8 bytes 
-typedef unsigned __int64	UnsignedInt64;	  	// 8 bytes 
-#else
-typedef long long						Int64;							// 8 bytes 
-typedef unsigned long long	UnsignedInt64;	  	// 8 bytes 
-#endif
+typedef int64_t						Int64;						// 8 bytes
+typedef uint64_t					UnsignedInt64;	  	        // 8 bytes
 
 #endif // _BASE_TYPE_CORE_H_

Core/Libraries/Source/WWVegas/WWDebug/wwdebug.cpp

@@ -43,7 +43,6 @@
 
 
 #include "wwdebug.h"
-#include <windows.h>
 //#include "win.h" can use this if allowed to see wwlib
 #include <stdlib.h>
 #include <stdarg.h>
@@ -53,6 +52,11 @@
 #include <signal.h>
 #include "Except.h"
 
+#ifdef _WIN32
+#include <windows.h>
+#else
+#include <errno.h>
+#endif
 
 static PrintFunc			_CurMessageHandler = NULL;
 static AssertPrintFunc	_CurAssertHandler = NULL;
@@ -79,7 +83,11 @@ void Convert_System_Error_To_String(int id, char* buffer, int buf_len)
 
 int Get_Last_System_Error()
 {
+#ifdef _WIN32
 	return GetLastError();
+#else
+	return errno;
+#endif
 }
 
 /***********************************************************************************************

Core/Libraries/Source/WWVegas/WWDebug/wwmemlog.cpp

@@ -43,7 +43,6 @@
 #include "wwdebug.h"
 #include "Vector.H"
 #include "FastAllocator.h"
-#include <windows.h>
 
 #define USE_FAST_ALLOCATOR
 
@@ -70,7 +69,8 @@
 ** Enable one of the following #defines to specify which thread-sychronization
 ** method to use.
 */
-#ifndef _UNIX
+#ifdef _WIN32
+#include <windows.h>
 #define MEMLOG_USE_MUTEX					0
 #define MEMLOG_USE_CRITICALSECTION		1
 #define MEMLOG_USE_FASTCRITICALSECTION	0
@@ -289,6 +289,10 @@ WWINLINE void * Get_Mem_Log_Mutex(void)
 	return _MemLogCriticalSectionHandle;
 
 #endif
+
+#if DISABLE_MEMLOG
+	return NULL;
+#endif
 }
 
 WWINLINE void Lock_Mem_Log_Mutex(void)

Core/Libraries/Source/WWVegas/WWDebug/wwprofile.cpp

@@ -53,7 +53,6 @@
 #include "wwprofile.h"
 #include "FastAllocator.h"
 #include "wwdebug.h"
-#include <windows.h>
 //#include "systimer.h"
 #include "systimer.h"
 #include "RAWFILE.H"

Core/Libraries/Source/WWVegas/WWLib/Vector.H

@@ -317,7 +317,7 @@ template<class T>
 inline int VectorClass<T>::ID(T const * ptr)
 {
 	if (!IsValid) return(0);
-	return(((unsigned long)ptr - (unsigned long)&(*this)[0]) / sizeof(T));
+	return(((uintptr_t)ptr - (uintptr_t)&(*this)[0]) / sizeof(T));
 }
 
 

Core/Libraries/Source/WWVegas/WWLib/always.h

@@ -45,6 +45,7 @@
 
 // TheSuperHackers @compile feliwir 17/04/2025 include utility macros for cross-platform compatibility
 #include <Utility/compat.h>
+#include <Utility/stdint_adapter.h>
 
 // Disable warning about exception handling not being enabled. It's used as part of STL - in a part of STL we don't use.
 #pragma warning(disable : 4530)

Core/Libraries/Source/WWVegas/WWLib/wwstring.cpp

@@ -101,7 +101,7 @@ StringClass::Get_String (int length, bool is_temp)
 				//
 				//	Grab this unused buffer for our string
 				//
-				unsigned long temp_string=reinterpret_cast<unsigned long>(m_TempStrings);
+				uintptr_t temp_string=reinterpret_cast<uintptr_t>(m_TempStrings);
 				temp_string+=MAX_TEMP_BYTES*MAX_TEMP_STRING;
 				temp_string&=~(MAX_TEMP_BYTES*MAX_TEMP_STRING-1);
 				temp_string+=index*MAX_TEMP_BYTES;
@@ -196,8 +196,8 @@ StringClass::Free_String (void)
 {
 	if (m_Buffer != m_EmptyString) {
 
-		unsigned long buffer_base=reinterpret_cast<unsigned long>(m_Buffer-sizeof (StringClass::_HEADER));
-		unsigned long temp_base=reinterpret_cast<unsigned long>(m_TempStrings+MAX_TEMP_BYTES*MAX_TEMP_STRING);
+		uintptr_t buffer_base=reinterpret_cast<uintptr_t>(m_Buffer-sizeof (StringClass::_HEADER));
+		uintptr_t temp_base=reinterpret_cast<uintptr_t>(m_TempStrings+MAX_TEMP_BYTES*MAX_TEMP_STRING);
 
 		if ((buffer_base>>11)==(temp_base>>11)) {
 			m_Buffer[0] = 0;