[Scummvm-cvs-logs] SF.net SVN: scummvm: [29104] scummvm/trunk/backends/platform/wince

[robinwatts at users.sourceforge.net]

Revision: 29104
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29104&view=rev
Author:   robinwatts
Date:     2007-09-26 12:12:17 -0700 (Wed, 26 Sep 2007)

Log Message:
-----------
Compile fixes for WinCE build

 * wince-sdl.h: sdl-common.h is now sdl.h. Also, copied in definition of
      DF_UPDATE_EXPAND_1_PIXEL as this was no longer offered by sdl.h

 * CELauncherDialog.cpp: Updated to use modified FilingSystemNode.

Modified Paths:
--------------
    scummvm/trunk/backends/platform/wince/CELauncherDialog.cpp
    scummvm/trunk/backends/platform/wince/wince-sdl.h

Modified: scummvm/trunk/backends/platform/wince/CELauncherDialog.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/CELauncherDialog.cpp	2007-09-26 19:11:19 UTC (rev 29103)
+++ scummvm/trunk/backends/platform/wince/CELauncherDialog.cpp	2007-09-26 19:12:17 UTC (rev 29104)
@@ -75,18 +75,18 @@
 void CELauncherDialog::automaticScanDirectory(const FilesystemNode &node) {
 	// First check if we have a recognized game in the current directory
 	FSList files;
-	node.listDir(files, FilesystemNode::kListFilesOnly);
+	node.getChildren(files, FilesystemNode::kListFilesOnly);
 	// detect
 	GameList candidates(PluginManager::instance().detectGames(files));
 	// insert
 	if (candidates.size() >= 1) {
 		GameDescriptor result = candidates[0];
-		result["path"] = node.path();
+		result["path"] = node.getPath();
 		addGameToConf(result);
 	}
 	// Then recurse on the subdirectories
 	FSList dirs;
-	node.listDir(dirs, FilesystemNode::kListDirectoriesOnly);
+	node.getChildren(dirs, FilesystemNode::kListDirectoriesOnly);
 	for (FSList::const_iterator currentDir = dirs.begin(); currentDir != dirs.end(); ++currentDir)
 		automaticScanDirectory(*currentDir);
 

Modified: scummvm/trunk/backends/platform/wince/wince-sdl.h
===================================================================
--- scummvm/trunk/backends/platform/wince/wince-sdl.h	2007-09-26 19:11:19 UTC (rev 29103)
+++ scummvm/trunk/backends/platform/wince/wince-sdl.h	2007-09-26 19:12:17 UTC (rev 29104)
@@ -30,7 +30,7 @@
 #include "common/system.h"
 #include "graphics/scaler.h"
 #include "backends/intern.h"
-#include "backends/platform/sdl/sdl-common.h"
+#include "backends/platform/sdl/sdl.h"
 
 #include "CEGUI.h"
 #include "CEKeys.h"
@@ -258,6 +258,12 @@
 	} zoneDesc;
 
 	static zoneDesc _zones[TOTAL_ZONES];
+
+	// Copied from old sdl-common.h because we still use it and
+	// sdl-common.h no longer supplies it.
+	enum {
+		DF_UPDATE_EXPAND_1_PIXEL	= 1 << 1
+	};
 };
 
 #endif


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