mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-30 01:29:42 -06:00
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:
@ -40,7 +40,7 @@ SConfig::~SConfig()
|
||||
void SConfig::SaveSettings()
|
||||
{
|
||||
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
|
||||
{
|
||||
@ -78,21 +78,21 @@ void SConfig::SaveSettings()
|
||||
ini.Set("Core", "RunCompareClient", m_LocalCoreStartupParameter.bRunCompareClient);
|
||||
}
|
||||
|
||||
ini.Save(DOLPHIN_CONFIG);
|
||||
ini.Save(CONFIG_FILE);
|
||||
}
|
||||
|
||||
|
||||
void SConfig::LoadSettings()
|
||||
{
|
||||
IniFile ini;
|
||||
ini.Load(DOLPHIN_CONFIG);
|
||||
ini.Load(CONFIG_FILE);
|
||||
|
||||
// hard coded default plugin
|
||||
{
|
||||
m_DefaultGFXPlugin = PLUGINS_DIR DIR_SEP DEFAULT_GFX_PLUGIN PLUGIN_SUFFIX;
|
||||
m_DefaultDSPPlugin = PLUGINS_DIR DIR_SEP DEFAULT_DSP_PLUGIN PLUGIN_SUFFIX;
|
||||
m_DefaultPADPlugin = PLUGINS_DIR DIR_SEP DEFAULT_PAD_PLUGIN PLUGIN_SUFFIX;
|
||||
m_DefaultWiiMotePlugin = PLUGINS_DIR DIR_SEP DEFAULT_WIIMOTE_PLUGIN PLUGIN_SUFFIX;
|
||||
m_DefaultGFXPlugin = PLUGINS_DIR DIR_SEP DEFAULT_GFX_PLUGIN;
|
||||
m_DefaultDSPPlugin = PLUGINS_DIR DIR_SEP DEFAULT_DSP_PLUGIN;
|
||||
m_DefaultPADPlugin = PLUGINS_DIR DIR_SEP DEFAULT_PAD_PLUGIN;
|
||||
m_DefaultWiiMotePlugin = PLUGINS_DIR DIR_SEP DEFAULT_WIIMOTE_PLUGIN;
|
||||
}
|
||||
|
||||
// misc
|
||||
|
@ -40,14 +40,10 @@ void CPluginManager::ScanForPlugins(wxWindow* _wxWindow)
|
||||
m_PluginInfos.clear();
|
||||
|
||||
CFileSearch::XStringVector Directories;
|
||||
Directories.push_back(std::string("Plugins"));
|
||||
Directories.push_back(std::string(PLUGINS_DIR));
|
||||
|
||||
CFileSearch::XStringVector Extensions;
|
||||
#ifdef _WIN32
|
||||
Extensions.push_back("*.dll");
|
||||
#else
|
||||
Extensions.push_back("*.so");
|
||||
#endif
|
||||
Extensions.push_back("*." PLUGIN_SUFFIX);
|
||||
|
||||
CFileSearch FileSearch(Extensions, Directories);
|
||||
const CFileSearch::XStringVector& rFilenames = FileSearch.GetFileNames();
|
||||
|
Reference in New Issue
Block a user