[OMPT-svn-commit] OpenMPT r22112 - trunk/OpenMPT/misc

[<sv...@op...>]

Author: manx
Date: Fri Nov  8 14:09:21 2024
New Revision: 22112
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22112

Log:
[Fix] mptOS: Compile fix for older SDKs.

Modified:
   trunk/OpenMPT/misc/mptOS.cpp

Modified: trunk/OpenMPT/misc/mptOS.cpp
==============================================================================
--- trunk/OpenMPT/misc/mptOS.cpp	Fri Nov  8 13:40:07 2024	(r22111)
+++ trunk/OpenMPT/misc/mptOS.cpp	Fri Nov  8 14:09:21 2024	(r22112)
@@ -204,35 +204,99 @@
 	Architecture Host;
 };
 static constexpr MachineArchitecture machinearchitectures [] = {
-	{ IMAGE_FILE_MACHINE_I386      , Architecture::x86     },
-	{ IMAGE_FILE_MACHINE_R3000     , Architecture::mips    },
-	{ IMAGE_FILE_MACHINE_R4000     , Architecture::mips    },
-	{ IMAGE_FILE_MACHINE_R10000    , Architecture::mips    },
-	{ IMAGE_FILE_MACHINE_WCEMIPSV2 , Architecture::mips    },
-	{ IMAGE_FILE_MACHINE_ALPHA     , Architecture::alpha   },
-	{ IMAGE_FILE_MACHINE_SH3       , Architecture::shx     },
-	{ IMAGE_FILE_MACHINE_SH3DSP    , Architecture::shx     },
-	{ IMAGE_FILE_MACHINE_SH3E      , Architecture::shx     },
-	{ IMAGE_FILE_MACHINE_SH4       , Architecture::shx     },
-	{ IMAGE_FILE_MACHINE_SH5       , Architecture::shx     },
-	{ IMAGE_FILE_MACHINE_ARM       , Architecture::arm     },
-	{ IMAGE_FILE_MACHINE_THUMB     , Architecture::arm     },
-	{ IMAGE_FILE_MACHINE_ARMNT     , Architecture::arm     },
-	{ IMAGE_FILE_MACHINE_AM33      , Architecture::unknown },
-	{ IMAGE_FILE_MACHINE_POWERPC   , Architecture::ppc     },
-	{ IMAGE_FILE_MACHINE_POWERPCFP , Architecture::ppc     },
-	{ IMAGE_FILE_MACHINE_MIPS16    , Architecture::unknown },
-	{ IMAGE_FILE_MACHINE_ALPHA64   , Architecture::alpha64 },
-	{ IMAGE_FILE_MACHINE_MIPSFPU   , Architecture::mips    },
-	{ IMAGE_FILE_MACHINE_MIPSFPU16 , Architecture::unknown },
-	{ IMAGE_FILE_MACHINE_AXP64     , Architecture::alpha64 },
-	{ IMAGE_FILE_MACHINE_TRICORE   , Architecture::unknown },
-	{ IMAGE_FILE_MACHINE_CEF       , Architecture::unknown },
-	{ IMAGE_FILE_MACHINE_EBC       , Architecture::unknown },
-	{ IMAGE_FILE_MACHINE_AMD64     , Architecture::amd64   },
-	{ IMAGE_FILE_MACHINE_M32R      , Architecture::unknown },
-	{ IMAGE_FILE_MACHINE_ARM64     , Architecture::arm64   },
-	{ IMAGE_FILE_MACHINE_CEE       , Architecture::unknown }
+#ifdef IMAGE_FILE_MACHINE_UNKNOWN
+	{ IMAGE_FILE_MACHINE_UNKNOWN    , Architecture::unknown },
+#endif
+#ifdef IMAGE_FILE_MACHINE_TARGET_HOST
+	{ IMAGE_FILE_MACHINE_TARGET_HOST, Architecture::unknown },
+#endif
+#ifdef IMAGE_FILE_MACHINE_I386
+	{ IMAGE_FILE_MACHINE_I386       , Architecture::x86     },
+#endif
+#ifdef IMAGE_FILE_MACHINE_R3000
+	{ IMAGE_FILE_MACHINE_R3000      , Architecture::mips    },
+#endif
+#ifdef IMAGE_FILE_MACHINE_R4000
+	{ IMAGE_FILE_MACHINE_R4000      , Architecture::mips    },
+#endif
+#ifdef IMAGE_FILE_MACHINE_R10000
+	{ IMAGE_FILE_MACHINE_R10000     , Architecture::mips    },
+#endif
+#ifdef IMAGE_FILE_MACHINE_WCEMIPSV2
+	{ IMAGE_FILE_MACHINE_WCEMIPSV2  , Architecture::mips    },
+#endif
+#ifdef IMAGE_FILE_MACHINE_ALPHA
+	{ IMAGE_FILE_MACHINE_ALPHA      , Architecture::alpha   },
+#endif
+#ifdef IMAGE_FILE_MACHINE_SH3
+	{ IMAGE_FILE_MACHINE_SH3        , Architecture::shx     },
+#endif
+#ifdef IMAGE_FILE_MACHINE_SH3DSP
+	{ IMAGE_FILE_MACHINE_SH3DSP     , Architecture::shx     },
+#endif
+#ifdef IMAGE_FILE_MACHINE_SH3E
+	{ IMAGE_FILE_MACHINE_SH3E       , Architecture::shx     },
+#endif
+#ifdef IMAGE_FILE_MACHINE_SH4
+	{ IMAGE_FILE_MACHINE_SH4        , Architecture::shx     },
+#endif
+#ifdef IMAGE_FILE_MACHINE_SH5
+	{ IMAGE_FILE_MACHINE_SH5        , Architecture::shx     },
+#endif
+#ifdef IMAGE_FILE_MACHINE_ARM
+	{ IMAGE_FILE_MACHINE_ARM        , Architecture::arm     },
+#endif
+#ifdef IMAGE_FILE_MACHINE_THUMB
+	{ IMAGE_FILE_MACHINE_THUMB      , Architecture::arm     },
+#endif
+#ifdef IMAGE_FILE_MACHINE_ARMNT
+	{ IMAGE_FILE_MACHINE_ARMNT      , Architecture::arm     },
+#endif
+#ifdef IMAGE_FILE_MACHINE_AM33
+	{ IMAGE_FILE_MACHINE_AM33       , Architecture::unknown },
+#endif
+#ifdef IMAGE_FILE_MACHINE_POWERPC
+	{ IMAGE_FILE_MACHINE_POWERPC    , Architecture::ppc     },
+#endif
+#ifdef IMAGE_FILE_MACHINE_POWERPCFP
+	{ IMAGE_FILE_MACHINE_POWERPCFP  , Architecture::ppc     },
+#endif
+#ifdef IMAGE_FILE_MACHINE_MIPS16
+	{ IMAGE_FILE_MACHINE_MIPS16     , Architecture::unknown },
+#endif
+#ifdef IMAGE_FILE_MACHINE_ALPHA64
+	{ IMAGE_FILE_MACHINE_ALPHA64    , Architecture::alpha64 },
+#endif
+#ifdef IMAGE_FILE_MACHINE_MIPSFPU
+	{ IMAGE_FILE_MACHINE_MIPSFPU    , Architecture::mips    },
+#endif
+#ifdef IMAGE_FILE_MACHINE_MIPSFPU16
+	{ IMAGE_FILE_MACHINE_MIPSFPU16  , Architecture::unknown },
+#endif
+#ifdef IMAGE_FILE_MACHINE_AXP64
+	{ IMAGE_FILE_MACHINE_AXP64      , Architecture::alpha64 },
+#endif
+#ifdef IMAGE_FILE_MACHINE_TRICORE
+	{ IMAGE_FILE_MACHINE_TRICORE    , Architecture::unknown },
+#endif
+#ifdef IMAGE_FILE_MACHINE_CEF
+	{ IMAGE_FILE_MACHINE_CEF        , Architecture::unknown },
+#endif
+#ifdef IMAGE_FILE_MACHINE_EBC
+	{ IMAGE_FILE_MACHINE_EBC        , Architecture::unknown },
+#endif
+#ifdef IMAGE_FILE_MACHINE_AMD64
+	{ IMAGE_FILE_MACHINE_AMD64      , Architecture::amd64   },
+#endif
+#ifdef IMAGE_FILE_MACHINE_M32R
+	{ IMAGE_FILE_MACHINE_M32R       , Architecture::unknown },
+#endif
+#ifdef IMAGE_FILE_MACHINE_ARM64
+	{ IMAGE_FILE_MACHINE_ARM64      , Architecture::arm64   },
+#endif
+#ifdef IMAGE_FILE_MACHINE_CEE
+	{ IMAGE_FILE_MACHINE_CEE        , Architecture::unknown }
+#endif
 };