Merge branch 'main' into headless_sh

Author: helmutbuhler

Core/Libraries/Source/Compression/Compression.h

@@ -32,7 +32,6 @@ enum CompressionType
 	COMPRESSION_MIN = 0,
 	COMPRESSION_NONE = COMPRESSION_MIN,
 	COMPRESSION_REFPACK,
-	COMPRESSION_MAX = COMPRESSION_REFPACK,
 	COMPRESSION_NOXLZH,
 	COMPRESSION_ZLIB1,
 	COMPRESSION_ZLIB2,
@@ -45,6 +44,7 @@ enum CompressionType
 	COMPRESSION_ZLIB9,
 	COMPRESSION_BTREE,
 	COMPRESSION_HUFF,
+	COMPRESSION_MAX = COMPRESSION_HUFF,
 };
 
 class CompressionManager

Core/Libraries/Source/Compression/CompressionManager.cpp

@@ -45,7 +45,6 @@ const char *CompressionManager::getCompressionNameByType( CompressionType compTy
 	static const char *s_compressionNames[COMPRESSION_MAX+1] = {
 		"No compression",
 		"RefPack",
-		/*
 		"LZHL",
 		"ZLib 1 (fast)",
 		"ZLib 2",
@@ -58,7 +57,6 @@ const char *CompressionManager::getCompressionNameByType( CompressionType compTy
 		"ZLib 9 (slow)",
 		"BTree",
 		"Huff",
-		*/
 	};
 	return s_compressionNames[compType];
 }
@@ -69,7 +67,6 @@ const char *CompressionManager::getDecompressionNameByType( CompressionType comp
 	static const char *s_decompressionNames[COMPRESSION_MAX+1] = {
 		"d_None",
 		"d_RefPack",
-		/*
 		"d_NoxLZW",
 		"d_ZLib1",
 		"d_ZLib2",
@@ -82,7 +79,6 @@ const char *CompressionManager::getDecompressionNameByType( CompressionType comp
 		"d_ZLib9",
 		"d_BTree",
 		"d_Huff",
-		*/
 	};
 	return s_decompressionNames[compType];
 }

Core/Libraries/Source/WWVegas/CMakeLists.txt

@@ -18,14 +18,16 @@ target_include_directories(core_wwcommon INTERFACE
     .
     WWDebug
     WWLib
+    WWMath
+    WWSaveLoad
 )
 
 # add_subdirectory(WWAudio)
 add_subdirectory(WWDebug)
 add_subdirectory(WWLib)
-# add_subdirectory(WWMath)
+add_subdirectory(WWMath)
 # add_subdirectory(Wwutil)
-# add_subdirectory(WWSaveLoad)
+add_subdirectory(WWSaveLoad)
 add_subdirectory(WWStub)
 # add_subdirectory(WW3D2)
 # add_subdirectory(WWDownload)
@@ -40,10 +42,9 @@ target_include_directories(core_wwvegas INTERFACE
     WWDebug
     #WWDownload
     WWLib
-    #WWMath
-    #WWSaveLoad
+    WWMath
+    WWSaveLoad
     #Wwutil
-    #wwshade
 )
 
 target_link_libraries(core_wwvegas INTERFACE
@@ -52,7 +53,7 @@ target_link_libraries(core_wwvegas INTERFACE
     # core_wwdownload
     core_wwlib
     # core_wwmath
-    # core_wwsaveload
+    core_wwsaveload
     # core_wwshade
     # core_wwutil
 )

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/CMakeLists.txt

@@ -71,8 +71,6 @@ set(WWLIB_SRC
     #md5.h
     mempool.h
     mmsys.h
-    mpu.cpp
-    MPU.H
     multilist.cpp
     multilist.h
     mutex.cpp
@@ -91,8 +89,6 @@ set(WWLIB_SRC
     RANDOM.H
     rawfile.cpp
     RAWFILE.H
-    rcfile.cpp
-    rcfile.h
     readline.cpp
     readline.h
     realcrc.cpp
@@ -102,8 +98,6 @@ set(WWLIB_SRC
     refcount.h
     #regexpr.cpp
     #regexpr.h
-    registry.cpp
-    registry.h
     #search.h
     sharebuf.h
     Signaler.h
@@ -134,14 +128,10 @@ set(WWLIB_SRC
     uarray.h
     vector.cpp
     Vector.H
-    verchk.cpp
-    verchk.h
     visualc.h
     widestring.cpp
     widestring.h
     win.h
-    WWCOMUtil.cpp
-    WWCOMUtil.h
     wwfile.cpp
     WWFILE.H
     wwstring.cpp
@@ -152,6 +142,21 @@ set(WWLIB_SRC
     XSTRAW.H
 )
 
+if(WIN32)
+    list(APPEND WWLIB_SRC
+        mpu.cpp
+        MPU.H
+        rcfile.cpp
+        rcfile.h
+        registry.cpp
+        registry.h
+        verchk.cpp
+        verchk.h
+        WWCOMUtil.cpp
+        WWCOMUtil.h
+    )
+endif()
+
 # Targets to build.
 add_library(core_wwlib STATIC)
 set_target_properties(core_wwlib PROPERTIES OUTPUT_NAME wwlib)

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

@@ -41,9 +41,9 @@
 #define CRC_H
 
 #include	<stdlib.h>
-#ifdef _UNIX
-	#include "osdep.h"
-#endif
+
+// TheSuperHackers @compile feliwir 17/04/2025 include _ltrotl macros
+#include <Utility/intrin_compat.h>
 
 /*
 **	This is a CRC engine class. It will process submitted data and generate a CRC from it.

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

@@ -17,7 +17,7 @@
 */
 
 #include "FastAllocator.h"
-#include <new.h>
+#include <new>
 
 static FastAllocatorGeneral* generalAllocator; //This general allocator will do all allocations for us.
 

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

@@ -61,7 +61,7 @@
 #include	<assert.h>
 #include	<stdlib.h>
 #include <string.h>
-#include <new.h>
+#include <new>
 
 #ifdef _MSC_VER
 #pragma warning (disable : 4702) // unreachable code, happens with some uses of these templates