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

[DEV] base test for mac dev

Browse Source
This commit is contained in:
Edouard DUPIN 2013-04-16 22:43:06 +02:00
parent 4ffe6c3427
commit 7ef816f50c
2 changed files with 48 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
etk/os/FSNode.cpp
View File

@ -141,31 +141,53 @@ void etk::InitDefaultFolder(const char * applName)
TK_DBG_MODE("Find Basic running PATH : \"" << baseRunPath << "\""); TK_DBG_MODE("Find Basic running PATH : \"" << baseRunPath << "\"");
#ifndef __TARGET_OS__Android #ifndef __TARGET_OS__Android
#ifdef __TARGET_OS__MacOs
#ifdef MODE_RELEASE #ifdef MODE_RELEASE
baseFolderData = "/usr/share/"; baseFolderData = "/usr/share/";
#else
if (!getcwd(cCurrentPath, FILENAME_MAX)) {
baseFolderData = ".";
} else {
cCurrentPath[FILENAME_MAX - 1] = '\0';
baseFolderData = cCurrentPath;
}
baseFolderData += "/out/MacOs/debug/staging/Resources/";
#endif
baseFolderDataUser = baseFolderHome;
baseFolderDataUser += "/.local/share/";
baseFolderDataUser += baseApplName;
baseFolderDataUser += "/";
baseFolderCache = "/tmp/";
baseFolderCache += baseApplName;
baseFolderCache += "/";
#else #else
if (!getcwd(cCurrentPath, FILENAME_MAX)) { #ifdef MODE_RELEASE
baseFolderData = "."; baseFolderData = "/usr/share/";
} else { #else
cCurrentPath[FILENAME_MAX - 1] = '\0'; if (!getcwd(cCurrentPath, FILENAME_MAX)) {
baseFolderData = cCurrentPath; baseFolderData = ".";
} } else {
baseFolderData += "/out/Linux/debug/staging/"; cCurrentPath[FILENAME_MAX - 1] = '\0';
baseFolderData = cCurrentPath;
}
baseFolderData += "/out/Linux/debug/staging/";
baseFolderData += baseApplName;
baseFolderData += "/usr/share/";
#endif
baseFolderData += baseApplName; baseFolderData += baseApplName;
baseFolderData += "/usr/share/"; baseFolderData += "/";
baseFolderDataUser = baseFolderHome;
baseFolderDataUser += "/.local/share/";
baseFolderDataUser += baseApplName;
baseFolderDataUser += "/";
baseFolderCache = "/tmp/";
baseFolderCache += baseApplName;
baseFolderCache += "/";
#endif #endif
baseFolderData += baseApplName;
baseFolderData += "/";
baseFolderDataUser = baseFolderHome;
baseFolderDataUser += "/.local/share/";
baseFolderDataUser += baseApplName;
baseFolderDataUser += "/";
baseFolderCache = "/tmp/";
baseFolderCache += baseApplName;
baseFolderCache += "/";
#endif #endif
#ifdef MODE_RELEASE #ifdef MODE_RELEASE
if (strncmp("ewolApplNoName",applName, 256) != 0) { if (strncmp("ewolApplNoName",applName, 256) != 0) {

5
etk/types.h
View File

@ -15,7 +15,9 @@
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>
#ifdef __TARGET_OS__MacOs
#include <stdint.h>
#else
#ifndef __int8_t_defined #ifndef __int8_t_defined
# define __int8_t_defined # define __int8_t_defined
typedef signed char int8_t; typedef signed char int8_t;
@ -35,6 +37,7 @@
typedef unsigned long long int uint64_t; typedef unsigned long long int uint64_t;
# endif # endif
#endif #endif
#endif
typedef uint32_t uniChar_t; typedef uint32_t uniChar_t;