Use XDG Directory Specification for Linux. See: http://standards.free…

Use XDG Directory Specification for Linux. See: http://standards.free… · hrydgard/ppsspp@132fe47

2 files changed

lines changed

Original file line number	Diff line number	Diff line change
`@@ -243,15 +243,24 @@ void NativeInit(int argc, const char argv[], const char savegame_directory, co`
`243`	`243`	`isMessagePending = false;`
`244`	`244`
`245`	`245`	`std::string user_data_path = savegame_directory;`
	`246`	`+#ifdef Q_OS_LINUX`
	`247`	`+char* config = getenv("XDG_CONFIG_HOME");`
	`248`	`+if (!config) {`
	`249`	`+ config = getenv("HOME");`
	`250`	`+strcat(config, "/.config");`
	`251`	`+ }`
	`252`	`+ std::string memcard_path = std::string(config) + "/ppsspp/";`
	`253`	`+#else`
`246`	`254`	`std::string memcard_path = QDir::homePath().toStdString() + "/.ppsspp/";`
	`255`	`+#endif`
`247`	`256`
`248`	`257`	`VFSRegister("", new DirectoryAssetReader("assets/"));`
`249`	`258`	`VFSRegister("", new DirectoryAssetReader(user_data_path.c_str()));`
`250`	`259`	`VFSRegister("", new AssetsAssetReader());`
`251`	`260`
`252`	`261`	`g_Config.AddSearchPath(user_data_path);`
`253`	`262`	`g_Config.AddSearchPath(memcard_path + "PSP/SYSTEM/");`
`254`		`- g_Config.SetDefaultPath(g_Config.memCardDirectory + "PSP/SYSTEM/");`
	`263`	`+ g_Config.SetDefaultPath(memcard_path + "PSP/SYSTEM/");`
`255`	`264`	`g_Config.Load();`
`256`	`265`	`i18nrepo.LoadIni(g_Config.sLanguageIni);`
`257`	`266`
`@@ -305,7 +314,7 @@ void NativeInit(int argc, const char argv[], const char savegame_directory, co`
`305`	`314`	`g_Config.currentDirectory = QDir::homePath().toStdString();`
`306`	`315`	`}`
`307`	`316`
`308`		`- g_Config.memCardDirectory = QDir::homePath().toStdString() + "/.ppsspp/";`
	`317`	`+ g_Config.memCardDirectory = memcard_path;`
`309`	`318`
`310`	`319`	`#if defined(Q_OS_LINUX)`
`311`	`320`	`std::string program_path = QCoreApplication::applicationDirPath().toStdString();`

Original file line number	Diff line number	Diff line change
`@@ -249,13 +249,11 @@ void NativeInit(int argc, const char *argv[],`
`249`	`249`	`// We want this to be FIRST.`
`250`	`250`	`#ifdef USING_QT_UI`
`251`	`251`	`VFSRegister("", new AssetsAssetReader());`
`252`		`-#else`
`253`		`-#if defined(BLACKBERRY) \|\| defined(IOS)`
	`252`	`+#elif defined(BLACKBERRY) \|\| defined(IOS)`
`254`	`253`	`// Packed assets are included in app`
`255`	`254`	`VFSRegister("", new DirectoryAssetReader(external_directory));`
`256`	`255`	`#else`
`257`	`256`	`VFSRegister("", new DirectoryAssetReader("assets/"));`
`258`		`-#endif`
`259`	`257`	`#endif`
`260`	`258`	`VFSRegister("", new DirectoryAssetReader(savegame_directory));`
`261`	`259`
`@@ -272,7 +270,12 @@ void NativeInit(int argc, const char *argv[],`
`272`	`270`	`g_Config.memCardDirectory = user_data_path;`
`273`	`271`	`g_Config.flash0Directory = std::string(external_directory) + "/flash0/";`
`274`	`272`	`#elif !defined(_WIN32)`
`275`		`- g_Config.memCardDirectory = std::string(getenv("HOME")) + "/.ppsspp/";`
	`273`	`+char* config = getenv("XDG_CONFIG_HOME");`
	`274`	`+if (!config) {`
	`275`	`+ config = getenv("HOME");`
	`276`	`+strcat(config, "/.config");`
	`277`	`+ }`
	`278`	`+ g_Config.memCardDirectory = std::string(config) + "/ppsspp/";`
`276`	`279`	`std::string program_path = File::GetExeDirectory();`
`277`	`280`	`if (program_path.empty())`
`278`	`281`	`g_Config.flash0Directory = g_Config.memCardDirectory + "/flash0/";`