From 52bbc867979b1453f98191718c3eca726cc9ff8e Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 9 May 2005 21:21:21 +0000
Subject: Patch #1181544 (AmigaOS 4 changes)

svn-id: r18011
---
 base/gameDetector.cpp | 2 +-
 base/main.cpp         | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'base')

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")
-- 
cgit v1.2.3