[GEN][ZH] Add underlying types to enum declarations for GCC build (#665)

Author: zzambers

Core/Libraries/Include/Lib/BaseTypeCore.h

@@ -36,6 +36,7 @@
 #include <string.h>
 // TheSuperHackers @compile feliwir 07/04/2025 Adds utility macros for cross-platform compatibility
 #include <Utility/compat.h>
+#include <Utility/CppMacros.h>
 
 /*
 **	Turn off some unneeded warnings.

Dependencies/Utility/Utility/CppMacros.h

@@ -24,3 +24,9 @@
 #else
 #define NOEXCEPT_17
 #endif
+
+#if __cplusplus >= 201103L
+    #define CPP_11(code) code
+#else
+    #define CPP_11(code)
+#endif

Generals/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,

Generals/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,

Generals/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,

Generals/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

Generals/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,

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

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

Generals/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,

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

@@ -40,7 +40,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