From 1674575dc09f8f647ce464b5b98df2938e2ad0e8 Mon Sep 17 00:00:00 2001 From: Eduardo Bart Date: Wed, 23 Jan 2013 13:43:39 -0200 Subject: [PATCH] Minor fix --- CMakeLists.txt | 2 +- src/framework/core/resourcemanager.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ffbd3348..f5cac52b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,7 +50,7 @@ endif() set(DATA_INSTALL_DIR share/${PROJECT_NAME}) install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin) install(FILES README.md BUGS LICENSE AUTHORS init.lua ${PROJECT_NAME}rc.lua DESTINATION ${DATA_INSTALL_DIR}) -install(DIRECTORY modules DESTINATION ${DATA_INSTALL_DIR} PATTERN ".git" EXCLUDE) +install(DIRECTORY data modules DESTINATION ${DATA_INSTALL_DIR} PATTERN ".git" EXCLUDE) # add "make run" add_custom_target(run COMMAND ${PROJECT_NAME} DEPENDS ${PROJECT_NAME} WORKING_DIRECTORY ${CMAKE_PROJECT_DIR}) diff --git a/src/framework/core/resourcemanager.cpp b/src/framework/core/resourcemanager.cpp index 6ceea88e..70455e95 100644 --- a/src/framework/core/resourcemanager.cpp +++ b/src/framework/core/resourcemanager.cpp @@ -48,7 +48,7 @@ bool ResourceManager::discoverWorkDir(const std::string& existentFile) std::string possiblePaths[] = { g_resources.getCurrentDir(), g_resources.getBaseDir(), g_resources.getBaseDir() + "../", - g_resources.getBaseDir() + "../share/" + g_app.getCompactName() }; + g_resources.getBaseDir() + "../share/" + g_app.getCompactName() + "/" }; bool found = false; for(const std::string& dir : possiblePaths) { if(!PHYSFS_addToSearchPath(dir.c_str(), 0))