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

Fixed up Linux after my previous changes. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1561 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2009-07-24 01:11:41 +00:00
parent a9999cbffa
commit 90c2f8ebc6
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pcsx2/Linux/ConfigDlg.cpp
View File

@ -58,7 +58,7 @@ static void ConfPlugin(plugin_types type, plugin_callback call, bool pullcombo =
if (pullcombo) GetComboText(confs->Combo, confs->plist, plugin); if (pullcombo) GetComboText(confs->Combo, confs->plist, plugin);
if (plugin == NULL) return; if (plugin == NULL) return;
drv = SysLoadLibrary( Path::Combine( Config.PluginsDir, plugin ).c_str() ); drv = SysLoadLibrary( Path::Combine( Config.Paths.Plugins, plugin ).c_str() );
if (drv == NULL) return; if (drv == NULL) return;
if (call != PLUGIN_TEST) if (call != PLUGIN_TEST)
@ -229,7 +229,7 @@ void OnConfConf_PluginsPath(GtkButton *button, gpointer user_data)
char reply[g_MaxPath]; char reply[g_MaxPath];
GetDirectory(ConfDlg, "Choose the Plugin Directory:", reply); GetDirectory(ConfDlg, "Choose the Plugin Directory:", reply);
strcpy(Config.PluginsDir, reply); strcpy(Config.Paths.Plugins, reply);
UpdateConfDlg(); UpdateConfDlg();
} }
@ -282,10 +282,10 @@ void FindPlugins()
confs->PluginNameList = NULL; confs->PluginNameList = NULL;
} }
dir = opendir(Config.PluginsDir); dir = opendir(Config.Paths.Plugins);
if (dir == NULL) if (dir == NULL)
{ {
Msgbox::Alert("Could not open '%s' directory", params Config.PluginsDir); Msgbox::Alert("Could not open '%s' directory", params Config.Paths.Plugins);
return; return;
} }
while ((ent = readdir(dir)) != NULL) while ((ent = readdir(dir)) != NULL)
@ -293,7 +293,7 @@ void FindPlugins()
u32 version; u32 version;
u32 type; u32 type;
sprintf(plugin, "%s%s", Config.PluginsDir, ent->d_name); sprintf(plugin, "%s%s", Config.Paths.Plugins, ent->d_name);
if (strstr(plugin, ".so") == NULL) continue; if (strstr(plugin, ".so") == NULL) continue;
Handle = SysLoadLibrary(plugin); Handle = SysLoadLibrary(plugin);

2
pcsx2/Linux/HacksDlg.cpp
View File

@ -100,7 +100,7 @@ void on_Speed_Hacks(GtkMenuItem *menuitem, gpointer user_data)
void on_Speed_Hack_OK(GtkButton *button, gpointer user_data) void on_Speed_Hack_OK(GtkButton *button, gpointer user_data)
{ {
PcsxConfig::Hacks_t newhacks; Hacks_t newhacks;
newhacks.EECycleRate = 0; newhacks.EECycleRate = 0;
newhacks.IOPCycleDouble = is_checked(SpeedHacksDlg, "check_iop_cycle_rate"); newhacks.IOPCycleDouble = is_checked(SpeedHacksDlg, "check_iop_cycle_rate");

4
pcsx2/Linux/LnxMain.cpp
View File

@ -432,12 +432,12 @@ void pcsx2_exit()
// with this the problem with plugins that are linked with the pthread // with this the problem with plugins that are linked with the pthread
// library is solved // library is solved
dir = opendir(Config.PluginsDir); dir = opendir(Config.Paths.Plugins);
if (dir != NULL) if (dir != NULL)
{ {
while ((ent = readdir(dir)) != NULL) while ((ent = readdir(dir)) != NULL)
{ {
sprintf(plugin, "%s%s", Config.PluginsDir, ent->d_name); sprintf(plugin, "%s%s", Config.Paths.Plugins, ent->d_name);
if (strstr(plugin, ".so") == NULL) continue; if (strstr(plugin, ".so") == NULL) continue;
Handle = SysLoadLibrary(plugin); Handle = SysLoadLibrary(plugin);

12
pcsx2/Linux/McdDlgs.cpp
View File

@ -38,7 +38,7 @@ void OnConf_Memcards(GtkMenuItem *menuitem, gpointer user_data)
set_checked(MemDlg, "check_enable_mcd2", Config.Mcd[1].Enabled); set_checked(MemDlg, "check_enable_mcd2", Config.Mcd[1].Enabled);
set_checked(MemDlg, "check_eject_mcds", Config.McdEnableEject); set_checked(MemDlg, "check_eject_mcds", Config.McdEnableEject);
file = Path::GetCurrentDirectory();/* store current dir */ file = Path::GetWorkingDirectory();/* store current dir */
sprintf(card, "%s/%s", file.c_str(), MEMCARDS_DIR ); sprintf(card, "%s/%s", file.c_str(), MEMCARDS_DIR );
Path::ChangeDirectory(string(card));/* change dirs so that plugins can find their config file*/ Path::ChangeDirectory(string(card));/* change dirs so that plugins can find their config file*/
@ -56,7 +56,7 @@ void OnConf_Memcards(GtkMenuItem *menuitem, gpointer user_data)
{ {
char path[g_MaxPath]; char path[g_MaxPath];
sprintf(path, "%s/%s/%s", MAIN_DIR, MEMCARDS_DIR, entry->d_name); sprintf(path, "%s/%s/%s", Config.Paths.Working, MEMCARDS_DIR, entry->d_name);
for (j = 0; j < 2; j++) for (j = 0; j < 2; j++)
{ {
@ -83,17 +83,17 @@ void OnConf_Memcards(GtkMenuItem *menuitem, gpointer user_data)
void OnMemcards_Ok(GtkButton *button, gpointer user_data) void OnMemcards_Ok(GtkButton *button, gpointer user_data)
{ {
if (gtk_combo_box_get_active(GTK_COMBO_BOX(lookup_widget(MemDlg, "memcard1combo"))) != -1) if (gtk_combo_box_get_active(GTK_COMBO_BOX(lookup_widget(MemDlg, "memcard1combo"))) != -1)
sprintf(Config.Mcd[0].Filename, "%s/%s/%s", MAIN_DIR, MEMCARDS_DIR, sprintf(Config.Mcd[0].Filename, "%s/%s/%s", Config.Paths.Working, MEMCARDS_DIR,
gtk_combo_box_get_active_text(GTK_COMBO_BOX(lookup_widget(MemDlg, "memcard1combo")))); gtk_combo_box_get_active_text(GTK_COMBO_BOX(lookup_widget(MemDlg, "memcard1combo"))));
else else
sprintf(Config.Mcd[0].Filename, "%s/%s/%s", MAIN_DIR, MEMCARDS_DIR, DEFAULT_MEMCARD1); sprintf(Config.Mcd[0].Filename, "%s/%s/%s", Config.Paths.Working, MEMCARDS_DIR, DEFAULT_MEMCARD1);
if (gtk_combo_box_get_active(GTK_COMBO_BOX(lookup_widget(MemDlg, "memcard2combo"))) != -1) if (gtk_combo_box_get_active(GTK_COMBO_BOX(lookup_widget(MemDlg, "memcard2combo"))) != -1)
sprintf(Config.Mcd[1].Filename, "%s/%s/%s", MAIN_DIR, MEMCARDS_DIR, sprintf(Config.Mcd[1].Filename, "%s/%s/%s", Config.Paths.Working, MEMCARDS_DIR,
gtk_combo_box_get_active_text(GTK_COMBO_BOX(lookup_widget(MemDlg, "memcard2combo")))); gtk_combo_box_get_active_text(GTK_COMBO_BOX(lookup_widget(MemDlg, "memcard2combo"))));
else else
sprintf(Config.Mcd[1].Filename, "%s/%s/%s", MAIN_DIR, MEMCARDS_DIR, DEFAULT_MEMCARD2); sprintf(Config.Mcd[1].Filename, "%s/%s/%s", Config.Paths.Working, MEMCARDS_DIR, DEFAULT_MEMCARD2);
Config.Mcd[0].Enabled = is_checked(MemDlg, "check_enable_mcd1"); Config.Mcd[0].Enabled = is_checked(MemDlg, "check_enable_mcd1");
Config.Mcd[1].Enabled = is_checked(MemDlg, "check_enable_mcd2"); Config.Mcd[1].Enabled = is_checked(MemDlg, "check_enable_mcd2");