merge: xezon/xezon/vs2022-compile-1

Author: tintinhamans

CMakeLists.txt

@@ -33,6 +33,20 @@ endif()
 # Top level project, doesn't really affect anything.
 project(genzh LANGUAGES C CXX)
 
+# Print some information
+message(STATUS "CMAKE_CXX_COMPILER: ${CMAKE_CXX_COMPILER}")
+message(STATUS "CMAKE_CXX_COMPILER_ID: ${CMAKE_CXX_COMPILER_ID}")
+if (DEFINED MSVC_VERSION)
+    message(STATUS "MSVC_VERSION: ${MSVC_VERSION}")
+endif()
+
+# Set variable for VS6 to handle special cases.
+if (DEFINED MSVC_VERSION AND MSVC_VERSION LESS 1300)
+    set(IS_VS6_BUILD TRUE)
+else()
+    set(IS_VS6_BUILD FALSE)
+endif()
+
 # Create PDB for Release as long as debug info was generated during compile.
 if(MSVC)
     string(APPEND CMAKE_EXE_LINKER_FLAGS_RELEASE " /DEBUG /OPT:REF /OPT:ICF")
@@ -57,6 +71,20 @@ add_subdirectory(Dependencies/Benchmark)
 add_subdirectory(Dependencies/SafeDisc)
 add_subdirectory(Dependencies/MaxSDK)
 
+if (NOT IS_VS6_BUILD)
+    # Set C++ standard
+    set(CMAKE_CXX_STANDARD 20)
+    set(CMAKE_CXX_STANDARD_REQUIRED ON)
+    set(CMAKE_CXX_EXTENSIONS OFF)  # Ensures only ISO features are used
+
+    if (MSVC)
+        # Multithreaded build.
+        add_compile_options(/MP)
+        # Enforce strict __cplusplus version
+        add_compile_options(/Zc:__cplusplus)
+    endif()
+endif()
+
 # Do we want to build extra SDK stuff or just the game binary?
 option(GENZH_BUILD_ZEROHOUR "Build Zero Hour code." ON)
 option(GENZH_BUILD_GENERALS "Build Generals code." ON)

Generals/Code/Tools/Compress/CMakeLists.txt

@@ -16,7 +16,7 @@ target_link_libraries(g_compress PRIVATE
 )
 
 if(WIN32 OR "${CMAKE_SYSTEM}" MATCHES "Windows")
-    if(MSVC_VERSION LESS 1300) # VS6
+    if(IS_VS6_BUILD)
         target_compile_definitions(g_compress PRIVATE vsnprintf=_vsnprintf)
     endif()
     target_link_options(g_compress PRIVATE /subsystem:console)

GeneralsMD/Code/GameEngine/CMakeLists.txt

@@ -22,6 +22,7 @@ set(GAMEENGINE_SRC
     Include/Common/ClientUpdateModule.h
     Include/Common/CommandLine.h
     Include/Common/CopyProtection.h
+    Include/Common/CppMacros.h
     Include/Common/crc.h
     Include/Common/CRCDebug.h
     Include/Common/CriticalSection.h

GeneralsMD/Code/GameEngine/Include/Common/AudioEventInfo.h

@@ -48,7 +48,7 @@ enum AudioType
 	AT_SoundEffect
 };
 
-extern char *theAudioPriorityNames[];
+extern const char *theAudioPriorityNames[];
 enum AudioPriority
 {
 	AP_LOWEST,
@@ -58,7 +58,7 @@ enum AudioPriority
 	AP_CRITICAL
 };
 
-extern char *theSoundTypeNames[];
+extern const char *theSoundTypeNames[];
 enum SoundType
 {
 	ST_UI										= 0x0001,
@@ -72,7 +72,7 @@ enum SoundType
 	ST_EVERYONE							= 0x0100,	
 };
 
-extern char *theAudioControlNames[];
+extern const char *theAudioControlNames[];
 enum AudioControl
 {
 	AC_LOOP									= 0x0001,
@@ -128,7 +128,7 @@ struct AudioEventInfo : public MemoryPoolObject
 
   /// Is this a permenant sound? That is, if I start this sound up, will it ever end
   /// "on its own" or only if I explicitly kill it?
-  Bool isPermanentSound() const { return BitTest( m_control, AC_LOOP ) && (m_loopCount == 0 );  }
+  Bool isPermanentSound() const { return BitIsSet( m_control, AC_LOOP ) && (m_loopCount == 0 );  }
 
 	static const FieldParse m_audioEventInfo[];		///< the parse table for INI definition
 	const FieldParse *getFieldParse( void ) const { return m_audioEventInfo; }

GeneralsMD/Code/GameEngine/Include/Common/AudioRandomValue.h

@@ -35,8 +35,8 @@
 #include "Lib/BaseType.h"
 
 // do NOT use these functions directly, rather use the macros below
-extern Int GetGameAudioRandomValue( int lo, int hi, char *file, int line );
-extern Real GetGameAudioRandomValueReal( Real lo, Real hi, char *file, int line );
+extern Int GetGameAudioRandomValue( int lo, int hi, const char *file, int line );
+extern Real GetGameAudioRandomValueReal( Real lo, Real hi, const char *file, int line );
 
 // use these macros to access the random value functions
 #define GameAudioRandomValue( lo, hi ) GetGameAudioRandomValue( lo, hi, __FILE__, __LINE__ )

GeneralsMD/Code/GameEngine/Include/Common/BorderColors.h

@@ -22,7 +22,7 @@
 
 struct BorderColor
 {
-	char *m_colorName;
+	const char *m_colorName;
 	long m_borderColor;
 };
 

GeneralsMD/Code/GameEngine/Include/Common/CppMacros.h

@@ -0,0 +1,10 @@
+// TheSuperHackers
+// This file contains macros to help upgrade the code for newer cpp standards.
+
+#pragma once
+
+#if __cplusplus >= 201703L
+#define NOEXCEPT_17 noexcept
+#else
+#define NOEXCEPT_17
+#endif

GeneralsMD/Code/GameEngine/Include/Common/DataChunk.h

@@ -126,7 +126,7 @@ class DataChunkOutput
 	DataChunkOutput(  OutputStream *pOut  );
 	~DataChunkOutput();
 
-	void openDataChunk( char *name, DataChunkVersionType ver );
+	void openDataChunk( const char *name, DataChunkVersionType ver );
 	void closeDataChunk( void );
 
 	void writeReal(Real r);

GeneralsMD/Code/GameEngine/Include/Common/GameCommon.h

@@ -318,7 +318,7 @@ public:																																								\
 	inline DLINK_ITERATOR<OBJCLASS> iterate_##LISTNAME() const													\
 	{																																										\
 		DEBUG_ASSERTCRASH(!BOGUSPTR(m_dlinkhead_##LISTNAME.m_head), ("bogus head ptr"));	\
-		return DLINK_ITERATOR<OBJCLASS>(m_dlinkhead_##LISTNAME.m_head, OBJCLASS::dlink_next_##LISTNAME);	\
+		return DLINK_ITERATOR<OBJCLASS>(m_dlinkhead_##LISTNAME.m_head, &OBJCLASS::dlink_next_##LISTNAME);	\
 	}																																										\
 	inline OBJCLASS *getFirstItemIn_##LISTNAME() const																	\
 	{																																										\

GeneralsMD/Code/GameEngine/Include/Common/GameMemory.h

@@ -875,11 +875,13 @@ extern void userMemoryAdjustPoolSize(const char *poolName, Int& initialAllocatio
 	extern void* __cdecl operator new[](size_t nSize, const char *, int);
 	extern void __cdecl operator delete[](void *, const char *, int);
 
+#if defined(_MSC_VER) && _MSC_VER < 1300
 	// additional overloads for 'placement new'
 	//inline void* __cdecl operator new							(size_t s, void *p) { return p; }
 	//inline void __cdecl operator delete						(void *, void *p)		{ }
 	inline void* __cdecl operator new[]						(size_t s, void *p) { return p; }
 	inline void __cdecl operator delete[]					(void *, void *p)		{ }
+#endif
 
 #endif