From bfa5de7eccf4604ff8217f619e9685a09e80d545 Mon Sep 17 00:00:00 2001 From: Pixel Date: Fri, 27 Sep 2002 12:17:57 +0000 Subject: The week-without-the-network changes --- PcsxSrc/Debug.h | 18 +++++++++--------- PcsxSrc/Linux/Makefile | 7 ++++--- PcsxSrc/Sio.c | 13 ++++++++++++- 3 files changed, 25 insertions(+), 13 deletions(-) (limited to 'PcsxSrc') diff --git a/PcsxSrc/Debug.h b/PcsxSrc/Debug.h index 14f94cb..efb426e 100644 --- a/PcsxSrc/Debug.h +++ b/PcsxSrc/Debug.h @@ -33,17 +33,17 @@ FILE *gteLog; //#define LOG_STDOUT -//#define PAD_LOG __Log -//#define GTE_LOG __Log -//#define CDR_LOG __Log("%8.8lx %8.8lx: ", psxRegs.pc, psxRegs.cycle); __Log +#define PAD_LOG __Log +#define GTE_LOG __Log +#define CDR_LOG __Log("%8.8lx %8.8lx: ", psxRegs.pc, psxRegs.cycle); __Log -//#define PSXHW_LOG __Log("%8.8lx %8.8lx: ", psxRegs.pc, psxRegs.cycle); __Log -//#define PSXBIOS_LOG __Log("%8.8lx %8.8lx: ", psxRegs.pc, psxRegs.cycle); __Log -//#define PSXDMA_LOG __Log -//#define PSXMEM_LOG __Log("%8.8lx %8.8lx: ", psxRegs.pc, psxRegs.cycle); __Log -//#define PSXCPU_LOG __Log +#define PSXHW_LOG __Log("%8.8lx %8.8lx: ", psxRegs.pc, psxRegs.cycle); __Log +#define PSXBIOS_LOG __Log("%8.8lx %8.8lx: ", psxRegs.pc, psxRegs.cycle); __Log +#define PSXDMA_LOG __Log +#define PSXMEM_LOG __Log("%8.8lx %8.8lx: ", psxRegs.pc, psxRegs.cycle); __Log +#define PSXCPU_LOG __Log -//#define CDRCMD_DEBUG +#define CDRCMD_DEBUG #if defined (PSXCPU_LOG) || defined(PSXDMA_LOG) || defined(CDR_LOG) || defined(PSXHW_LOG) || \ defined(PSXBIOS_LOG) || defined(GTE_LOG) || defined(PAD_LOG) diff --git a/PcsxSrc/Linux/Makefile b/PcsxSrc/Linux/Makefile index bbf1b70..71d47e5 100644 --- a/PcsxSrc/Linux/Makefile +++ b/PcsxSrc/Linux/Makefile @@ -19,7 +19,8 @@ OPTIMIZE = -O2 -fomit-frame-pointer -finline-functions -ffast-math FLAGS = -D__LINUX__ -DPCSX_VERSION=\"${VERSION}\" # this includes the option -rdynamic and we don't want that LIBST = $(shell gtk-config --libs) -LIBS = $(subst -rdynamic, , ${LIBST}) -lz +#LIBS = $(subst -rdynamic, , ${LIBST}) -lz +LIBS = ${LIBST} -lz OBJS = ../PsxBios.o ../CdRom.o ../PsxCounters.o ../PsxDma.o ../DisR3000A.o \ ../Spu.o ../Sio.o ../PsxHw.o ../Mdec.o ../PsxMem.o ../Misc.o \ @@ -29,7 +30,7 @@ OBJS+= LnxMain.o Plugin.o Config.o GtkGui.o OBJS+= GladeGui.o GladeFuncs.o #GladeCalls.o ifeq (${CPU}, ix86) - CC = pgcc + CC = gcc OPTIMIZE = -O4 -fomit-frame-pointer -finline-functions -ffast-math -fno-exceptions -march=pentiumpro OBJS+= ../ix86/iR3000A.o ../ix86/ix86.o FLAGS+= -D__i386__ @@ -41,7 +42,7 @@ ASMFLAGS = -f elf ${FLAGS} -i./ -i../ pcsx: ${OBJS} ${CC} ${CFLAGS} ${OBJS} -o pcsx ${LIBS} - ${STRIP} pcsx +# ${STRIP} pcsx .PHONY: clean pcsx diff --git a/PcsxSrc/Sio.c b/PcsxSrc/Sio.c index 36f09b8..263e556 100644 --- a/PcsxSrc/Sio.c +++ b/PcsxSrc/Sio.c @@ -46,7 +46,18 @@ static unsigned char adrH,adrL; static unsigned long padst; PadDataS pad; - + +#ifndef strlwr +#include +char * strlwr(char * string) { + char * r; + for (r = string; *r; r++) { + *r = tolower(*r); + } + return string; +} +#endif + char Mcd1Data[MCD_SIZE], Mcd2Data[MCD_SIZE]; // clk cycle byte -- cgit v1.2.3