[Scummvm-cvs-logs] SF.net SVN: scummvm: [22820] scummvm/trunk/base

[anotherguest at users.sourceforge.net]

Revision: 22820
Author:   anotherguest
Date:     2006-06-01 15:43:19 -0700 (Thu, 01 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22820&view=rev

Log Message:
-----------
Fixed problem when building and debugging using Symbian Emulator.

Modified Paths:
--------------
    scummvm/trunk/base/commandLine.cpp
    scummvm/trunk/base/engine.cpp
    scummvm/trunk/engines/lure/strings.cpp
Modified: scummvm/trunk/base/commandLine.cpp
===================================================================
--- scummvm/trunk/base/commandLine.cpp	2006-06-01 15:07:58 UTC (rev 22819)
+++ scummvm/trunk/base/commandLine.cpp	2006-06-01 22:43:19 UTC (rev 22820)
@@ -135,7 +135,7 @@
 ;
 #endif
 
-#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__))
+#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__) || defined (__SYMBIAN32__))
 static Common::String s_appName("scummvm");
 #else
 static const char *s_appName = "scummvm";
@@ -151,7 +151,7 @@
 	vsnprintf(buf, STRINGBUFLEN, s, va);
 	va_end(va);
 
-#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__))
+#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__) || defined (__SYMBIAN32__))
 	printf(USAGE_STRING, s_appName.c_str(), buf, s_appName.c_str(), s_appName.c_str());
 #endif
 	exit(1);
@@ -584,7 +584,8 @@
 
 		DetectedGameList candidates(PluginManager::instance().detectGames(files));
 		bool gameidDiffers = false;
-		for (DetectedGameList::iterator x = candidates.begin(); x != candidates.end(); ++x) {
+		DetectedGameList::iterator x;
+		for (x = candidates.begin(); x != candidates.end(); ++x) {
 			gameidDiffers |= (scumm_stricmp(gameid.c_str(), x->gameid.c_str()) != 0);
 		}
 		
@@ -606,7 +607,7 @@
 			success++;
 		}
 		
-		for (DetectedGameList::iterator x = candidates.begin(); x != candidates.end(); ++x) {
+		for (x = candidates.begin(); x != candidates.end(); ++x) {
 			printf("    gameid '%s', desc '%s', language '%s', platform '%s'\n",
 					x->gameid.c_str(),
 					x->description.c_str(),
@@ -639,7 +640,7 @@
 		printf("Features compiled in: %s\n", gScummVMFeatures);
 		return false;
 	} else if (command == "help") {
-#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__))
+#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__) || defined(__SYMBIAN32__))
 		printf(HELP_STRING, s_appName.c_str());
 #else
 		printf(HELP_STRING, s_appName);

Modified: scummvm/trunk/base/engine.cpp
===================================================================
--- scummvm/trunk/base/engine.cpp	2006-06-01 15:07:58 UTC (rev 22819)
+++ scummvm/trunk/base/engine.cpp	2006-06-01 22:43:19 UTC (rev 22820)
@@ -20,7 +20,7 @@
  */
 
 #include "common/stdafx.h"
-#if defined(WIN32)
+#if defined(WIN32) && !defined (__SYMBIAN32__)
 #include <malloc.h>
 #endif
 #include "base/engine.h"
@@ -101,7 +101,7 @@
 }
 
 void Engine::checkCD() {
-#if defined (WIN32) && !defined(_WIN32_WCE)
+#if defined (WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__)
 	// It is a known bug under Windows that games that play CD audio cause
 	// ScummVM to crash if the data files are read from the same CD. Check
 	// if this appears to be the case and issue a warning.
@@ -242,7 +242,7 @@
 }
 
 void checkHeap() {
-#if defined(WIN32)
+#if defined(WIN32) && !defined(__SYMBIAN32__)
 	if (_heapchk() != _HEAPOK) {
 		error("Heap is invalid!");
 	}

Modified: scummvm/trunk/engines/lure/strings.cpp
===================================================================
--- scummvm/trunk/engines/lure/strings.cpp	2006-06-01 15:07:58 UTC (rev 22819)
+++ scummvm/trunk/engines/lure/strings.cpp	2006-06-01 22:43:19 UTC (rev 22820)
@@ -256,6 +256,8 @@
 	}
 
 	error("Unknown bit sequence encountered when decoding string");
+
+	return 0;
 }
 
 void StringData::getString(uint16 stringId, char *dest, const char *hotspotName, 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.