ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CommonPaths: Rename DOLPHIN_DATA_DIR to NORMAL_USER_DIR

This commit is contained in:
OatmealDome 2023-01-17 14:13:36 -05:00
parent 846eef2a05
commit 5e3d77adae
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/Common/CommonPaths.h
View File

@ -11,20 +11,20 @@
#define ROOT_DIR "."
#ifdef _WIN32
#define PORTABLE_USER_DIR "User"
#define DOLPHIN_DATA_DIR "Dolphin"
#define NORMAL_USER_DIR "Dolphin"
#elif defined __APPLE__
// On OS X, PORTABLE_USER_DIR exists within the .app, but *always* reference
// the copy in Application Support instead! (Copied on first run)
// You can use the File::GetUserPath() util for this
#define PORTABLE_USER_DIR "Contents/Resources/User"
#define DOLPHIN_DATA_DIR "Library/Application Support/Dolphin"
#define NORMAL_USER_DIR "Library/Application Support/Dolphin"
#elif defined ANDROID
#define PORTABLE_USER_DIR "user"
#define DOLPHIN_DATA_DIR "/sdcard/dolphin-emu"
#define NORMAL_USER_DIR "/sdcard/dolphin-emu"
#define NOMEDIA_FILE ".nomedia"
#else
#define PORTABLE_USER_DIR "user"
#define DOLPHIN_DATA_DIR "dolphin-emu"
#define NORMAL_USER_DIR "dolphin-emu"
#endif
// Dirs in both User and Sys

10
Source/Core/UICommon/UICommon.cpp
View File

@ -421,12 +421,12 @@ void SetUserDirectory(std::string custom_path)
#if defined(__APPLE__) || defined(ANDROID)
else
{
user_path = home_path + DOLPHIN_DATA_DIR DIR_SEP;
user_path = home_path + NORMAL_USER_DIR DIR_SEP;
}
#else
else
{
user_path = home_path + "." DOLPHIN_DATA_DIR DIR_SEP;
user_path = home_path + "." NORMAL_USER_DIR DIR_SEP;
if (!File::Exists(user_path))
{
@ -434,18 +434,18 @@ void SetUserDirectory(std::string custom_path)
std::string data_path =
std::string(data_home && data_home[0] == '/' ? data_home :
(home_path + ".local" DIR_SEP "share")) +
DIR_SEP DOLPHIN_DATA_DIR DIR_SEP;
DIR_SEP NORMAL_USER_DIR DIR_SEP;
const char* config_home = getenv("XDG_CONFIG_HOME");
std::string config_path =
std::string(config_home && config_home[0] == '/' ? config_home :
(home_path + ".config")) +
DIR_SEP DOLPHIN_DATA_DIR DIR_SEP;
DIR_SEP NORMAL_USER_DIR DIR_SEP;
const char* cache_home = getenv("XDG_CACHE_HOME");
std::string cache_path =
std::string(cache_home && cache_home[0] == '/' ? cache_home : (home_path + ".cache")) +
DIR_SEP DOLPHIN_DATA_DIR DIR_SEP;
DIR_SEP NORMAL_USER_DIR DIR_SEP;
File::SetUserPath(D_USER_IDX, data_path);
File::SetUserPath(D_CONFIG_IDX, config_path);