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

Change the config/data dirs from "melonds" to "melonDS" for consistency.

This commit is contained in:
Nadia Holmquist Pedersen 2019-12-19 02:52:34 +01:00
parent 43535c873a
commit c5623c4dcd
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libui_sdl/CMakeLists.txt
View File

@ -68,5 +68,5 @@ endif ()
install(FILES ../../net.kuribo64.melonDS.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
install(FILES ../../icon/melon_256x256.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps RENAME net.kuribo64.melonDS.png)
install(FILES ../../romlist.bin DESTINATION ${CMAKE_INSTALL_PREFIX}/share/melonds)
install(FILES ../../romlist.bin DESTINATION ${CMAKE_INSTALL_PREFIX}/share/melonDS)
install(TARGETS melonDS RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)

8
src/libui_sdl/Platform.cpp
View File

@ -148,7 +148,7 @@ FILE* OpenLocalFile(const char* path, const char* mode)
else
{
// Check user configuration directory
std::string confpath = std::string(g_get_user_config_dir()) + "/melonds/";
std::string confpath = std::string(g_get_user_config_dir()) + "/melonDS/";
g_mkdir_with_parents(confpath.c_str(), 0755);
fullpath = confpath + path;
}
@ -158,7 +158,7 @@ FILE* OpenLocalFile(const char* path, const char* mode)
FILE* OpenDataFile(const char* path)
{
const char* melondir = "melonds";
const char* melondir = "melonDS";
const char* const* sys_dirs = g_get_system_data_dirs();
const char* user_dir = g_get_user_data_dir();
@ -238,7 +238,7 @@ FILE* OpenLocalFile(const char* path, const char* mode)
emudirpath[pathlen] = '\0';
}
// Locations are application directory, and AppData/melonDS on Windows or XDG_CONFIG_HOME/melonds on Linux
// Locations are application directory, and AppData/melonDS on Windows or XDG_CONFIG_HOME/melonDS on Linux
FILE* f;
@ -300,7 +300,7 @@ FILE* OpenLocalFile(const char* path, const char* mode)
{
// Now check XDG_CONFIG_HOME
// TODO: check for memory leak there
std::string fullpath = std::string(g_get_user_config_dir()) + "/melonds/" + path;
std::string fullpath = std::string(g_get_user_config_dir()) + "/melonDS/" + path;
f = OpenFile(fullpath.c_str(), mode, true);
if (f) { delete[] emudirpath; return f; }
}