// static member
-std::vector<std::string> Resource::searchPaths_;
+std::vector<std::string> Resource::gSearchPaths;
-void Resource::addSearchPath(const std::string& directory)
+void Resource::addSearchPaths(const std::string& path)
{
- std::string path(directory);
+ std::vector<std::string> paths;
+ boost::split(paths, path, boost::is_any_of(":"));
- ASSERT(path.length() > 0 && "empty search path string");
+ addSearchPaths(paths);
+}
+
+void Resource::addSearchPaths(const std::vector<std::string>& path)
+{
+ std::vector<std::string>::const_iterator it;
- // add a slash if there isn't one already
- if (*path.rbegin() != '/')
+ for (it = path.begin(); it != path.end(); ++it)
{
- path += '/';
- }
+ std::string onePath(*it);
+
+ ASSERT(!onePath.empty() && "empty search path string");
+
+ // add a slash if there isn't one already
+ if (*onePath.rbegin() != '/')
+ {
+ onePath += '/';
+ }
#if defined(_WIN32) || defined(__WIN32__)
- boost::replace_all(path, "/", "\\");
+ boost::replace_all(onePath, "/", "\\");
#endif
- searchPaths_.push_back(path);
+ gSearchPaths.push_back(onePath);
+ logInfo << "added search path " << onePath << std::endl;
+ }
}
+
std::string Resource::getPath(const std::string& name)
{
std::vector<std::string>::iterator it;
boost::replace_all(path, "/", "\\");
#endif
- for (it = searchPaths_.begin(); it != searchPaths_.end(); ++it)
+ for (it = gSearchPaths.begin(); it != gSearchPaths.end(); ++it)
{
std::string fullPath(*it);
fullPath += path;