COMMON: Replace NEResourceType and PEResourceType with a shared enum

3 files changed, 25 insertions, 48 deletions

diff --git a/common/winexe.h b/common/winexe.h
index cfadbf882d..9aeea379ed 100644
--- a/common/winexe.h
+++ b/common/winexe.h
@@ -28,6 +28,31 @@
 
 namespace Common {
 
+/** The default Windows resources. */
+enum WinResourceType {
+	kWinCursor       = 0x01,
+	kWinBitmap       = 0x02,
+	kWinIcon         = 0x03,
+	kWinMenu         = 0x04,
+	kWinDialog       = 0x05,
+	kWinString       = 0x06,
+	kWinFontDir      = 0x07,
+	kWinFont         = 0x08,
+	kWinAccelerator  = 0x09,
+	kWinRCData       = 0x0A,
+	kWinMessageTable = 0x0B,
+	kWinGroupCursor  = 0x0C,
+	kWinGroupIcon    = 0x0E,
+	kWinVersion      = 0x10,
+	kWinDlgInclude   = 0x11,
+	kWinPlugPlay     = 0x13,
+	kWinVXD          = 0x14,
+	kWinAniCursor    = 0x15,
+	kWinAniIcon      = 0x16,
+	kWinHTML         = 0x17,
+	kWinManifest     = 0x18
+};
+
 class WinResourceID {
 public:
 	WinResourceID() { _idType = kIDTypeNull; }
diff --git a/common/winexe_ne.h b/common/winexe_ne.h
index d6698e6cf0..1a845864b2 100644
--- a/common/winexe_ne.h
+++ b/common/winexe_ne.h
@@ -32,31 +32,6 @@ namespace Common {
 template<class T> class Array;
 class SeekableReadStream;
 
-/** The default Windows resources. */
-enum NEResourceType {
-	kNECursor       = 0x01,
-	kNEBitmap       = 0x02,
-	kNEIcon         = 0x03,
-	kNEMenu         = 0x04,
-	kNEDialog       = 0x05,
-	kNEString       = 0x06,
-	kNEFontDir      = 0x07,
-	kNEFont         = 0x08,
-	kNEAccelerator  = 0x09,
-	kNERCData       = 0x0A,
-	kNEMessageTable = 0x0B,
-	kNEGroupCursor  = 0x0C,
-	kNEGroupIcon    = 0x0E,
-	kNEVersion      = 0x10,
-	kNEDlgInclude   = 0x11,
-	kNEPlugPlay     = 0x13,
-	kNEVXD          = 0x14,
-	kNEAniCursor    = 0x15,
-	kNEAniIcon      = 0x16,
-	kNEHTML         = 0x17,
-	kNEManifest     = 0x18
-};
-
 /**
  * A class able to load resources from a Windows New Executable, such
  * as cursors, bitmaps, and sounds.
diff --git a/common/winexe_pe.h b/common/winexe_pe.h
index b163bd15d2..6f92cde6dc 100644
--- a/common/winexe_pe.h
+++ b/common/winexe_pe.h
@@ -33,29 +33,6 @@ namespace Common {
 template<class T> class Array;
 class SeekableReadStream;
 
-/** The default Windows PE resources. */
-enum PEResourceType {
-	kPECursor =       0x01,
-	kPEBitmap =       0x02,
-	kPEIcon =         0x03,
-	kPEMenu =         0x04,
-	kPEDialog =       0x05,
-	kPEString =       0x06,
-	kPEFontDir =      0x07,
-	kPEFont =         0x08,
-	kPEAccelerator =  0x09,
-	kPERCData =       0x0A,
-	kPEMessageTable = 0x0B,
-	kPEGroupCursor =  0x0C,
-	kPEGroupIcon =    0x0E,
-	kPEVersion =      0x10,
-	kPEDlgInclude =   0x11,
-	kPEPlugPlay =     0x13,
-	kPEVXD =          0x14,
-	kPEAniCursor =    0x15,
-	kPEAniIcon =      0x16
-};
-
 /**
  * A class able to load resources from a Windows Portable Executable, such
  * as cursors, bitmaps, and sounds.