[GEN][ZH] Add underlying types to enum declarations for GCC build

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

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

@@ -54,8 +54,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;
 

Generals/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(: UnsignedInt)
 {
 	ERROR_BASE									= 0xdead0001,								// a nice, distinctive value
 

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

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

@@ -120,7 +120,7 @@ enum
 #endif
 
 //-------------------------------------------------------------------------------------------------
-enum GameDifficulty
+enum GameDifficulty CPP_11(: Int)
 {
 	DIFFICULTY_EASY,
 	DIFFICULTY_NORMAL,
@@ -130,7 +130,7 @@ enum GameDifficulty
 };
 
 //-------------------------------------------------------------------------------------------------
-enum PlayerType
+enum PlayerType CPP_11(: Int)
 {
 	PLAYER_HUMAN,				///< player is human-controlled
 	PLAYER_COMPUTER,		///< player is computer-controlled
@@ -140,7 +140,7 @@ enum PlayerType
 
 //-------------------------------------------------------------------------------------------------
 /// A PartitionCell can be one of three states for Shroud
-enum CellShroudStatus
+enum CellShroudStatus CPP_11(: Int)
 {
 	CELLSHROUD_CLEAR,
 	CELLSHROUD_FOGGED,
@@ -151,7 +151,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)
@@ -164,7 +164,7 @@ enum ObjectShroudStatus
 };
 
 //-------------------------------------------------------------------------------------------------
-enum GuardMode
+enum GuardMode CPP_11(: Int)
 {
 	GUARDMODE_NORMAL,
 	GUARDMODE_GUARD_WITHOUT_PURSUIT,	// no pursuit out of guard area
@@ -185,7 +185,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,
@@ -204,7 +204,7 @@ extern const char *TheVeterancyNames[];
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-enum CommandSourceType 
+enum CommandSourceType CPP_11(: Int) 
 { 
 
 	CMD_FROM_PLAYER = 0, 
@@ -215,7 +215,7 @@ enum CommandSourceType
 };		///< the source of a command
 
 //-------------------------------------------------------------------------------------------------
-enum AbleToAttackType
+enum AbleToAttackType CPP_11(: Int)
 {
 	_ATTACK_FORCED			= 0x01,
 	_ATTACK_CONTINUED		= 0x02,
@@ -453,7 +453,7 @@ class DLINK_ITERATOR
 
 // ------------------------------------------------------------------------
 
-enum WhichTurretType
+enum WhichTurretType CPP_11(: Int)
 {
 	TURRET_INVALID = -1,
 
@@ -476,7 +476,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,

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

@@ -36,13 +36,13 @@
 #ifndef _GAME_LOD_H_
 #define _GAME_LOD_H_
 
-enum ParticlePriorityType;
+enum ParticlePriorityType CPP_11(: Int);
 
 #define MAX_LOD_PRESETS_PER_LEVEL	32	//number of hardware configs preset for each low,medium,high
 #define MAX_BENCH_PROFILES	16
 
 //Make sure this enum stays in sync with GameLODNames[]
-enum StaticGameLODLevel
+enum StaticGameLODLevel CPP_11(: Int)
 {
 	STATIC_GAME_LOD_UNKNOWN=-1,
 	STATIC_GAME_LOD_LOW,
@@ -52,7 +52,7 @@ enum StaticGameLODLevel
 	STATIC_GAME_LOD_COUNT
 };
 
-enum DynamicGameLODLevel
+enum DynamicGameLODLevel CPP_11(: Int)
 {
 	DYNAMIC_GAME_LOD_UNKNOWN=-1,
 	DYNAMIC_GAME_LOD_LOW,
@@ -63,7 +63,7 @@ enum DynamicGameLODLevel
 };
 
 //Make sure this stays in sync with CPUNames[] in gamelod.cpp
-enum CpuType
+enum CpuType CPP_11(: Int)
 {
 	XX,	//unknown type
 	P3,
@@ -72,7 +72,7 @@ enum CpuType
 };
 
 //Keep this in sync with VideoNames in Gamelod.cpp
-enum ChipsetType
+enum ChipsetType CPP_11(: Int)
 {	DC_UNKNOWN,
 	DC_VOODOO2,
 	DC_VOODOO3,

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

@@ -51,7 +51,7 @@ typedef void (*IterateSaveFileCallback)( AsciiString filename, void *userData );
 	* save/load menu initialization you can make that menu allow loading only, or allow
 	* both saving and loading from the same menu */
 // ------------------------------------------------------------------------------------------------
-enum SaveLoadLayoutType
+enum SaveLoadLayoutType CPP_11(: Int)
 {
 	SLLT_INVALID = 0,
 	SLLT_SAVE_AND_LOAD,
@@ -82,7 +82,7 @@ struct SaveDate
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-enum SaveFileType
+enum SaveFileType CPP_11(: Int)
 {
 	SAVE_FILE_TYPE_NORMAL,		///< a regular save game at any arbitrary point in the game
 	SAVE_FILE_TYPE_MISSION,		///< a save game in between missions (a mission save)
@@ -126,7 +126,7 @@ struct AvailableGameInfo
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-enum SaveCode
+enum SaveCode CPP_11(: Int)
 {
 	SC_INVALID = -1,
 	SC_OK,
@@ -139,7 +139,7 @@ enum SaveCode
 	SC_ERROR,
 };
 
-enum SnapshotType {
+enum SnapshotType CPP_11(: Int) {
 	SNAPSHOT_SAVELOAD,
 	SNAPSHOT_DEEPCRC_LOGICONLY,
 	SNAPSHOT_DEEPCRC,