From 7fd28883354b3231917fc515b32fff089e96aaba Mon Sep 17 00:00:00 2001 From: arcum42 Date: Sat, 15 Nov 2008 07:33:29 +0000 Subject: [PATCH] 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 --- pcsx2/Linux/ConfigDlg.cpp | 6 +++++- pcsx2/Linux/interface.c | 8 ++++---- pcsx2/Linux/pcsx2.glade | 8 ++++---- pcsx2/build.sh | 2 +- pcsx2/configure.ac | 6 ++++++ 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/pcsx2/Linux/ConfigDlg.cpp b/pcsx2/Linux/ConfigDlg.cpp index 216722065b..b1338d2b14 100644 --- a/pcsx2/Linux/ConfigDlg.cpp +++ b/pcsx2/Linux/ConfigDlg.cpp @@ -50,13 +50,17 @@ static void ConfPlugin(PluginConf confs, char* plugin, const char* name) strcat(file, plugin); drv = SysLoadLibrary(file); + #ifndef LOCAL_PLUGIN_INIS getcwd(file, ARRAYSIZE(file)); /* store current dir */ chdir(Config.PluginsDir); /* change dirs so that plugins can find their config file*/ + #endif if (drv == NULL) return; conf = (void (*)()) SysLoadSym(drv, name); if (SysLibError() == NULL) conf(); - chdir(file); /* change back*/ + #ifndef LOCAL_PLUGIN_INIS + chdir(file); /* change back*/ + #endif SysCloseLibrary(drv); } diff --git a/pcsx2/Linux/interface.c b/pcsx2/Linux/interface.c index cf806aa140..63b35bb7cb 100644 --- a/pcsx2/Linux/interface.c +++ b/pcsx2/Linux/interface.c @@ -3717,7 +3717,7 @@ create_CpuDlg (void) gtk_widget_show (label66); 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); gtk_widget_show (CustomFPSLimit); gtk_box_pack_end (GTK_BOX (hbox29), CustomFPSLimit, FALSE, TRUE, 0); @@ -3731,7 +3731,7 @@ create_CpuDlg (void) gtk_widget_show (label67); 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); gtk_widget_show (FrameThreshold); gtk_box_pack_end (GTK_BOX (hbox30), FrameThreshold, FALSE, TRUE, 0); @@ -3744,7 +3744,7 @@ create_CpuDlg (void) gtk_widget_show (label68); 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); gtk_widget_show (FramesBeforeSkipping); gtk_box_pack_end (GTK_BOX (hbox31), FramesBeforeSkipping, FALSE, TRUE, 0); @@ -3757,7 +3757,7 @@ create_CpuDlg (void) gtk_widget_show (label69); 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); gtk_widget_show (FramesToSkip); gtk_box_pack_end (GTK_BOX (hbox32), FramesToSkip, FALSE, TRUE, 0); diff --git a/pcsx2/Linux/pcsx2.glade b/pcsx2/Linux/pcsx2.glade index efd4c165f8..f22690872b 100644 --- a/pcsx2/Linux/pcsx2.glade +++ b/pcsx2/Linux/pcsx2.glade @@ -7264,7 +7264,7 @@ Version x.x GTK_UPDATE_ALWAYS False False - 0 0 9999 1 10 10 + 0 0 9999 1 0 0 0 @@ -7322,7 +7322,7 @@ Version x.x GTK_UPDATE_ALWAYS False False - 0 0 9999 1 10 10 + 0 0 9999 1 0 0 0 @@ -7380,7 +7380,7 @@ Version x.x GTK_UPDATE_ALWAYS False False - 0 0 9999 1 10 10 + 0 0 9999 1 0 0 0 @@ -7438,7 +7438,7 @@ Version x.x GTK_UPDATE_ALWAYS False False - 0 0 9999 1 10 10 + 0 0 9999 1 0 0 0 diff --git a/pcsx2/build.sh b/pcsx2/build.sh index fc36a7f36e..cd7a95fc81 100644 --- a/pcsx2/build.sh +++ b/pcsx2/build.sh @@ -22,7 +22,7 @@ #Normal #export PCSX2OPTIONS="--enable-sse3 --prefix `pwd`" #Debug version -export PCSX2OPTIONS="--enable-debug --enable-devbuild --enable-sse3 --prefix `pwd`" +#export PCSX2OPTIONS="--enable-debug --enable-devbuild --enable-sse3 --prefix `pwd`" echo --------------- echo Building Pcsx2 diff --git a/pcsx2/configure.ac b/pcsx2/configure.ac index d75c0cb5c8..682d9851b5 100644 --- a/pcsx2/configure.ac +++ b/pcsx2/configure.ac @@ -125,7 +125,12 @@ dnl AC_CHECK_LIB(pthread,main,[LIBS="$LIBS -lpthread"]) AC_CHECK_LIB(stdc++,main,[LIBS="$LIBS -lstdc++"]) 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__])]) +fi AC_OUTPUT([ Makefile @@ -149,3 +154,4 @@ echo " Debug build? $debug" echo " Dev build? $devbuild" echo " Force sse3? $sse3" echo " Recompilers enabled? $recbuild" +echo " nls support? $nls" \ No newline at end of file