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

Minor Linux tweaks. Merge a patch in, make another easier to apply, and take a stab at the SpinButton issue... 

git-svn-id: http://pcsx2-playground.googlecode.com/svn/trunk@328 a6443dda-0b58-4228-96e9-037be469359c
This commit is contained in:
arcum42 2008-11-15 07:33:29 +00:00 committed by Gregory Hainaut
parent f5872ce7a7
commit 7fd2888335
5 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pcsx2/Linux/ConfigDlg.cpp
View File

@ -50,13 +50,17 @@ static void ConfPlugin(PluginConf confs, char* plugin, const char* name)
strcat(file, plugin); strcat(file, plugin);
drv = SysLoadLibrary(file); drv = SysLoadLibrary(file);
#ifndef LOCAL_PLUGIN_INIS
getcwd(file, ARRAYSIZE(file)); /* store current dir */ getcwd(file, ARRAYSIZE(file)); /* store current dir */
chdir(Config.PluginsDir); /* change dirs so that plugins can find their config file*/ chdir(Config.PluginsDir); /* change dirs so that plugins can find their config file*/
#endif
if (drv == NULL) return; if (drv == NULL) return;
conf = (void (*)()) SysLoadSym(drv, name); conf = (void (*)()) SysLoadSym(drv, name);
if (SysLibError() == NULL) conf(); if (SysLibError() == NULL) conf();
#ifndef LOCAL_PLUGIN_INIS
chdir(file); /* change back*/ chdir(file); /* change back*/
#endif
SysCloseLibrary(drv); SysCloseLibrary(drv);
} }

8
pcsx2/Linux/interface.c
View File

@ -3717,7 +3717,7 @@ create_CpuDlg (void)
gtk_widget_show (label66); gtk_widget_show (label66);
gtk_box_pack_start (GTK_BOX (hbox29), label66, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (hbox29), label66, TRUE, TRUE, 0);
CustomFPSLimit_adj = gtk_adjustment_new (0, 0, 9999, 1, 10, 10); CustomFPSLimit_adj = gtk_adjustment_new (0, 0, 9999, 1, 0, 0);
CustomFPSLimit = gtk_spin_button_new (GTK_ADJUSTMENT (CustomFPSLimit_adj), 1, 0); CustomFPSLimit = gtk_spin_button_new (GTK_ADJUSTMENT (CustomFPSLimit_adj), 1, 0);
gtk_widget_show (CustomFPSLimit); gtk_widget_show (CustomFPSLimit);
gtk_box_pack_end (GTK_BOX (hbox29), CustomFPSLimit, FALSE, TRUE, 0); gtk_box_pack_end (GTK_BOX (hbox29), CustomFPSLimit, FALSE, TRUE, 0);
@ -3731,7 +3731,7 @@ create_CpuDlg (void)
gtk_widget_show (label67); gtk_widget_show (label67);
gtk_box_pack_start (GTK_BOX (hbox30), label67, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (hbox30), label67, TRUE, TRUE, 0);
FrameThreshold_adj = gtk_adjustment_new (0, 0, 9999, 1, 10, 10); FrameThreshold_adj = gtk_adjustment_new (0, 0, 9999, 1, 0, 0);
FrameThreshold = gtk_spin_button_new (GTK_ADJUSTMENT (FrameThreshold_adj), 1, 0); FrameThreshold = gtk_spin_button_new (GTK_ADJUSTMENT (FrameThreshold_adj), 1, 0);
gtk_widget_show (FrameThreshold); gtk_widget_show (FrameThreshold);
gtk_box_pack_end (GTK_BOX (hbox30), FrameThreshold, FALSE, TRUE, 0); gtk_box_pack_end (GTK_BOX (hbox30), FrameThreshold, FALSE, TRUE, 0);
@ -3744,7 +3744,7 @@ create_CpuDlg (void)
gtk_widget_show (label68); gtk_widget_show (label68);
gtk_box_pack_start (GTK_BOX (hbox31), label68, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (hbox31), label68, TRUE, TRUE, 0);
FramesBeforeSkipping_adj = gtk_adjustment_new (0, 0, 9999, 1, 10, 10); FramesBeforeSkipping_adj = gtk_adjustment_new (0, 0, 9999, 1, 0, 0);
FramesBeforeSkipping = gtk_spin_button_new (GTK_ADJUSTMENT (FramesBeforeSkipping_adj), 1, 0); FramesBeforeSkipping = gtk_spin_button_new (GTK_ADJUSTMENT (FramesBeforeSkipping_adj), 1, 0);
gtk_widget_show (FramesBeforeSkipping); gtk_widget_show (FramesBeforeSkipping);
gtk_box_pack_end (GTK_BOX (hbox31), FramesBeforeSkipping, FALSE, TRUE, 0); gtk_box_pack_end (GTK_BOX (hbox31), FramesBeforeSkipping, FALSE, TRUE, 0);
@ -3757,7 +3757,7 @@ create_CpuDlg (void)
gtk_widget_show (label69); gtk_widget_show (label69);
gtk_box_pack_start (GTK_BOX (hbox32), label69, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (hbox32), label69, TRUE, TRUE, 0);
FramesToSkip_adj = gtk_adjustment_new (0, 0, 9999, 1, 10, 10); FramesToSkip_adj = gtk_adjustment_new (0, 0, 9999, 1, 0, 0);
FramesToSkip = gtk_spin_button_new (GTK_ADJUSTMENT (FramesToSkip_adj), 1, 0); FramesToSkip = gtk_spin_button_new (GTK_ADJUSTMENT (FramesToSkip_adj), 1, 0);
gtk_widget_show (FramesToSkip); gtk_widget_show (FramesToSkip);
gtk_box_pack_end (GTK_BOX (hbox32), FramesToSkip, FALSE, TRUE, 0); gtk_box_pack_end (GTK_BOX (hbox32), FramesToSkip, FALSE, TRUE, 0);

8
pcsx2/Linux/pcsx2.glade
View File

@ -7264,7 +7264,7 @@ Version x.x</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property> <property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property> <property name="snap_to_ticks">False</property>
<property name="wrap">False</property> <property name="wrap">False</property>
<property name="adjustment">0 0 9999 1 10 10</property> <property name="adjustment">0 0 9999 1 0 0</property>
</widget> </widget>
<packing> <packing>
<property name="padding">0</property> <property name="padding">0</property>
@ -7322,7 +7322,7 @@ Version x.x</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property> <property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property> <property name="snap_to_ticks">False</property>
<property name="wrap">False</property> <property name="wrap">False</property>
<property name="adjustment">0 0 9999 1 10 10</property> <property name="adjustment">0 0 9999 1 0 0</property>
</widget> </widget>
<packing> <packing>
<property name="padding">0</property> <property name="padding">0</property>
@ -7380,7 +7380,7 @@ Version x.x</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property> <property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property> <property name="snap_to_ticks">False</property>
<property name="wrap">False</property> <property name="wrap">False</property>
<property name="adjustment">0 0 9999 1 10 10</property> <property name="adjustment">0 0 9999 1 0 0</property>
</widget> </widget>
<packing> <packing>
<property name="padding">0</property> <property name="padding">0</property>
@ -7438,7 +7438,7 @@ Version x.x</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property> <property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property> <property name="snap_to_ticks">False</property>
<property name="wrap">False</property> <property name="wrap">False</property>
<property name="adjustment">0 0 9999 1 10 10</property> <property name="adjustment">0 0 9999 1 0 0</property>
</widget> </widget>
<packing> <packing>
<property name="padding">0</property> <property name="padding">0</property>

2
pcsx2/build.sh
View File

@ -22,7 +22,7 @@
#Normal #Normal
#export PCSX2OPTIONS="--enable-sse3 --prefix `pwd`" #export PCSX2OPTIONS="--enable-sse3 --prefix `pwd`"
#Debug version #Debug version
export PCSX2OPTIONS="--enable-debug --enable-devbuild --enable-sse3 --prefix `pwd`" #export PCSX2OPTIONS="--enable-debug --enable-devbuild --enable-sse3 --prefix `pwd`"
echo --------------- echo ---------------
echo Building Pcsx2 echo Building Pcsx2

6
pcsx2/configure.ac
View File

@ -125,7 +125,12 @@ dnl AC_CHECK_LIB(pthread,main,[LIBS="$LIBS -lpthread"])
AC_CHECK_LIB(stdc++,main,[LIBS="$LIBS -lstdc++"]) AC_CHECK_LIB(stdc++,main,[LIBS="$LIBS -lstdc++"])
AC_CHECK_LIB(z,main,[LIBS="$LIBS -lz"]) AC_CHECK_LIB(z,main,[LIBS="$LIBS -lz"])
AC_ARG_ENABLE(nls, AC_HELP_STRING([--disable-nls], [Disable nls support]),
nls=$enableval,nls=yes)
if test "x$nls" == xyes
then
AC_CHECK_HEADER([libintl.h], [AC_DEFINE(ENABLE_NLS,1,[__x86_64__])]) AC_CHECK_HEADER([libintl.h], [AC_DEFINE(ENABLE_NLS,1,[__x86_64__])])
fi
AC_OUTPUT([ AC_OUTPUT([
Makefile Makefile
@ -149,3 +154,4 @@ echo " Debug build? $debug"
echo " Dev build? $devbuild" echo " Dev build? $devbuild"
echo " Force sse3? $sse3" echo " Force sse3? $sse3"
echo " Recompilers enabled? $recbuild" echo " Recompilers enabled? $recbuild"
echo " nls support? $nls"