diff options
| author | Max Horn | 2005-05-09 21:21:21 +0000 |
|---|---|---|
| committer | Max Horn | 2005-05-09 21:21:21 +0000 |
| commit | 52bbc867979b1453f98191718c3eca726cc9ff8e (patch) | |
| tree | 4bf1084cc670b2fff715916420c604684fa81135 /base | |
| parent | 1c6788797ee3a5f4790ae1e42fa9321478f62c60 (diff) | |
| download | scummvm-rg350-52bbc867979b1453f98191718c3eca726cc9ff8e.tar.gz scummvm-rg350-52bbc867979b1453f98191718c3eca726cc9ff8e.tar.bz2 scummvm-rg350-52bbc867979b1453f98191718c3eca726cc9ff8e.zip | |
Patch #1181544 (AmigaOS 4 changes)
svn-id: r18011
Diffstat (limited to 'base')
| -rw-r--r-- | base/gameDetector.cpp | 2 | ||||
| -rw-r--r-- | base/main.cpp | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/base/gameDetector.cpp b/base/gameDetector.cpp index a3b1fcdc32..aa08306e75 100644 --- a/base/gameDetector.cpp +++ b/base/gameDetector.cpp @@ -617,7 +617,7 @@ bool GameDetector::detectMain() { warning("No path was provided. Assuming the data files are in the current directory"); gameDataPath = "./"; } else if (gameDataPath.lastChar() != '/' -#ifdef __MORPHOS__ +#if defined(__MORPHOS__) || defined(__amigaos4__) && gameDataPath.lastChar() != ':' #endif && gameDataPath.lastChar() != '\\') { diff --git a/base/main.cpp b/base/main.cpp index bddbbed2c2..287b0a891a 100644 --- a/base/main.cpp +++ b/base/main.cpp @@ -122,6 +122,11 @@ const char *gScummVMFeatures = "" #endif ; +#if defined(__amigaos4__) +// Set the stack cookie, 640 KB should be enough for everyone +const char* stackCookie = "$STACK: 655360\0"; +#endif + #if defined(WIN32) && defined(NO_CONSOLE) #include <cstdio> #define STDOUT_FILE TEXT("stdout.txt") |