[Scummvm-cvs-logs] CVS: scummvm/base engine.cpp,1.52,1.53 main.cpp,1.96,1.97

Eugene Sandulenko sev at users.sourceforge.net
Sat Nov 26 18:37:01 CET 2005


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

Modified Files:
	engine.cpp main.cpp 
Log Message:
Patch #1341626: "New GP32 port"


Index: engine.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/engine.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- engine.cpp	23 Nov 2005 19:11:32 -0000	1.52
+++ engine.cpp	27 Nov 2005 02:35:57 -0000	1.53
@@ -156,13 +156,16 @@
 	vsnprintf(buf_input, STRINGBUFLEN, s, va);
 	va_end(va);
 
+#ifndef __GP32__
 	if (g_engine) {
 		g_engine->errorString(buf_input, buf_output);
 	} else {
 		strcpy(buf_output, buf_input);
 	}
-
-#ifdef __GP32__ //ph0x FIXME?
+#else
+	strcpy(buf_output, buf_input);
+#endif
+#ifdef __GP32__
 	printf("ERROR: %s\n", buf_output);
 #else
 #ifndef _WIN32_WCE

Index: main.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/main.cpp,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- main.cpp	23 Nov 2005 19:11:32 -0000	1.96
+++ main.cpp	27 Nov 2005 02:35:57 -0000	1.97
@@ -321,7 +321,7 @@
 
 #ifdef _WIN32_WCE
 extern "C" int scummvm_main(GameDetector &detector, int argc, char *argv[]) {
-#elif defined(__PLAYSTATION2__) || defined(__PSP__)
+#elif defined(__PLAYSTATION2__) || defined(__PSP__) || defined(__GP32__)
 extern "C" int scummvm_main(int argc, char *argv[]) {
 #else
 extern "C" int main(int argc, char *argv[]) {





More information about the Scummvm-git-logs mailing list