diff options
| author | Max Horn | 2007-09-18 21:34:57 +0000 |
|---|---|---|
| committer | Max Horn | 2007-09-18 21:34:57 +0000 |
| commit | ab8997f64d069d28c33aca830a6b0574bf6fcda3 (patch) | |
| tree | 524afd9f62caa5e1013183a9f45ad5132782a167 /common | |
| parent | 162460d18ab91c213e4e57c3deea4b591b60a966 (diff) | |
| download | scummvm-rg350-ab8997f64d069d28c33aca830a6b0574bf6fcda3.tar.gz scummvm-rg350-ab8997f64d069d28c33aca830a6b0574bf6fcda3.tar.bz2 scummvm-rg350-ab8997f64d069d28c33aca830a6b0574bf6fcda3.zip | |
Fix linker issues when doing a plugin build, and (hopefully) also on Windows
svn-id: r28950
Diffstat (limited to 'common')
| -rw-r--r-- | common/fs.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/common/fs.cpp b/common/fs.cpp index 86cdfe41d6..d395686be3 100644 --- a/common/fs.cpp +++ b/common/fs.cpp @@ -25,9 +25,9 @@ #include "common/stdafx.h" #include "common/util.h" #include "backends/fs/abstract-fs.h" -#include "backends/fs/fs-factory-maker.cpp" +#include "backends/fs/abstract-fs-factory.h" -/* +/** * Simple DOS-style pattern matching function (understands * and ? like used in DOS). * Taken from exult/files/listfiles.cc */ @@ -82,7 +82,7 @@ FilesystemNode::FilesystemNode(const FilesystemNode &node) { } FilesystemNode::FilesystemNode(const Common::String &p) { - AbstractFilesystemFactory *factory = makeFSFactory(); + AbstractFilesystemFactory *factory = AbstractFilesystemFactory::makeFSFactory(); if (p.empty() || p == ".") _realNode = factory->makeCurrentDirectoryFileNode(); @@ -234,6 +234,9 @@ bool FilesystemNode::lookupFile(FSList &results, FilesystemNode &dir, Common::St return ((matches > 0) ? true : false); } +// HACK HACK HACK +extern const char *lastPathComponent(const Common::String &str); + int FilesystemNode::lookupFileRec(FSList &results, FilesystemNode &dir, Common::String &filename, bool hidden, bool exhaustive) const { FSList entries; |