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

Apply the patch from issue 102. 

git-svn-id: http://pcsx2-playground.googlecode.com/svn/trunk@532 a6443dda-0b58-4228-96e9-037be469359c
This commit is contained in:
arcum42 2009-01-01 12:54:26 +00:00 committed by Gregory Hainaut
parent 87c0ef27f4
commit f1dc9870e5
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.sh
View File

@ -6,14 +6,14 @@
# Uncomment if building by itself, rather then with all the plugins
#Normal
export PCSX2OPTIONS="--enable-sse3 --enable-sse4 --prefix `pwd`"
#export PCSX2OPTIONS="--enable-sse3 --enable-sse4 --prefix `pwd`"
#Optimized, but a devbuild
#export PCSX2OPTIONS="--enable-sse3 --enable-sse4 --enable-devbuild --prefix `pwd`"
#Debug / Devbuild version
#export PCSX2OPTIONS="--enable-debug --enable-devbuild --enable-sse3 --prefix `pwd`"
export PCSX2OPTIONS="--enable-debug --enable-devbuild --enable-sse3 --prefix `pwd`"
option=$@
export PCSX2PLUGINS="`pwd`/bin/plugins"

10
pcsx2/Linux/ConfigDlg.cpp
View File

@ -406,7 +406,7 @@ void GetDirectory(GtkWidget *topWindow, const char *message, char *reply)
void OnConfConf_PluginsPath(GtkButton *button, gpointer user_data)
{
char *reply;
char reply[g_MaxPath];
GetDirectory(ConfDlg,"Choose the Plugin Directory:", reply);
strcpy(Config.PluginsDir, reply);
@ -416,7 +416,7 @@ void OnConfConf_PluginsPath(GtkButton *button, gpointer user_data)
void OnConfConf_BiosPath(GtkButton *button, gpointer user_data)
{
char *reply;
char reply[g_MaxPath];
GetDirectory(ConfDlg,"Choose the Bios Directory:", reply);
strcpy(Config.BiosDir, reply);
@ -471,7 +471,11 @@ void FindPlugins() {
if (strstr(plugin, ".so") == NULL) continue;
Handle = dlopen(plugin, RTLD_NOW);
if (Handle == NULL) Console::Error("%s\n", dlerror()); continue;
if (Handle == NULL)
{
Console::Error("%s\n", dlerror());
continue;
}
PS2EgetLibType = (_PS2EgetLibType) dlsym(Handle, "PS2EgetLibType");
PS2EgetLibName = (_PS2EgetLibName) dlsym(Handle, "PS2EgetLibName");