[Scummvm-cvs-logs] CVS: scummvm/base gameDetector.cpp,1.114,1.115 main.cpp,1.78,1.79

[Max Horn]

Update of /cvsroot/scummvm/scummvm/base
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31171/base

Modified Files:
	gameDetector.cpp main.cpp 
Log Message:
Patch #1181544 (AmigaOS 4 changes)

Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/gameDetector.cpp,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- gameDetector.cpp	24 Apr 2005 12:21:52 -0000	1.114
+++ gameDetector.cpp	9 May 2005 21:21:17 -0000	1.115
@@ -617,7 +617,7 @@
 		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() != '\\') {

Index: main.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/main.cpp,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- main.cpp	5 May 2005 12:03:40 -0000	1.78
+++ main.cpp	9 May 2005 21:21:17 -0000	1.79
@@ -122,6 +122,11 @@
 #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")