xavi/pcsxr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@48367 e17a0e51-4ae3-4d35-97c3-1a29b211df97

Browse Source
This commit is contained in:
SND\weimingzhi_cp 2010-05-20 04:55:02 +00:00
parent e1e09a77d2
commit b8b814362e
7 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -2,6 +2,9 @@ May 20, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
* macosx/main.m: Removed obsolete code, added const to function definations.
* libpcsxcore/plugins.c: Added brackets around the use of CheckErr().
* libpcsxcore/psxcommon.h: Added brackets around gzfreeze().
* plugins/dfinput/Makefile.am: Use $(SDL_CFLAGS) and $(SDL_LIBS).
* plugins/dfsound/Makefile.am: Likewise.
May 19, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>

10
libpcsxcore/psxcommon.h
View File

@ -136,12 +136,16 @@ typedef struct {
extern PcsxConfig Config;
extern boolean NetOpened;
#define gzfreeze(ptr, size) \
#define gzfreeze(ptr, size) { \
if (Mode == 1) gzwrite(f, ptr, size); \
if (Mode == 0) gzread(f, ptr, size);
if (Mode == 0) gzread(f, ptr, size); \
}
// Make the timing events trigger faster as we are currently assuming everything
// takes one cycle, which is not the case on real hardware.
// FIXME: Count the proper cycle and get rid of this
#define BIAS 2
#define PSXCLK 33868800 /* 33.8688 Mhz */
#define PSXCLK 33868800 /* 33.8688 MHz */
enum {
PSX_TYPE_NTSC = 0,

2
libpcsxcore/psxinterpreter.c
View File

@ -781,7 +781,7 @@ static void intShutdown() {
// interpreter execution
inline void execI() {
u32 *code = (u32 *)PSXM(psxRegs.pc);
u32 *code = (u32 *)PSXM(psxRegs.pc);
psxRegs.code = ((code == NULL) ? 0 : SWAP32(*code));
debugI();

4
plugins/dfinput/Makefile.am
View File

@ -11,12 +11,12 @@ INCLUDES = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \
-DLOCALE_DIR=\"${datadir}/locale/\" \
-DDATADIR=\"${datadir}/psemu/\" \
$(GTK2_CFLAGS) $(GLADE2_CFLAGS) -I/usr/X11R6/include \
-I../../include -I../../libpcsxcore `$(SDL_CONFIG) --cflags`
-I../../include -I../../libpcsxcore $(SDL_CFLAGS)
bin_PROGRAMS = cfgDFInput
cfgDFInput_SOURCES = cfg-gtk2.c pad.h
cfgDFInput_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS)
cfgDFInput_LDFLAGS = `$(SDL_CONFIG) --libs`
cfgDFInput_LDFLAGS = $(SDL_LIBS)
glade_DATA = dfinput.glade2
gladedir = $(datadir)/psemu/

4
plugins/dfinput/Makefile.in
View File

@ -263,11 +263,11 @@ INCLUDES = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \
-DLOCALE_DIR=\"${datadir}/locale/\" \
-DDATADIR=\"${datadir}/psemu/\" \
$(GTK2_CFLAGS) $(GLADE2_CFLAGS) -I/usr/X11R6/include \
-I../../include -I../../libpcsxcore `$(SDL_CONFIG) --cflags`
-I../../include -I../../libpcsxcore $(SDL_CFLAGS)
cfgDFInput_SOURCES = cfg-gtk2.c pad.h
cfgDFInput_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS)
cfgDFInput_LDFLAGS = `$(SDL_CONFIG) --libs`
cfgDFInput_LDFLAGS = $(SDL_LIBS)
glade_DATA = dfinput.glade2
gladedir = $(datadir)/psemu/
EXTRA_DIST = $(glade_DATA)

4
plugins/dfsound/Makefile.am
View File

@ -11,9 +11,9 @@ lib_LTLIBRARIES = libDFSound.la
libDFSound_la_SOURCES = spu.c cfg.c dma.c freeze.c psemu.c registers.c sdl.c
libDFSound_la_CFLAGS = `$(SDL_CONFIG) --cflags`
libDFSound_la_CFLAGS = $(SDL_CFLAGS)
libDFSound_la_LDFLAGS = -module -avoid-version -lpthread -lm
libDFSound_la_LDFLAGS += `$(SDL_CONFIG) --libs`
libDFSound_la_LDFLAGS += $(SDL_LIBS)
bin_PROGRAMS = cfgDFSound
cfgDFSound_SOURCES = spucfg-0.1df/main.c

4
plugins/dfsound/Makefile.in
View File

@ -262,9 +262,9 @@ INCLUDES = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \
lib_LTLIBRARIES = libDFSound.la
libDFSound_la_SOURCES = spu.c cfg.c dma.c freeze.c psemu.c registers.c sdl.c
libDFSound_la_CFLAGS = `$(SDL_CONFIG) --cflags`
libDFSound_la_CFLAGS = $(SDL_CFLAGS)
libDFSound_la_LDFLAGS = -module -avoid-version -lpthread -lm \
`$(SDL_CONFIG) --libs`
$(SDL_LIBS)
cfgDFSound_SOURCES = spucfg-0.1df/main.c
cfgDFSound_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS)
glade_DATA = spucfg-0.1df/dfsound.glade2