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

Include the svn revision in Linux, add an --enable-sse4, since it looks like it should have been in there, and disable the --enable-vmbuild flag, since I'm not sure it ever worked in Linux. 

git-svn-id: http://pcsx2-playground.googlecode.com/svn/trunk@310 a6443dda-0b58-4228-96e9-037be469359c
This commit is contained in:
arcum42 2008-11-10 09:13:27 +00:00 committed by Gregory Hainaut
parent 6a41d4c782
commit fe1c4a0aef
5 changed files with 53 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pcsx2/IPU/mpeg2lib/Mpeg.c
View File

@ -1195,8 +1195,8 @@ void mpeg2sliceIDEC(void* pdone)
void mpeg2_slice(void* pdone) void mpeg2_slice(void* pdone)
{ {
int DCT_offset, DCT_stride; int DCT_offset, DCT_stride;
u8 bit8=0; //u8 bit8=0;
u32 fp = g_BP.FP; //u32 fp = g_BP.FP;
u32 bp; u32 bp;
decoder_t * decoder = &g_decoder; decoder_t * decoder = &g_decoder;
u32 size = 0; u32 size = 0;

1
pcsx2/Linux/ConfigDlg.cpp
View File

@ -168,7 +168,6 @@ void OnConf_Fw(GtkMenuItem *menuitem, gpointer user_data) {
chdir(file); chdir(file);
} }
void SetActiveComboItem(GtkComboBox *widget,char plist[255][255], GList *list, char *conf) void SetActiveComboItem(GtkComboBox *widget,char plist[255][255], GList *list, char *conf)
{ {
GList *temp; GList *temp;

19
pcsx2/Linux/GtkGui.cpp
View File

@ -33,9 +33,15 @@ void StartGui() {
MainWindow = create_MainWindow(); MainWindow = create_MainWindow();
#ifdef PCSX2_VIRTUAL_MEM #ifdef PCSX2_VIRTUAL_MEM
gtk_window_set_title(GTK_WINDOW(MainWindow), "PCSX2 "PCSX2_VERSION" Watermoose VM"); if (SVN_REV != 0)
gtk_window_set_title(GTK_WINDOW(MainWindow), "PCSX2 "PCSX2_VERSION" "SVN_REV" Watermoose VM");
else
gtk_window_set_title(GTK_WINDOW(MainWindow), "PCSX2 "PCSX2_VERSION" Watermoose VM");
#else #else
gtk_window_set_title(GTK_WINDOW(MainWindow), "PCSX2 "PCSX2_VERSION" Watermoose"); if (SVN_REV != 0)
gtk_window_set_title(GTK_WINDOW(MainWindow), "PCSX2 "PCSX2_VERSION" "SVN_REV" Watermoose");
else
gtk_window_set_title(GTK_WINDOW(MainWindow), "PCSX2 "PCSX2_VERSION" Watermoose");
#endif #endif
// status bar // status bar
@ -581,7 +587,14 @@ void OnHelp_About(GtkMenuItem *menuitem, gpointer user_data) {
gtk_window_set_title(GTK_WINDOW(AboutDlg), _("About")); gtk_window_set_title(GTK_WINDOW(AboutDlg), _("About"));
Label = lookup_widget(AboutDlg, "GtkAbout_LabelVersion"); Label = lookup_widget(AboutDlg, "GtkAbout_LabelVersion");
sprintf(str, _("PCSX2 For Linux\nVersion %s"), PCSX2_VERSION);
// Include the SVN revision
if (SVN_REV !=0)
sprintf(str, _("PCSX2 Playground For Linux\nVersion %s %s\n"), PCSX2_VERSION, SVN_REV);
else
//Use this instead for a non-svn version
sprintf(str, _("PCSX2 Playground For Linux\nVersion %s\n"), PCSX2_VERSION);
gtk_label_set_text(GTK_LABEL(Label), str); gtk_label_set_text(GTK_LABEL(Label), str);
Label = lookup_widget(AboutDlg, "GtkAbout_LabelAuthors"); Label = lookup_widget(AboutDlg, "GtkAbout_LabelAuthors");

2
pcsx2/Linux/LnxMain.c
View File

@ -418,6 +418,8 @@ int SysInit() {
if(cpuInit() == -1 ) if(cpuInit() == -1 )
return -1; return -1;
applychanges = FALSE; // Just in case
while (LoadPlugins() == -1) { while (LoadPlugins() == -1) {
if (Pcsx2Configure() == FALSE) if (Pcsx2Configure() == FALSE)
exit(1); exit(1);

45
pcsx2/configure.ac
View File

@ -1,6 +1,5 @@
AC_INIT(pcsx2,0.9.4,zerofrog@gmail.com) AC_INIT(pcsx2,0.9.5,zerofrog@gmail.com)
AM_INIT_AUTOMAKE(pcsx2,0.9.5)
AM_INIT_AUTOMAKE(pcsx2,0.9.4)
AC_PROG_CC([gcc g++ cl KCC CC cxx cc++ xlC aCC c++]) AC_PROG_CC([gcc g++ cl KCC CC cxx cc++ xlC aCC c++])
AC_PROG_CXX([g++ gcc cl KCC CC cxx cc++ xlC aCC c++]) AC_PROG_CXX([g++ gcc cl KCC CC cxx cc++ xlC aCC c++])
@ -11,6 +10,18 @@ AC_PROG_RANLIB
dnl necessary for compiling assembly dnl necessary for compiling assembly
AM_PROG_AS AM_PROG_AS
svnrev="`svn info | grep Revision:`"
if test -n "${svnrev}" ; then
AC_REVISION("${svnrev}")
AC_DEFINE_UNQUOTED(SVN_REV,"${svnrev}",
[Define to be the subversion revision number])
else
AC_REVISION([$Revision: 0 $])
AC_DEFINE(SVN_REV,"$Revision: 0 $",
[Define to be the subversion revision number])
fi
CFLAGS= CFLAGS=
CPPFLAGS= CPPFLAGS=
CXXFLAGS= CXXFLAGS=
@ -64,16 +75,26 @@ then
fi fi
AC_MSG_RESULT(sse3) AC_MSG_RESULT(sse3)
dnl Check for virtual memory build AC_MSG_CHECKING(force sse4 instructions)
AC_MSG_CHECKING(for virtual memory build) AC_ARG_ENABLE(sse4, AC_HELP_STRING([--enable-sse4], [Forces sse4 detection on CPUs]),
AC_ARG_ENABLE(vmbuild, AC_HELP_STRING([--enable-vmbuild], [Adds low level virtual memory support to run pcsx2 faster]), sse4=$enableval,sse4=no)
vmbuild=$enableval,vmbuild=no) if test "x$sse4" == xyes
if test "x$vmbuild" == xyes
then then
AC_DEFINE(PCSX2_VIRTUAL_MEM,1,[PCSX2_VIRTUAL_MEM]) AC_DEFINE(PCSX2_FORCESSE4,1,[PCSX2_DEVBUILD])
MYOBJDIR=$MYOBJDIR"VM"
fi fi
AC_MSG_RESULT($vmbuild) AC_MSG_RESULT(sse4)
dnl Check for virtual memory build
dnl The virtual memory build hasn't worked in Linux for a long time, if ever.
dnl AC_MSG_CHECKING(for virtual memory build)
dnl AC_ARG_ENABLE(vmbuild, AC_HELP_STRING([--enable-vmbuild], [Adds low level virtual memory support to run pcsx2 faster]),
dnl vmbuild=$enableval,vmbuild=no)
dnl if test "x$vmbuild" == xyes
dnl then
dnl AC_DEFINE(PCSX2_VIRTUAL_MEM,1,[PCSX2_VIRTUAL_MEM])
dnl MYOBJDIR=$MYOBJDIR"VM"
dnl fi
dnl AC_MSG_RESULT($vmbuild)
dnl Check for recompilation dnl Check for recompilation
AC_MSG_CHECKING(for using platform dependent recompilers) AC_MSG_CHECKING(for using platform dependent recompilers)
@ -147,4 +168,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 " Virtual memory build? $vmbuild" dnl echo " Virtual memory build? $vmbuild"