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

more path updates 

Dolphin.ini moved to User/Config on linux
waiting for windows ppl to do their job:P


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1133 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2008-11-11 22:00:09 +00:00
parent 5bbde79642
commit 5e2142a901
3 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Source/Core/Common/Src/Paths.h
View File

@ -1,8 +1,18 @@
#ifndef PATHS_H #ifndef PATHS_H
#define PATHS_H #define PATHS_H
#ifdef _WIN32
#define PLUGIN_PREFIX ""
#define PLUGIN_SUFFIX ".dll"
#define DIR_SEP "\\"
#else
#define PLUGIN_PREFIX "lib"
#define PLUGIN_SUFFIX ".so"
#define DIR_SEP "/"
#endif
#define PLUGINS_DIR "Plugins" #define PLUGINS_DIR "Plugins"
#define DEFAULT_DATA_DIR "" #define DATA_DIR "."
#define USERDATA_DIR "User" #define USERDATA_DIR "User"
#define SYSDATA_DIR "Sys" #define SYSDATA_DIR "Sys"
@ -20,17 +30,15 @@
// Files // Files
#define DOLPHIN_CONFIG "Dolphin.ini" #define DOLPHIN_CONFIG "Dolphin.ini"
#define DEFAULT_GFX_PLUGIN "Plugin_VideoOGL" #define DEFAULT_GFX_PLUGIN PLUGIN_PREFIX "Plugin_VideoOGL" PLUGIN_SUFFIX
#define DEFAULT_DSP_PLUGIN "Plugin_DSP_HLE" #define DEFAULT_DSP_PLUGIN PLUGIN_PREFIX "Plugin_DSP_HLE" PLUGIN_SUFFIX
#define DEFAULT_PAD_PLUGIN "Plugin_PadSimple" #define DEFAULT_PAD_PLUGIN PLUGIN_PREFIX "Plugin_PadSimple" PLUGIN_SUFFIX
#define DEFAULT_WIIMOTE_PLUGIN "Plugin_Wiimote" #define DEFAULT_WIIMOTE_PLUGIN PLUGIN_PREFIX "Plugin_Wiimote" PLUGIN_SUFFIX
#ifdef _WIN32 // shorts
#define PLUGIN_SUFFIX ".dll" #ifndef _WIN32
#define DIR_SEP "\\" #define CONFIG_FILE DOLPHIN_CONFIG
#else #else
#define PLUGIN_SUFFIX ".so" #define CONFIG_FILE DATA_DIR DIR_SEP USERDATA_DIR DIR_SEP CONFIG_DIR DIR_SEP DOLPHIN_CONFIG
#define DIR_SEP "/"
#endif #endif
#endif // PATHS_H #endif // PATHS_H

14
Source/Core/DolphinWX/Src/Config.cpp
View File

@ -40,7 +40,7 @@ SConfig::~SConfig()
void SConfig::SaveSettings() void SConfig::SaveSettings()
{ {
IniFile ini; IniFile ini;
// ini.Load(DOLPHIN_CONFIG); // yes we must load first to not kill unknown stuff // ini.Load(CONFIG_FILE); // yes we must load first to not kill unknown stuff
// misc // misc
{ {
@ -78,21 +78,21 @@ void SConfig::SaveSettings()
ini.Set("Core", "RunCompareClient", m_LocalCoreStartupParameter.bRunCompareClient); ini.Set("Core", "RunCompareClient", m_LocalCoreStartupParameter.bRunCompareClient);
} }
ini.Save(DOLPHIN_CONFIG); ini.Save(CONFIG_FILE);
} }
void SConfig::LoadSettings() void SConfig::LoadSettings()
{ {
IniFile ini; IniFile ini;
ini.Load(DOLPHIN_CONFIG); ini.Load(CONFIG_FILE);
// hard coded default plugin // hard coded default plugin
{ {
m_DefaultGFXPlugin = PLUGINS_DIR DIR_SEP DEFAULT_GFX_PLUGIN PLUGIN_SUFFIX; m_DefaultGFXPlugin = PLUGINS_DIR DIR_SEP DEFAULT_GFX_PLUGIN;
m_DefaultDSPPlugin = PLUGINS_DIR DIR_SEP DEFAULT_DSP_PLUGIN PLUGIN_SUFFIX; m_DefaultDSPPlugin = PLUGINS_DIR DIR_SEP DEFAULT_DSP_PLUGIN;
m_DefaultPADPlugin = PLUGINS_DIR DIR_SEP DEFAULT_PAD_PLUGIN PLUGIN_SUFFIX; m_DefaultPADPlugin = PLUGINS_DIR DIR_SEP DEFAULT_PAD_PLUGIN;
m_DefaultWiiMotePlugin = PLUGINS_DIR DIR_SEP DEFAULT_WIIMOTE_PLUGIN PLUGIN_SUFFIX; m_DefaultWiiMotePlugin = PLUGINS_DIR DIR_SEP DEFAULT_WIIMOTE_PLUGIN;
} }
// misc // misc

8
Source/Core/DolphinWX/Src/PluginManager.cpp
View File

@ -40,14 +40,10 @@ void CPluginManager::ScanForPlugins(wxWindow* _wxWindow)
m_PluginInfos.clear(); m_PluginInfos.clear();
CFileSearch::XStringVector Directories; CFileSearch::XStringVector Directories;
Directories.push_back(std::string("Plugins")); Directories.push_back(std::string(PLUGINS_DIR));
CFileSearch::XStringVector Extensions; CFileSearch::XStringVector Extensions;
#ifdef _WIN32 Extensions.push_back("*." PLUGIN_SUFFIX);
Extensions.push_back("*.dll");
#else
Extensions.push_back("*.so");
#endif
CFileSearch FileSearch(Extensions, Directories); CFileSearch FileSearch(Extensions, Directories);
const CFileSearch::XStringVector& rFilenames = FileSearch.GetFileNames(); const CFileSearch::XStringVector& rFilenames = FileSearch.GetFileNames();