diff options
| author | Strangerke | 2013-06-26 23:11:34 +0200 |
|---|---|---|
| committer | Strangerke | 2013-06-26 23:11:34 +0200 |
| commit | 6e2d567bca53b6ffee771b4105e2e73dbd73f5b4 (patch) | |
| tree | 9880f0c496263ffb6928248d495ce4172dabed18 /common/platform.cpp | |
| parent | ac387835e4527c1814919093b4e4bc9798d5742d (diff) | |
| parent | 6716fa39a6fb2a3925576288c256688c5aadd7e9 (diff) | |
| download | scummvm-rg350-6e2d567bca53b6ffee771b4105e2e73dbd73f5b4.tar.gz scummvm-rg350-6e2d567bca53b6ffee771b4105e2e73dbd73f5b4.tar.bz2 scummvm-rg350-6e2d567bca53b6ffee771b4105e2e73dbd73f5b4.zip | |
Merge branch 'master' of https://github.com/scummvm/scummvm into mortevielle
Conflicts:
engines/engines.mk
Diffstat (limited to 'common/platform.cpp')
| -rw-r--r-- | common/platform.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/common/platform.cpp b/common/platform.cpp index 9986048b48..20ed970385 100644 --- a/common/platform.cpp +++ b/common/platform.cpp @@ -31,7 +31,7 @@ const PlatformDescription g_platforms[] = { { "amiga", "ami", "amiga", "Amiga", kPlatformAmiga }, { "atari", "atari-st", "st", "Atari ST", kPlatformAtariST }, { "c64", "c64", "c64", "Commodore 64", kPlatformC64 }, - { "pc", "dos", "ibm", "DOS", kPlatformPC }, + { "pc", "dos", "ibm", "DOS", kPlatformDOS }, { "pc98", "pc98", "pc98", "PC-98", kPlatformPC98 }, { "wii", "wii", "wii", "Nintendo Wii", kPlatformWii }, { "coco3", "coco3", "coco3", "CoCo3", kPlatformCoCo3 }, @@ -50,6 +50,8 @@ const PlatformDescription g_platforms[] = { { "playstation", "psx", "psx", "Sony PlayStation", kPlatformPSX }, { "cdi", "cdi", "cdi", "Philips CD-i", kPlatformCDi }, { "ios", "ios", "ios", "Apple iOS", kPlatformIOS }, + { "os2", "os2", "os2", "OS/2", kPlatformOS2 }, + { "beos", "beos", "beos", "BeOS", kPlatformBeOS }, { 0, 0, 0, "Default", kPlatformUnknown } }; |