Minor fix
This commit is contained in:
parent
3f882d9e6c
commit
1674575dc0
|
@ -50,7 +50,7 @@ endif()
|
||||||
set(DATA_INSTALL_DIR share/${PROJECT_NAME})
|
set(DATA_INSTALL_DIR share/${PROJECT_NAME})
|
||||||
install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
|
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(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 "make run"
|
||||||
add_custom_target(run COMMAND ${PROJECT_NAME} DEPENDS ${PROJECT_NAME} WORKING_DIRECTORY ${CMAKE_PROJECT_DIR})
|
add_custom_target(run COMMAND ${PROJECT_NAME} DEPENDS ${PROJECT_NAME} WORKING_DIRECTORY ${CMAKE_PROJECT_DIR})
|
||||||
|
|
|
@ -48,7 +48,7 @@ bool ResourceManager::discoverWorkDir(const std::string& existentFile)
|
||||||
std::string possiblePaths[] = { g_resources.getCurrentDir(),
|
std::string possiblePaths[] = { g_resources.getCurrentDir(),
|
||||||
g_resources.getBaseDir(),
|
g_resources.getBaseDir(),
|
||||||
g_resources.getBaseDir() + "../",
|
g_resources.getBaseDir() + "../",
|
||||||
g_resources.getBaseDir() + "../share/" + g_app.getCompactName() };
|
g_resources.getBaseDir() + "../share/" + g_app.getCompactName() + "/" };
|
||||||
bool found = false;
|
bool found = false;
|
||||||
for(const std::string& dir : possiblePaths) {
|
for(const std::string& dir : possiblePaths) {
|
||||||
if(!PHYSFS_addToSearchPath(dir.c_str(), 0))
|
if(!PHYSFS_addToSearchPath(dir.c_str(), 0))
|
||||||
|
|
Loading…
Reference in New Issue