aboutsummaryrefslogtreecommitdiff
path: root/backends
diff options
context:
space:
mode:
authorRobin Watts2007-09-26 19:12:17 +0000
committerRobin Watts2007-09-26 19:12:17 +0000
commitca0d93a1d2de65f122f0b9466f15225a26ac65ed (patch)
tree5f58cec2f5f77d8867f874dec7278fa4a7558334 /backends
parentaf9abde7dd29e9098a4b784da651eabfe4318663 (diff)
downloadscummvm-rg350-ca0d93a1d2de65f122f0b9466f15225a26ac65ed.tar.gz
scummvm-rg350-ca0d93a1d2de65f122f0b9466f15225a26ac65ed.tar.bz2
scummvm-rg350-ca0d93a1d2de65f122f0b9466f15225a26ac65ed.zip
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. svn-id: r29104
Diffstat (limited to 'backends')
-rw-r--r--backends/platform/wince/CELauncherDialog.cpp6
-rw-r--r--backends/platform/wince/wince-sdl.h8
2 files changed, 10 insertions, 4 deletions
diff --git a/backends/platform/wince/CELauncherDialog.cpp b/backends/platform/wince/CELauncherDialog.cpp
index aac2fdbe7c..a87cb429f8 100644
--- a/backends/platform/wince/CELauncherDialog.cpp
+++ b/backends/platform/wince/CELauncherDialog.cpp
@@ -75,18 +75,18 @@ void CELauncherDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 d
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);
diff --git a/backends/platform/wince/wince-sdl.h b/backends/platform/wince/wince-sdl.h
index ab1e896bf9..3a9ffaf089 100644
--- a/backends/platform/wince/wince-sdl.h
+++ b/backends/platform/wince/wince-sdl.h
@@ -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 @@ private:
} 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