ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix_2073'

Browse Source
This commit is contained in:
hiker 2015-04-16 08:17:36 +10:00
commit ad2ca0f394
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/io/file_manager.cpp
View File

@ -160,19 +160,19 @@ FileManager::FileManager()
#ifdef __APPLE__
else if( macSetBundlePathIfRelevant( root_dir ) ) { root_dir = root_dir + "data/"; }
#endif
else if(m_file_system->existFile("data"))
else if(m_file_system->existFile("data/stk_config.xml"))
root_dir = "data/" ;
else if(m_file_system->existFile("../data"))
else if(m_file_system->existFile("../data/stk_config.xml"))
root_dir = "../data/" ;
else if(m_file_system->existFile("../../data"))
else if(m_file_system->existFile("../../data/stk_config.xml"))
root_dir = "../../data/" ;
// Test for old style build environment, with executable in root of stk
else if(m_file_system->existFile(exe_path+"data"))
else if(m_file_system->existFile(exe_path+"data/stk_config.xml"))
root_dir = (exe_path+"data/").c_str();
// Check for windows cmake style: bld/Debug/bin/supertuxkart.exe
else if (m_file_system->existFile(exe_path + "../../../data"))
else if (m_file_system->existFile(exe_path + "../../../data/stk_config.xml"))
root_dir = (exe_path + "../../../data/").c_str();
else if (m_file_system->existFile(exe_path + "../data"))
else if (m_file_system->existFile(exe_path + "../data/stk_config.xml"))
{
root_dir = exe_path.c_str();
root_dir += "../data/";