diff options
| author | bunnei <bunneidev@gmail.com> | 2014-12-13 04:12:12 +0100 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2014-12-13 04:12:12 +0100 |
| commit | a6791e4fc73dda4853c8363d8ecf5094dbedd0ab (patch) | |
| tree | 279039386bc3c63f2eda6530fa325334ddadb957 /src/common | |
| parent | Merge pull request #261 from neobrain/boost (diff) | |
| parent | APT_U: Added GetSharedFont service function. (diff) | |
| download | yuzu-a6791e4fc73dda4853c8363d8ecf5094dbedd0ab.tar yuzu-a6791e4fc73dda4853c8363d8ecf5094dbedd0ab.tar.gz yuzu-a6791e4fc73dda4853c8363d8ecf5094dbedd0ab.tar.bz2 yuzu-a6791e4fc73dda4853c8363d8ecf5094dbedd0ab.tar.lz yuzu-a6791e4fc73dda4853c8363d8ecf5094dbedd0ab.tar.xz yuzu-a6791e4fc73dda4853c8363d8ecf5094dbedd0ab.tar.zst yuzu-a6791e4fc73dda4853c8363d8ecf5094dbedd0ab.zip | |
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/common_paths.h | 17 | ||||
| -rw-r--r-- | src/common/file_util.cpp | 14 | ||||
| -rw-r--r-- | src/common/file_util.h | 1 |
3 files changed, 6 insertions, 26 deletions
diff --git a/src/common/common_paths.h b/src/common/common_paths.h index ae08d082a..42e1a29c1 100644 --- a/src/common/common_paths.h +++ b/src/common/common_paths.h @@ -29,19 +29,6 @@ #endif #endif -// Shared data dirs (Sys and shared User for linux) -#ifdef _WIN32 - #define SYSDATA_DIR "sys" -#else - #ifdef DATA_DIR - #define SYSDATA_DIR DATA_DIR "sys" - #define SHARED_USER_DIR DATA_DIR USERDATA_DIR DIR_SEP - #else - #define SYSDATA_DIR "sys" - #define SHARED_USER_DIR ROOT_DIR DIR_SEP USERDATA_DIR DIR_SEP - #endif -#endif - // Dirs in both User and Sys #define EUR_DIR "EUR" #define USA_DIR "USA" @@ -53,6 +40,7 @@ #define MAPS_DIR "maps" #define CACHE_DIR "cache" #define SDMC_DIR "sdmc" +#define SYSDATA_DIR "sysdata" #define SHADERCACHE_DIR "shader_cache" #define STATESAVES_DIR "state_saves" #define SCREENSHOTS_DIR "screenShots" @@ -70,6 +58,9 @@ #define DEBUGGER_CONFIG "debugger.ini" #define LOGGER_CONFIG "logger.ini" +// Sys files +#define SHARED_FONT "shared_font.bin" + // Files in the directory returned by GetUserPath(D_LOGS_IDX) #define MAIN_LOG "emu.log" diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp index 6c4860503..7579d8c0f 100644 --- a/src/common/file_util.cpp +++ b/src/common/file_util.cpp @@ -676,6 +676,7 @@ const std::string& GetUserPath(const unsigned int DirIDX, const std::string &new paths[D_MAPS_IDX] = paths[D_USER_IDX] + MAPS_DIR DIR_SEP; paths[D_CACHE_IDX] = paths[D_USER_IDX] + CACHE_DIR DIR_SEP; paths[D_SDMC_IDX] = paths[D_USER_IDX] + SDMC_DIR DIR_SEP; + paths[D_SYSDATA_IDX] = paths[D_USER_IDX] + SYSDATA_DIR DIR_SEP; paths[D_SHADERCACHE_IDX] = paths[D_USER_IDX] + SHADERCACHE_DIR DIR_SEP; paths[D_SHADERS_IDX] = paths[D_USER_IDX] + SHADERS_DIR DIR_SEP; paths[D_STATESAVES_IDX] = paths[D_USER_IDX] + STATESAVES_DIR DIR_SEP; @@ -753,19 +754,6 @@ const std::string& GetUserPath(const unsigned int DirIDX, const std::string &new return paths[DirIDX]; } -//std::string GetThemeDir(const std::string& theme_name) -//{ -// std::string dir = FileUtil::GetUserPath(D_THEMES_IDX) + theme_name + "/"; -// -//#if !defined(_WIN32) -// // If theme does not exist in user's dir load from shared directory -// if (!FileUtil::Exists(dir)) -// dir = SHARED_USER_DIR THEMES_DIR "/" + theme_name + "/"; -//#endif -// -// return dir; -//} - size_t WriteStringToFile(bool text_file, const std::string &str, const char *filename) { return FileUtil::IOFile(filename, text_file ? "w" : "wb").WriteBytes(str.data(), str.size()); diff --git a/src/common/file_util.h b/src/common/file_util.h index beaf7174a..a9d48cfe8 100644 --- a/src/common/file_util.h +++ b/src/common/file_util.h @@ -27,6 +27,7 @@ enum { D_STATESAVES_IDX, D_SCREENSHOTS_IDX, D_SDMC_IDX, + D_SYSDATA_IDX, D_HIRESTEXTURES_IDX, D_DUMP_IDX, D_DUMPFRAMES_IDX, |