atria-soft/etk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] update IOs and MacOs basic data folder

Browse Source
This commit is contained in:
Edouard DUPIN 2015-09-24 21:16:00 +02:00
parent 11fb148e96
commit 705ac5183e
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
etk/os/FSNode.cpp
View File

@ -40,12 +40,12 @@ extern "C" {
#undef __class__ #undef __class__
#define __class__ "FSNode" #define __class__ "FSNode"
//#define TK_DBG_MODE TK_VERBOSE #define TK_DBG_MODE TK_VERBOSE
#define TK_DBG_MODE TK_DEBUG //#define TK_DBG_MODE TK_DEBUG
std::string etk::simplifyPath(std::string _input) { std::string etk::simplifyPath(std::string _input) {
// step 1 : for windows change \ in /: // step 1 : for windows change \ in /:
TK_DBG_MODE("Simplify(1) : '" << _input << "'"); TK_DEBUG("Simplify(1) : '" << _input << "'");
size_t currentPos = 0; size_t currentPos = 0;
if (_input.size() == 0) { if (_input.size() == 0) {
return _input; return _input;
@ -124,7 +124,7 @@ std::string etk::simplifyPath(std::string _input) {
|| _input == "/.") { || _input == "/.") {
_input = "/"; _input = "/";
} }
TK_DBG_MODE("Simplify(6) : '" << _input << "'"); TK_DEBUG("Simplify(end) : '" << _input << "'");
return _input; return _input;
} }
@ -386,10 +386,10 @@ void etk::initDefaultFolder(const char* _applName) {
#elif defined(__TARGET_OS__IOs) #elif defined(__TARGET_OS__IOs)
baseFolderData += "/share/"; baseFolderData += "/share/";
#else #else
baseFolderData += "/../share"; baseFolderData += "/../share/";
baseFolderData += binaryName;
baseFolderData += "/";
#endif #endif
baseFolderData += binaryName;
baseFolderData += "/";
baseFolderData = simplifyPath(baseFolderData); baseFolderData = simplifyPath(baseFolderData);
#if defined(__TARGET_OS__Linux) #if defined(__TARGET_OS__Linux)
{ {