gesche
/
tibia-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix some issues with the current working directory

This commit is contained in:
Eduardo Bart 2012-07-16 21:30:15 -03:00
parent 59fc3d5f77
commit c131d29b5f
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/framework/CMakeLists.txt
View File

@ -155,7 +155,7 @@ if(WIN32)
endif() endif()
set(Boost_USE_MULTITHREADED ON) set(Boost_USE_MULTITHREADED ON)
set(Boost_USE_STATIC_LIBS ON) set(Boost_USE_STATIC_LIBS ON)
find_package(Boost COMPONENTS system REQUIRED) find_package(Boost COMPONENTS system filesystem REQUIRED)
#find lua #find lua
if(LUAJIT) if(LUAJIT)

14
src/framework/core/resourcemanager.cpp
View File

@ -27,6 +27,7 @@
#include <framework/luaengine/luainterface.h> #include <framework/luaengine/luainterface.h>
#include <physfs.h> #include <physfs.h>
#include <boost/filesystem.hpp>
ResourceManager g_resources; ResourceManager g_resources;
@ -44,8 +45,7 @@ void ResourceManager::discoverWorkDir(const std::string& appName, const std::str
{ {
// search for modules directory // search for modules directory
std::string sep = PHYSFS_getDirSeparator(); std::string sep = PHYSFS_getDirSeparator();
std::string possiblePaths[] = { "", std::string possiblePaths[] = { boost::filesystem::current_path().generic_string() + sep,
g_resources.getBaseDir(),
g_resources.getBaseDir() + ".." + sep, g_resources.getBaseDir() + ".." + sep,
g_resources.getBaseDir() + ".." + sep + "share" + sep + appName + sep, g_resources.getBaseDir() + ".." + sep + "share" + sep + appName + sep,
g_resources.getBaseDir() + appName + sep }; g_resources.getBaseDir() + appName + sep };
@ -80,15 +80,7 @@ bool ResourceManager::setupUserWriteDir(const std::string& appWriteDirName)
bool ResourceManager::setWriteDir(const std::string& writeDir, bool create) bool ResourceManager::setWriteDir(const std::string& writeDir, bool create)
{ {
if(!PHYSFS_setWriteDir(writeDir.c_str()) && !create) { boost::filesystem::create_directory(writeDir);
g_logger.error(stdext::format("Unable to set write directory '%s': %s", writeDir, PHYSFS_getLastError()));
return false;
}
if(!PHYSFS_mkdir(writeDir.c_str())) {
g_logger.error(stdext::format("Unable to create write directory '%s': %s", writeDir, PHYSFS_getLastError()));
return false;
}
if(!PHYSFS_setWriteDir(writeDir.c_str())) { if(!PHYSFS_setWriteDir(writeDir.c_str())) {
g_logger.error(stdext::format("Unable to set write directory '%s': %s", writeDir, PHYSFS_getLastError())); g_logger.error(stdext::format("Unable to set write directory '%s': %s", writeDir, PHYSFS_getLastError()));