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

Get the plugins to compile in Linux after the reorg, and bring the game fixes dialog up to date in Linux. 

git-svn-id: http://pcsx2-playground.googlecode.com/svn/trunk@692 a6443dda-0b58-4228-96e9-037be469359c
This commit is contained in:
arcum42 2009-02-04 12:41:20 +00:00 committed by Gregory Hainaut
parent cb52374106
commit 50040eb4fb
17 changed files with 80 additions and 23 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 # Uncomment if building by itself, rather then with all the plugins
#Normal #Normal
#export PCSX2OPTIONS="--enable-sse3 --enable-sse4 --prefix `pwd`" export PCSX2OPTIONS="--enable-sse3 --enable-sse4 --prefix `pwd`"
#Optimized, but a devbuild #Optimized, but a devbuild
#export PCSX2OPTIONS="--enable-sse3 --enable-sse4 --enable-devbuild --prefix `pwd`" #export PCSX2OPTIONS="--enable-sse3 --enable-sse4 --enable-devbuild --prefix `pwd`"
#Debug / Devbuild version #Debug / Devbuild version
export PCSX2OPTIONS="--enable-debug --enable-devbuild --enable-sse3 --prefix `pwd`" #export PCSX2OPTIONS="--enable-debug --enable-devbuild --enable-sse3 --prefix `pwd`"
# Make sure we have plugins, and bring the normal plugins in. # Make sure we have plugins, and bring the normal plugins in.
sh fetch.sh sh fetch.sh

4
pcsx2/Linux/GtkGui.cpp
View File

@ -769,9 +769,11 @@ void on_Game_Fixes(GtkMenuItem *menuitem, gpointer user_data)
{ {
GameFixDlg = create_GameFixDlg(); GameFixDlg = create_GameFixDlg();
set_checked(GameFixDlg, "check_VU_Add_Sub", (Config.GameFixes & FLAG_VU_ADD_SUB));
set_checked(GameFixDlg, "check_VU_Clip", (Config.GameFixes & FLAG_VU_CLIP)); set_checked(GameFixDlg, "check_VU_Clip", (Config.GameFixes & FLAG_VU_CLIP));
set_checked(GameFixDlg, "check_FPU_Clamp", (Config.GameFixes & FLAG_FPU_CLAMP)); set_checked(GameFixDlg, "check_FPU_Clamp", (Config.GameFixes & FLAG_FPU_CLAMP));
set_checked(GameFixDlg, "check_VU_Branch", (Config.GameFixes & FLAG_VU_BRANCH)); set_checked(GameFixDlg, "check_VU_Branch", (Config.GameFixes & FLAG_VU_BRANCH));
set_checked(GameFixDlg, "check_Avoid_Delay_Handling", (Config.GameFixes & FLAG_AVOID_DELAY_HANDLING));
gtk_widget_show_all(GameFixDlg); gtk_widget_show_all(GameFixDlg);
gtk_widget_set_sensitive(MainWindow, FALSE); gtk_widget_set_sensitive(MainWindow, FALSE);
@ -782,9 +784,11 @@ void on_Game_Fix_OK(GtkButton *button, gpointer user_data)
{ {
Config.GameFixes = 0; Config.GameFixes = 0;
Config.GameFixes |= is_checked(GameFixDlg, "check_VU_Add_Sub") ? FLAG_VU_ADD_SUB : 0;
Config.GameFixes |= is_checked(GameFixDlg, "check_VU_Clip") ? FLAG_VU_CLIP : 0; Config.GameFixes |= is_checked(GameFixDlg, "check_VU_Clip") ? FLAG_VU_CLIP : 0;
Config.GameFixes |= is_checked(GameFixDlg, "check_FPU_Clamp") ? FLAG_FPU_CLAMP : 0; Config.GameFixes |= is_checked(GameFixDlg, "check_FPU_Clamp") ? FLAG_FPU_CLAMP : 0;
Config.GameFixes |= is_checked(GameFixDlg, "check_VU_Branch") ? FLAG_VU_BRANCH : 0; Config.GameFixes |= is_checked(GameFixDlg, "check_VU_Branch") ? FLAG_VU_BRANCH : 0;
Config.GameFixes |= is_checked(GameFixDlg, "check_Avoid_Delay_Handling") ? FLAG_AVOID_DELAY_HANDLING : 0;
SaveConfig(); SaveConfig();
gtk_widget_destroy(GameFixDlg); gtk_widget_destroy(GameFixDlg);

2
pcsx2/Linux/Linux.h
View File

@ -181,9 +181,11 @@ char iop_log_names[9][32] = {
"Cdr Log", "Cdr Log",
"GPU Log" }; "GPU Log" };
#define FLAG_VU_ADD_SUB 0x1
#define FLAG_VU_CLIP 0x2 #define FLAG_VU_CLIP 0x2
#define FLAG_FPU_CLAMP 0x4 #define FLAG_FPU_CLAMP 0x4
#define FLAG_VU_BRANCH 0x8 #define FLAG_VU_BRANCH 0x8
#define FLAG_AVOID_DELAY_HANDLING 0x10
#define FLAG_VU_NO_OVERFLOW 0x2 #define FLAG_VU_NO_OVERFLOW 0x2
#define FLAG_VU_EXTRA_OVERFLOW 0x40 #define FLAG_VU_EXTRA_OVERFLOW 0x40

12
pcsx2/Linux/interface.c
View File

@ -767,6 +767,8 @@ create_GameFixDlg (void)
GtkWidget *check_VU_Clip; GtkWidget *check_VU_Clip;
GtkWidget *check_FPU_Clamp; GtkWidget *check_FPU_Clamp;
GtkWidget *check_VU_Branch; GtkWidget *check_VU_Branch;
GtkWidget *check_VU_Add_Sub;
GtkWidget *check_Avoid_Delay_Handling;
GtkWidget *label42; GtkWidget *label42;
GtkWidget *dialog_action_area1; GtkWidget *dialog_action_area1;
GtkWidget *cancelbutton1; GtkWidget *cancelbutton1;
@ -805,6 +807,14 @@ create_GameFixDlg (void)
gtk_widget_show (check_VU_Branch); gtk_widget_show (check_VU_Branch);
gtk_box_pack_start (GTK_BOX (vbox30), check_VU_Branch, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox30), check_VU_Branch, FALSE, FALSE, 0);
check_VU_Add_Sub = gtk_check_button_new_with_mnemonic (_("VU Add / Sub Hack - Special fix for Tri-Ace games!"));
gtk_widget_show (check_VU_Add_Sub);
gtk_box_pack_start (GTK_BOX (vbox30), check_VU_Add_Sub, FALSE, FALSE, 0);
check_Avoid_Delay_Handling = gtk_check_button_new_with_mnemonic (_("Avoid 2 cycle branch delay handling - Fixes KH2 and Tri-Ace games"));
gtk_widget_show (check_Avoid_Delay_Handling);
gtk_box_pack_start (GTK_BOX (vbox30), check_Avoid_Delay_Handling, FALSE, FALSE, 0);
label42 = gtk_label_new (_("<b>Some games need special settings.\nConfigure them here.</b>")); label42 = gtk_label_new (_("<b>Some games need special settings.\nConfigure them here.</b>"));
gtk_widget_show (label42); gtk_widget_show (label42);
gtk_frame_set_label_widget (GTK_FRAME (GameSettings), label42); gtk_frame_set_label_widget (GTK_FRAME (GameSettings), label42);
@ -840,6 +850,8 @@ create_GameFixDlg (void)
GLADE_HOOKUP_OBJECT (GameFixDlg, check_VU_Clip, "check_VU_Clip"); GLADE_HOOKUP_OBJECT (GameFixDlg, check_VU_Clip, "check_VU_Clip");
GLADE_HOOKUP_OBJECT (GameFixDlg, check_FPU_Clamp, "check_FPU_Clamp"); GLADE_HOOKUP_OBJECT (GameFixDlg, check_FPU_Clamp, "check_FPU_Clamp");
GLADE_HOOKUP_OBJECT (GameFixDlg, check_VU_Branch, "check_VU_Branch"); GLADE_HOOKUP_OBJECT (GameFixDlg, check_VU_Branch, "check_VU_Branch");
GLADE_HOOKUP_OBJECT (GameFixDlg, check_VU_Add_Sub, "check_VU_Add_Sub");
GLADE_HOOKUP_OBJECT (GameFixDlg, check_Avoid_Delay_Handling, "check_Avoid_Delay_Handling");
GLADE_HOOKUP_OBJECT (GameFixDlg, label42, "label42"); GLADE_HOOKUP_OBJECT (GameFixDlg, label42, "label42");
GLADE_HOOKUP_OBJECT_NO_REF (GameFixDlg, dialog_action_area1, "dialog_action_area1"); GLADE_HOOKUP_OBJECT_NO_REF (GameFixDlg, dialog_action_area1, "dialog_action_area1");
GLADE_HOOKUP_OBJECT (GameFixDlg, cancelbutton1, "cancelbutton1"); GLADE_HOOKUP_OBJECT (GameFixDlg, cancelbutton1, "cancelbutton1");

38
pcsx2/Linux/pcsx2.glade
View File

@ -1858,6 +1858,44 @@ If you have problems, Disable all of these and try again.</property>
<property name="fill">False</property> <property name="fill">False</property>
</packing> </packing>
</child> </child>
<child>
<widget class="GtkCheckButton" id="check_VU_Add_Sub">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">VU Add / Sub Hack - Special fix for Tri-Ace games!</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
<widget class="GtkCheckButton" id="check_Avoid_Delay_Handling">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Avoid 2 cycle branch delay handling - Fixes KH2 and Tri-Ace games</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
</widget> </widget>
</child> </child>
</widget> </widget>

2
plugins/CDVDiso/src/Linux/Makefile
View File

@ -9,7 +9,7 @@ OBJS = ../CDVDisop.o Config.o Linux.o ../libiso.o
CFGOBJS = conf.o interface.o support.o ${OBJS} CFGOBJS = conf.o interface.o support.o ${OBJS}
LIBS = -lz -lbz2 -lstdc++ LIBS = -lz -lbz2 -lstdc++
CFGLIBS = $(shell pkg-config --libs gtk+-2.0) ${LIBS} CFGLIBS = $(shell pkg-config --libs gtk+-2.0) ${LIBS}
CFLAGS += $(shell pkg-config --cflags gtk+-2.0) -I../../../common CFLAGS += $(shell pkg-config --cflags gtk+-2.0) -I../common
DEPS:= $(OBJS:.o=.d) $(CFGOBJS:.o=.d) DEPS:= $(OBJS:.o=.d) $(CFGOBJS:.o=.d)
all: plugin cfg all: plugin cfg

4
plugins/CDVDiso/src/libiso.c
View File

@ -12,8 +12,8 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#include "zlib/zlib.h" #include "3rdparty/zlib/zlib.h"
#include "bzip2/bzlib.h" #include "3rdparty/bzip2/bzlib.h"
#include "common/PS2Etypes.h" #include "common/PS2Etypes.h"
#include "CDVDiso.h" #include "CDVDiso.h"

7
plugins/CDVDiso/src/mkiso/Makefile
View File

@ -2,11 +2,12 @@
CC = gcc CC = gcc
MKISO = mkiso MKISO = mkiso
CFLAGS = -fPIC -Wall -O2 -fomit-frame-pointer -I.. -I. -D__LINUX__ -I../zlib CFLAGS = -fPIC -Wall -O2 -fomit-frame-pointer -I.. -I. -D__LINUX__ -I../3rdparty/zlib
OBJS = mkiso.o ../libiso.o OBJS = mkiso.o ../libiso.o
LIBS = LIBS =
OBJS+= ../zlib/adler32.o ../zlib/compress.o ../zlib/crc32.o ../zlib/gzio.o ../zlib/uncompr.o ../zlib/deflate.o ../zlib/trees.o \ OBJS+= ../3rdparty/zlib/adler32.o ../3rdparty/zlib/compress.o ../3rdparty/zlib/crc32.o ../3rdparty/zlib/gzio.o ../3rdparty/zlib/uncompr.o \
../zlib/zutil.o ../zlib/inflate.o ../zlib/infback.o ../zlib/inftrees.o ../zlib/inffast.o ../3rdparty/zlib/deflate.o ../3rdparty/zlib/trees.o ../3rdparty/zlib/zutil.o ../3rdparty/zlib/inflate.o ../3rdparty/zlib/infback.o ../3rdparty/zlib/inftrees.o \
../3rdparty/zlib/inffast.o
DEPS:= $(OBJS:.o=.d) DEPS:= $(OBJS:.o=.d)

2
plugins/zerogs/opengl/Linux/Makefile.am
View File

@ -2,5 +2,5 @@ noinst_LIBRARIES = libZeroGSLinux.a
libZeroGSLinux_a_CPPFLAGS = -fPIC libZeroGSLinux_a_CPPFLAGS = -fPIC
libZeroGSLinux_a_CXXFLAGS = -fPIC libZeroGSLinux_a_CXXFLAGS = -fPIC
libZeroGSLinux_a_CFLAGS = -fPIC libZeroGSLinux_a_CFLAGS = -fPIC
INCLUDES = $(shell pkg-config --cflags gtk+-2.0) -I@srcdir@/../ -I@srcdir@/../../../common INCLUDES = $(shell pkg-config --cflags gtk+-2.0) -I@srcdir@/../ -I@srcdir@/../common
libZeroGSLinux_a_SOURCES = callbacks.c Conf.cpp interface.c Linux.cpp support.c libZeroGSLinux_a_SOURCES = callbacks.c Conf.cpp interface.c Linux.cpp support.c

2
plugins/zerogs/opengl/Makefile.am
View File

@ -1,7 +1,7 @@
# Create a shared library libZeroGSogl # Create a shared library libZeroGSogl
AUTOMAKE_OPTIONS = foreign AUTOMAKE_OPTIONS = foreign
noinst_LIBRARIES = libZeroGSogl.a noinst_LIBRARIES = libZeroGSogl.a
INCLUDES = -I@srcdir@/../../common INCLUDES = -I@srcdir@/common
libZeroGSogl_a_CPPFLAGS = $(shell pkg-config --cflags gtk+-2.0) libZeroGSogl_a_CPPFLAGS = $(shell pkg-config --cflags gtk+-2.0)
libZeroGSogl_a_CXXFLAGS = $(shell pkg-config --cflags gtk+-2.0) libZeroGSogl_a_CXXFLAGS = $(shell pkg-config --cflags gtk+-2.0)

2
plugins/zerogs/opengl/memcpy_amd.cpp
View File

@ -76,7 +76,7 @@ MEMCPY_AMD.CPP
#endif #endif
extern "C" { extern "C" {
#include "../../common/PS2Etypes.h" #include "PS2Etypes.h"
#if defined(_MSC_VER) && !defined(__x86_64__) #if defined(_MSC_VER) && !defined(__x86_64__)

2
plugins/zeropad/Makefile.am
View File

@ -1,7 +1,7 @@
# Create a shared library libZeroPAD # Create a shared library libZeroPAD
AUTOMAKE_OPTIONS = foreign AUTOMAKE_OPTIONS = foreign
noinst_LIBRARIES = libZeroPAD.a noinst_LIBRARIES = libZeroPAD.a
INCLUDES = -I@srcdir@/../common INCLUDES = -I@srcdir@/common
libZeroPAD_a_CXXFLAGS = $(shell pkg-config --cflags gtk+-2.0) libZeroPAD_a_CXXFLAGS = $(shell pkg-config --cflags gtk+-2.0)
libZeroPAD_a_CFLAGS = $(shell pkg-config --cflags gtk+-2.0) libZeroPAD_a_CFLAGS = $(shell pkg-config --cflags gtk+-2.0)

8
plugins/zerospu2/Makefile.am
View File

@ -1,7 +1,7 @@
# Create a shared library libZeroSPU2 # Create a shared library libZeroSPU2
AUTOMAKE_OPTIONS = foreign AUTOMAKE_OPTIONS = foreign
noinst_LIBRARIES = libZeroSPU2.a noinst_LIBRARIES = libZeroSPU2.a
INCLUDES = -I@srcdir@/../common INCLUDES = -I@srcdir@/common -I@srcdir@/3rdparty/SoundTouch
libZeroSPU2_a_CXXFLAGS = $(shell pkg-config --cflags gtk+-2.0) libZeroSPU2_a_CXXFLAGS = $(shell pkg-config --cflags gtk+-2.0)
libZeroSPU2_a_CFLAGS = $(shell pkg-config --cflags gtk+-2.0) libZeroSPU2_a_CFLAGS = $(shell pkg-config --cflags gtk+-2.0)
@ -22,13 +22,13 @@ EXEEXT=$(preext)@so_ext@
traplib_PROGRAMS=libZeroSPU2 traplib_PROGRAMS=libZeroSPU2
libZeroSPU2_SOURCES= libZeroSPU2_SOURCES=
libZeroSPU2_DEPENDENCIES = libZeroSPU2.a SoundTouch/libSoundTouch.a libZeroSPU2_DEPENDENCIES = libZeroSPU2.a 3rdparty/SoundTouch/libSoundTouch.a
libZeroSPU2_LDFLAGS= @SHARED_LDFLAGS@ libZeroSPU2_LDFLAGS= @SHARED_LDFLAGS@
libZeroSPU2_LDFLAGS+=-Wl,-soname,@ZEROSPU2_SONAME@ libZeroSPU2_LDFLAGS+=-Wl,-soname,@ZEROSPU2_SONAME@
libZeroSPU2_LDADD=$(libZeroSPU2_a_OBJECTS) SoundTouch/libSoundTouch.a libZeroSPU2_LDADD=$(libZeroSPU2_a_OBJECTS) 3rdparty/SoundTouch/libSoundTouch.a
libZeroSPU2_a_SOURCES = zerospu2.cpp voices.cpp zerodma.cpp libZeroSPU2_a_SOURCES = zerospu2.cpp voices.cpp zerodma.cpp
libZeroSPU2_a_SOURCES += zerospu2.h reg.h misc.h libZeroSPU2_a_SOURCES += zerospu2.h reg.h misc.h
libZeroSPU2_a_SOURCES += Linux/interface.c Linux/Linux.cpp Linux/Alsa.cpp Linux/OSS.cpp Linux/support.c libZeroSPU2_a_SOURCES += Linux/interface.c Linux/Linux.cpp Linux/Alsa.cpp Linux/OSS.cpp Linux/support.c
SUBDIRS = SoundTouch SUBDIRS = 3rdparty/SoundTouch

2
plugins/zerospu2/configure.ac
View File

@ -94,7 +94,7 @@ AC_CHECK_LIB(dl,main,[LIBS="$LIBS -ldl"])
AC_CHECK_LIB(asound,main,[LIBS="$LIBS -lasound"]) AC_CHECK_LIB(asound,main,[LIBS="$LIBS -lasound"])
AC_OUTPUT([ AC_OUTPUT([
SoundTouch/Makefile 3rdparty/SoundTouch/Makefile
Makefile Makefile
]) ])

4
plugins/zerospu2/voices.cpp
View File

@ -21,8 +21,8 @@
#include "zerospu2.h" #include "zerospu2.h"
#include "SoundTouch/SoundTouch.h" #include "SoundTouch.h"
#include "SoundTouch/WavFile.h" #include "WavFile.h"
// VOICE_PROCESSED definitions // VOICE_PROCESSED definitions

4
plugins/zerospu2/zerodma.cpp
View File

@ -21,8 +21,8 @@
#include <assert.h> #include <assert.h>
#include <stdlib.h> #include <stdlib.h>
#include "SoundTouch/SoundTouch.h" #include "SoundTouch.h"
#include "SoundTouch/WavFile.h" #include "WavFile.h"
void CALLBACK SPU2readDMAMem(u16 *pMem, int size, int core) void CALLBACK SPU2readDMAMem(u16 *pMem, int size, int core)
{ {

4
plugins/zerospu2/zerospu2.cpp
View File

@ -25,8 +25,8 @@
#include "svnrev.h" #include "svnrev.h"
#endif #endif
#include "SoundTouch/SoundTouch.h" #include "SoundTouch.h"
#include "SoundTouch/WavFile.h" #include "WavFile.h"
char libraryName[256]; char libraryName[256];