aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2004-02-07 17:10:48 +0000
committerMax Horn2004-02-07 17:10:48 +0000
commit9302e7d88879e1b64069774ea18a28370ccdabc6 (patch)
tree7bc7f0b228e6615fd1336f6c6bf69e327de17ab0
parente0f29c995144542f5fdf25e24d6b6e220e9ad8e3 (diff)
downloadscummvm-rg350-9302e7d88879e1b64069774ea18a28370ccdabc6.tar.gz
scummvm-rg350-9302e7d88879e1b64069774ea18a28370ccdabc6.tar.bz2
scummvm-rg350-9302e7d88879e1b64069774ea18a28370ccdabc6.zip
Make g_platforms global, so that the alauncher can iterate over the list of supported platforms
svn-id: r12765
-rw-r--r--common/util.cpp14
-rw-r--r--common/util.h10
2 files changed, 14 insertions, 10 deletions
diff --git a/common/util.cpp b/common/util.cpp
index 50d989528b..c651901d18 100644
--- a/common/util.cpp
+++ b/common/util.cpp
@@ -182,24 +182,18 @@ const char *getLanguageDescription(Language id) {
#pragma mark -
-struct PlatformDescription {
- const char *code;
- const char *code2;
- const char *description;
- Common::Platform id;
-};
-
-static const PlatformDescription g_platforms[] = {
- {"pc", "dos", "PC", kPlatformPC},
+const PlatformDescription g_platforms[] = {
{"amiga", "ami", "Amiga", kPlatformAmiga},
{"atari", "atari-st", "Atari ST", kPlatformAtariST},
- {"macintosh", "mac", "Macintosh", kPlatformMacintosh},
// The 'official' spelling seems to be "FM-TOWNS" (e.g. in the Indy4 demo).
// However, on the net many variations can be seen, like "FMTOWNS",
// "FM TOWNS", "FmTowns", etc.
{"fmtowns", "towns", "FM-TOWNS", kPlatformFMTowns},
+ {"macintosh", "mac", "Macintosh", kPlatformMacintosh},
+ {"pc", "dos", "PC", kPlatformPC},
+
{0, 0, "Default", kPlatformUnknown}
};
diff --git a/common/util.h b/common/util.h
index 65c7b1cb5d..cf8e8b9b42 100644
--- a/common/util.h
+++ b/common/util.h
@@ -146,6 +146,16 @@ enum Platform {
*/
};
+struct PlatformDescription {
+ const char *code;
+ const char *code2;
+ const char *description;
+ Common::Platform id;
+};
+
+extern const PlatformDescription g_platforms[];
+
+
/** Convert a string containing a platform name into a Platform enum value. */
extern Platform parsePlatform(const String &str);
extern const char *getPlatformCode(Platform id);