[ZH] Fix compilation using MinGW

Dependencies/Utility/Utility/CppMacros.h

@@ -3,8 +3,26 @@
 
 #pragma once
 
+#include <cassert>
+#define UNIMPLEMEMTED_ERROR(msg) do { \
+  assert(("Unimplemented: ", msg, 0)); \
+  } while(0)
+
 #if __cplusplus >= 201703L
 #define NOEXCEPT_17 noexcept
 #else
 #define NOEXCEPT_17
 #endif
+
+// noexcept for methods of IUNKNOWN interface
+#if defined(_MSC_VER)
+#define IUNKNOWN_NOEXCEPT NOEXCEPT_17
+#else
+#define IUNKNOWN_NOEXCEPT
+#endif
+
+#if __cplusplus >= 201103L
+    #define CPP_11(code) code
+#else
+    #define CPP_11(code)
+#endif

Dependencies/Utility/Utility/intrin_compat.h

@@ -68,11 +68,12 @@ static inline uint32_t _lrotl(uint32_t value, int shift)
 #ifdef _WIN32
 #include <intrin.h>
 #pragma intrinsic(__rdtsc)
-#endif
-
+#endif // _WIN32
+#endif // _rdtsc
+#ifndef _rdtsc
 static inline uint64_t _rdtsc()
 {
-#if _WIN32
+#ifdef _WIN32
     return __rdtsc();
 #elif defined(__has_builtin) && __has_builtin(__builtin_readcyclecounter)
     return __builtin_readcyclecounter();
@@ -82,9 +83,9 @@ static inline uint64_t _rdtsc()
 #error "No implementation for _rdtsc"
 #endif
 }
-#endif
+#endif // _rdtsc
 
-#ifdef _MSC_VER
+#ifdef _WIN32
 #include <intrin.h>
 #pragma intrinsic(_ReturnAddress)
 #elif defined(__has_builtin)
@@ -113,17 +114,20 @@ static inline uint64_t _rdtsc()
 #endif
 
 #ifndef cpuid
-#if defined(_MSC_VER)
+#if (defined _M_IX86 || defined _M_X64 || defined __i386__ || defined __amd64__)
+#ifdef _WIN32
 #include <intrin.h>
 #define cpuid(regs, cpuid_type) __cpuid(reinterpret_cast<int *>(regs), cpuid_type)
-#elif (defined __clang__ || defined __GNUC__) && (defined __i386__ || defined __amd64__)
+#elif (defined __clang__ || defined __GNUC__)
 #include <cpuid.h>
 #define cpuid(regs, cpuid_type) __cpuid(cpuid_type, regs[0], regs[1], regs[2], regs[3])
-#else
-/* Just return 0 for everything if its not x86 */
+#endif
+#endif // (defined __i386__ || defined __amd64__)
+#endif // cpuid
+#ifndef cpuid
+/* Just return 0 for everything if its not x86 or as fallback */
 #include <string.h>
 #define cpuid(regs, cpuid_type) memset(regs, 0, 16)
-#endif
-#endif //cpuid
+#endif // cpuid
 
-#endif // defined(_MSC_VER) && _MSC_VER < 1300
+#endif // !(defined(_MSC_VER) && _MSC_VER < 1300)

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

@@ -68,7 +68,7 @@ struct AcademyAdviceInfo
 	UnsignedInt numTips;
 };
 
-enum AcademyClassificationType
+enum AcademyClassificationType CPP_11(: int)
 {
 	//Don't forget to update the strings too!
 	ACT_NONE,

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

@@ -44,12 +44,12 @@
 class Object;
 class Player;
 class SpecialPowerTemplate;
-enum SpecialPowerType;
-enum WeaponSlotType;
-enum CommandSourceType;
-enum CanAttackResult;
+enum SpecialPowerType CPP_11(: int);
+enum WeaponSlotType CPP_11(: int);
+enum CommandSourceType CPP_11(: int);
+enum CanAttackResult CPP_11(: int);
 
-enum CanEnterType
+enum CanEnterType CPP_11(: int)
 {
 	CHECK_CAPACITY,
 	DONT_CHECK_CAPACITY,

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

@@ -30,9 +30,11 @@
 #ifndef _AUDIOAFFECT_H_
 #define _AUDIOAFFECT_H_
 
+#include <Lib/BaseType.h>
+
 // if it is set by the options panel, use the system setting parameter. Otherwise, this will be 
 // appended to whatever the current system volume is.
-enum AudioAffect
+enum AudioAffect CPP_11(: int)
 {
 	AudioAffect_Music		= 0x01,
 	AudioAffect_Sound		= 0x02,

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

@@ -41,15 +41,15 @@
 struct FieldParse;
 
 // USEFUL DECLARATIONS ////////////////////////////////////////////////////////////////////////////
-enum AudioType
+enum AudioType CPP_11(: int)
 {
 	AT_Music,
 	AT_Streaming,
 	AT_SoundEffect
 };
 
 extern const char *theAudioPriorityNames[];
-enum AudioPriority
+enum AudioPriority CPP_11(: int)
 {
 	AP_LOWEST,
 	AP_LOW,
@@ -59,7 +59,7 @@ enum AudioPriority
 };
 
 extern const char *theSoundTypeNames[];
-enum SoundType
+enum SoundType CPP_11(: int)
 {
 	ST_UI										= 0x0001,
 	ST_WORLD								= 0x0002,
@@ -73,7 +73,7 @@ enum SoundType
 };
 
 extern const char *theAudioControlNames[];
-enum AudioControl
+enum AudioControl CPP_11(: int)
 {
 	AC_LOOP									= 0x0001,
 	AC_RANDOM								= 0x0002,

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

@@ -38,7 +38,7 @@
 // forward declarations ///////////////////////////////////////////////////////////////////////////
 struct AudioEventInfo;
 
-enum OwnerType
+enum OwnerType CPP_11(: int)
 {
 	OT_Positional,
 	OT_Drawable,
@@ -47,15 +47,15 @@ enum OwnerType
 	OT_INVALID
 };
 
-enum PortionToPlay
+enum PortionToPlay CPP_11(: int)
 {
 	PP_Attack,
 	PP_Sound,
 	PP_Decay,
 	PP_Done
 };
 
-enum AudioPriority;
+enum AudioPriority CPP_11(: int);
 
 // This is called AudioEventRTS because AudioEvent is a typedef in ww3d
 // You might want this to be memory pooled (I personally do), but it can't

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

@@ -31,7 +31,7 @@
 #ifndef _AUDIOHANDLESPECIALVALUES_H_
 #define _AUDIOHANDLESPECIALVALUES_H_
 
-enum AudioHandleSpecialValues
+enum AudioHandleSpecialValues CPP_11(: int)
 {
 	AHSV_Error					= 0x00,
 	AHSV_NoSound,

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

@@ -36,7 +36,7 @@
 
 class AudioEventRTS;
 
-enum RequestType
+enum RequestType CPP_11(: int)
 {
 	AR_Play,
 	AR_Pause,

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

@@ -28,14 +28,14 @@ struct BorderColor
 
 const BorderColor BORDER_COLORS[] = 
 {
-	{ "Orange",					0xFFFF8700, },
-	{ "Green",					0xFF00FF00, },
-	{ "Blue",						0xFF0000FF, },
-	{ "Cyan",						0xFF00FFFF, },
-	{ "Magenta",				0xFFFF00FF, },
-	{ "Yellow",					0xFFFFFF00, },
-	{ "Purple",					0xFF9E00FF, },
-	{ "Pink",						0xFFFF8670, },
+	{ "Orange",					(long)0xFFFF8700, },
+	{ "Green",					(long)0xFF00FF00, },
+	{ "Blue",						(long)0xFF0000FF, },
+	{ "Cyan",						(long)0xFF00FFFF, },
+	{ "Magenta",				(long)0xFFFF00FF, },
+	{ "Yellow",					(long)0xFFFFFF00, },
+	{ "Purple",					(long)0xFF9E00FF, },
+	{ "Pink",						(long)0xFFFF8670, },
 };
 
 const long BORDER_COLORS_SIZE = sizeof(BORDER_COLORS) / sizeof (BORDER_COLORS[0]);

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

@@ -72,7 +72,7 @@ typedef ObjectSellList::iterator ObjectSellListIterator;
 //-------------------------------------------------------------------------------------------------
 /** Return codes for queries about being able to build */
 //-------------------------------------------------------------------------------------------------
-enum CanMakeType
+enum CanMakeType CPP_11(: int)
 {
 	CANMAKE_OK,
 	CANMAKE_NO_PREREQ,
@@ -86,7 +86,7 @@ enum CanMakeType
 //-------------------------------------------------------------------------------------------------
 /** Return codes for queries about legal build locations */
 //-------------------------------------------------------------------------------------------------
-enum LegalBuildCode
+enum LegalBuildCode CPP_11(: int)
 {
 	LBC_OK = 0,
 	LBC_RESTRICTED_TERRAIN,

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

@@ -207,6 +207,8 @@ DEBUG_EXTERN_C void ReleaseCrashLocalized(const AsciiString& p, const AsciiStrin
 
 #ifdef DEBUG_PROFILE
 
+#include <stdlib.h>
+
 class SimpleProfiler
 {
 private:

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

@@ -41,7 +41,7 @@
 /** Kind of flags for determining groups of things that belong together
 	* NOTE: You *MUST* keep this in the same order as the DisabledNames[] below */
 //-------------------------------------------------------------------------------------------------
-enum DisabledType
+enum DisabledType CPP_11(: int)
 {
 	DISABLED_DEFAULT,     //Typical disable -- like systems, things that don't need to run.
 	DISABLED_HACKED,      //This unit has been hacked

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

@@ -55,8 +55,8 @@ class TracerDrawInterface;
 class RopeDrawInterface;
 class LaserDrawInterface;
 class FXList;
-enum TerrainDecalType;
-enum ShadowType;
+enum TerrainDecalType CPP_11(: int);
+enum ShadowType CPP_11(: int);
 
 //class ModelConditionFlags;
 

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

@@ -87,7 +87,7 @@ class DynamicAudioEventInfo : public AudioEventInfo
 
   private:
     // List of fields we can override
-    enum OverriddenFields
+    enum OverriddenFields CPP_11(: int)
     {
       OVERRIDE_NAME = 0,
       OVERRIDE_LOOP_FLAG,

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

@@ -54,7 +54,7 @@
 	to add to this list as necessary; however, there should generally be very
 	few codes needed.
 */
-enum ErrorCode
+enum ErrorCode CPP_11(: unsigned)
 {
 	ERROR_BASE									= 0xdead0001,								// a nice, distinctive value
 

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

@@ -61,8 +61,8 @@ class Object;
 class SoundManager;
 
 
-enum AudioAffect;
-enum AudioType;
+enum AudioAffect CPP_11(: int);
+enum AudioType CPP_11(: int);
 
 struct AudioEventInfo;
 struct AudioRequest;

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

@@ -138,7 +138,7 @@ enum
 };
 
 //-------------------------------------------------------------------------------------------------
-enum GameDifficulty
+enum GameDifficulty CPP_11(: int)
 {
 	DIFFICULTY_EASY,
 	DIFFICULTY_NORMAL,
@@ -148,7 +148,7 @@ enum GameDifficulty
 };
 
 //-------------------------------------------------------------------------------------------------
-enum PlayerType
+enum PlayerType CPP_11(: int)
 {
 	PLAYER_HUMAN,				///< player is human-controlled
 	PLAYER_COMPUTER,		///< player is computer-controlled
@@ -158,7 +158,7 @@ enum PlayerType
 
 //-------------------------------------------------------------------------------------------------
 /// A PartitionCell can be one of three states for Shroud
-enum CellShroudStatus
+enum CellShroudStatus CPP_11(: int)
 {
 	CELLSHROUD_CLEAR,
 	CELLSHROUD_FOGGED,
@@ -169,7 +169,7 @@ enum CellShroudStatus
 
 //-------------------------------------------------------------------------------------------------
 /// Since an object can take up more than a single PartitionCell, this is a status that applies to the whole Object
-enum ObjectShroudStatus
+enum ObjectShroudStatus CPP_11(: int)
 {
 	OBJECTSHROUD_INVALID,				///< indeterminate state, will recompute
 	OBJECTSHROUD_CLEAR,					///< object is not shrouded at all (ie, completely visible)
@@ -182,7 +182,7 @@ enum ObjectShroudStatus
 };
 
 //-------------------------------------------------------------------------------------------------
-enum GuardMode
+enum GuardMode CPP_11(: int)
 {
 	GUARDMODE_NORMAL,
 	GUARDMODE_GUARD_WITHOUT_PURSUIT,	// no pursuit out of guard area
@@ -203,7 +203,7 @@ enum
 
 /// Veterancy level define needed by several files that don't need the full Experience code.
 // NOTE NOTE NOTE: Keep TheVeterencyNames in sync with these.
-enum VeterancyLevel
+enum VeterancyLevel CPP_11(: int)
 {
 	LEVEL_REGULAR = 0,
 	LEVEL_VETERAN,
@@ -222,7 +222,7 @@ extern const char *TheVeterancyNames[];
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-enum CommandSourceType 
+enum CommandSourceType CPP_11(: int) 
 { 
 
 	CMD_FROM_PLAYER = 0, 
@@ -234,7 +234,7 @@ enum CommandSourceType
 };		///< the source of a command
 
 //-------------------------------------------------------------------------------------------------
-enum AbleToAttackType
+enum AbleToAttackType CPP_11(: int)
 {
 	_ATTACK_FORCED			= 0x01,
 	_ATTACK_CONTINUED		= 0x02,
@@ -472,7 +472,7 @@ class DLINK_ITERATOR
 
 // ------------------------------------------------------------------------
 
-enum WhichTurretType
+enum WhichTurretType CPP_11(: int)
 {
 	TURRET_INVALID = -1,
 
@@ -495,7 +495,7 @@ inline Real stdAngleDiff(Real a1, Real a2)
 
 // ------------------------------------------------------------------------
 // NOTE NOTE NOTE: Keep TheRelationShipNames in sync with this enum
-enum Relationship
+enum Relationship CPP_11(: int)
 {
 	ENEMIES = 0,
 	NEUTRAL,