mirror of
https://github.com/libretro/scummvm.git
synced 2025-01-06 18:00:44 +00:00
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
This commit is contained in:
parent
af9abde7dd
commit
ca0d93a1d2
@ -75,18 +75,18 @@ void CELauncherDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 d
|
|||||||
void CELauncherDialog::automaticScanDirectory(const FilesystemNode &node) {
|
void CELauncherDialog::automaticScanDirectory(const FilesystemNode &node) {
|
||||||
// First check if we have a recognized game in the current directory
|
// First check if we have a recognized game in the current directory
|
||||||
FSList files;
|
FSList files;
|
||||||
node.listDir(files, FilesystemNode::kListFilesOnly);
|
node.getChildren(files, FilesystemNode::kListFilesOnly);
|
||||||
// detect
|
// detect
|
||||||
GameList candidates(PluginManager::instance().detectGames(files));
|
GameList candidates(PluginManager::instance().detectGames(files));
|
||||||
// insert
|
// insert
|
||||||
if (candidates.size() >= 1) {
|
if (candidates.size() >= 1) {
|
||||||
GameDescriptor result = candidates[0];
|
GameDescriptor result = candidates[0];
|
||||||
result["path"] = node.path();
|
result["path"] = node.getPath();
|
||||||
addGameToConf(result);
|
addGameToConf(result);
|
||||||
}
|
}
|
||||||
// Then recurse on the subdirectories
|
// Then recurse on the subdirectories
|
||||||
FSList dirs;
|
FSList dirs;
|
||||||
node.listDir(dirs, FilesystemNode::kListDirectoriesOnly);
|
node.getChildren(dirs, FilesystemNode::kListDirectoriesOnly);
|
||||||
for (FSList::const_iterator currentDir = dirs.begin(); currentDir != dirs.end(); ++currentDir)
|
for (FSList::const_iterator currentDir = dirs.begin(); currentDir != dirs.end(); ++currentDir)
|
||||||
automaticScanDirectory(*currentDir);
|
automaticScanDirectory(*currentDir);
|
||||||
|
|
||||||
|
@ -30,7 +30,7 @@
|
|||||||
#include "common/system.h"
|
#include "common/system.h"
|
||||||
#include "graphics/scaler.h"
|
#include "graphics/scaler.h"
|
||||||
#include "backends/intern.h"
|
#include "backends/intern.h"
|
||||||
#include "backends/platform/sdl/sdl-common.h"
|
#include "backends/platform/sdl/sdl.h"
|
||||||
|
|
||||||
#include "CEGUI.h"
|
#include "CEGUI.h"
|
||||||
#include "CEKeys.h"
|
#include "CEKeys.h"
|
||||||
@ -258,6 +258,12 @@ private:
|
|||||||
} zoneDesc;
|
} zoneDesc;
|
||||||
|
|
||||||
static zoneDesc _zones[TOTAL_ZONES];
|
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
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user