still disable it in some cases (instead of fixing) to avoid
drifting from upstream projects too much.
ARCH = $(shell $(CC) -v 2>&1 | grep -i 'target:' | awk '{print $$2}' | awk -F '-' '{print $$1}')
ARCH = $(shell $(CC) -v 2>&1 | grep -i 'target:' | awk '{print $$2}' | awk -F '-' '{print $$1}')
-CFLAGS += -ggdb -Ifrontend
+CFLAGS += -Wall -ggdb -Ifrontend
LDFLAGS += -lz -lpthread -ldl -lpng -lbz2
ifeq "$(ARCH)" "arm"
CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfloat-abi=softfp -ffast-math
LDFLAGS += -lz -lpthread -ldl -lpng -lbz2
ifeq "$(ARCH)" "arm"
CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfloat-abi=softfp -ffast-math
ifeq "$(ARCH)" "arm"
OBJS += libpcsxcore/gte_neon.o
endif
ifeq "$(ARCH)" "arm"
OBJS += libpcsxcore/gte_neon.o
endif
+libpcsxcore/cdrom.o libpcsxcore/misc.o: CFLAGS += -Wno-pointer-sign
+libpcsxcore/misc.o libpcsxcore/psxbios.o: CFLAGS += -Wno-nonnull
+
# dynarec
ifndef NO_NEW_DRC
OBJS += libpcsxcore/new_dynarec/new_dynarec.o libpcsxcore/new_dynarec/linkage_arm.o
# dynarec
ifndef NO_NEW_DRC
OBJS += libpcsxcore/new_dynarec/new_dynarec.o libpcsxcore/new_dynarec/linkage_arm.o
OBJS += libpcsxcore/new_dynarec/emu_if.o
libpcsxcore/new_dynarec/new_dynarec.o: libpcsxcore/new_dynarec/assem_arm.c \
libpcsxcore/new_dynarec/pcsxmem_inline.c
OBJS += libpcsxcore/new_dynarec/emu_if.o
libpcsxcore/new_dynarec/new_dynarec.o: libpcsxcore/new_dynarec/assem_arm.c \
libpcsxcore/new_dynarec/pcsxmem_inline.c
+libpcsxcore/new_dynarec/new_dynarec.o: CFLAGS += -Wno-all -Wno-pointer-sign
ifdef DRC_DBG
libpcsxcore/new_dynarec/emu_if.o: CFLAGS += -D_FILE_OFFSET_BITS=64
CFLAGS += -DDRC_DBG
ifdef DRC_DBG
libpcsxcore/new_dynarec/emu_if.o: CFLAGS += -D_FILE_OFFSET_BITS=64
CFLAGS += -DDRC_DBG
plugins/dfsound/registers.o plugins/dfsound/spu.o
plugins/dfsound/spu.o: plugins/dfsound/adsr.c plugins/dfsound/reverb.c \
plugins/dfsound/xa.c
plugins/dfsound/registers.o plugins/dfsound/spu.o
plugins/dfsound/spu.o: plugins/dfsound/adsr.c plugins/dfsound/reverb.c \
plugins/dfsound/xa.c
-plugins/dfsound/%.o: CFLAGS += -Wall
ifeq "$(USE_OSS)" "1"
plugins/dfsound/%.o: CFLAGS += -DUSEOSS
OBJS += plugins/dfsound/oss.o
ifeq "$(USE_OSS)" "1"
plugins/dfsound/%.o: CFLAGS += -DUSEOSS
OBJS += plugins/dfsound/oss.o
# gpu
# note: code is not safe for strict-aliasing? (Castlevania problems)
# gpu
# note: code is not safe for strict-aliasing? (Castlevania problems)
-plugins/dfxvideo/%.o: CFLAGS += -Wall -fno-strict-aliasing
+plugins/dfxvideo/%.o: CFLAGS += -fno-strict-aliasing
OBJS += plugins/dfxvideo/gpu.o
plugins/dfxvideo/gpu.o: plugins/dfxvideo/fps.c plugins/dfxvideo/prim.c \
plugins/dfxvideo/gpu.c plugins/dfxvideo/soft.c
OBJS += plugins/dfxvideo/gpu.o
plugins/dfxvideo/gpu.o: plugins/dfxvideo/fps.c plugins/dfxvideo/prim.c \
plugins/dfxvideo/gpu.c plugins/dfxvideo/soft.c
-plugins/cdrcimg/%.o: CFLAGS += -Wall
OBJS += plugins/cdrcimg/cdrcimg.o
# dfinput
OBJS += plugins/cdrcimg/cdrcimg.o
# dfinput
-plugins/dfinput/%.o: CFLAGS += -Wall
OBJS += plugins/dfinput/pad.o
# gui
OBJS += plugins/dfinput/pad.o
# gui
ifeq "$(USE_GTK)" "1"
OBJS += maemo/hildon.o maemo/main.o
maemo/%.o: maemo/%.c
ifeq "$(USE_GTK)" "1"
OBJS += maemo/hildon.o maemo/main.o
maemo/%.o: maemo/%.c
-maemo/%.o: CFLAGS += -Wall
else
OBJS += frontend/plugin_lib.o frontend/menu.o
OBJS += frontend/linux/fbdev.o frontend/linux/in_evdev.o
else
OBJS += frontend/plugin_lib.o frontend/menu.o
OBJS += frontend/linux/fbdev.o frontend/linux/in_evdev.o
ifdef PCNT
CFLAGS += -DPCNT
endif
ifdef PCNT
CFLAGS += -DPCNT
endif
-frontend/%.o: CFLAGS += -Wall -DIN_EVDEV
+frontend/%.o: CFLAGS += -DIN_EVDEV
frontend/menu.o: frontend/revision.h
frontend/revision.h: FORCE
frontend/menu.o: frontend/revision.h
frontend/revision.h: FORCE
unsigned int sect;
unsigned char time[3];
sect = msf2sec(ti[numtracks].start) + msf2sec(ti[numtracks].length);
unsigned int sect;
unsigned char time[3];
sect = msf2sec(ti[numtracks].start) + msf2sec(ti[numtracks].length);
+ sec2msf(sect, (char *)time);
buffer[2] = time[0];
buffer[1] = time[1];
buffer[0] = time[2];
buffer[2] = time[0];
buffer[1] = time[1];
buffer[0] = time[2];
return 0;
// find the track
return 0;
// find the track
+ sect = msf2sec((char *)time);
for (i = numtracks; i > 1; i--)
if (msf2sec(ti[i].start) <= sect + 2 * 75)
break;
for (i = numtracks; i > 1; i--)
if (msf2sec(ti[i].start) <= sect + 2 * 75)
break;
unsigned char *sbi_sectors;
int LoadSBI(const char *fname, int sector_count) {
unsigned char *sbi_sectors;
int LoadSBI(const char *fname, int sector_count) {
- char buffer[16], sbifile[MAXPATHLEN];
FILE *sbihandle;
u8 sbitime[3];
int s;
FILE *sbihandle;
u8 sbitime[3];
int s;
if (sbihandle == NULL)
return -1;
if (sbihandle == NULL)
return -1;
-if (sbi_sectors != NULL) printf("sbi_sectors?\n");
sbi_sectors = calloc(1, sector_count / 8);
if (sbi_sectors == NULL)
return -1;
sbi_sectors = calloc(1, sector_count / 8);
if (sbi_sectors == NULL)
return -1;
extern unsigned char *sbi_sectors;
extern unsigned char *sbi_sectors;
static inline int CheckSBI(const u8 *t)
{
int s;
static inline int CheckSBI(const u8 *t)
{
int s;
SysUpdate();
ApplyCheats();
SysUpdate();
ApplyCheats();
+
+ // reamed hack
+ {
+ extern void pl_frame_limit(void);
+ pl_frame_limit();
+ }
}
void __Log(char *fmt, ...) {
}
void __Log(char *fmt, ...) {
vsprintf( buf, str, va );
va_end( va );
vsprintf( buf, str, va );
va_end( va );
}
void GetMcdBlockInfo(int mcd, int block, McdBlock *Info) {
}
void GetMcdBlockInfo(int mcd, int block, McdBlock *Info) {
- unsigned char *data = NULL, *ptr, *str, *sstr;
+ char *data = NULL, *ptr, *str, *sstr;
unsigned short clut[16];
unsigned short c;
int i, x;
unsigned short clut[16];
unsigned short c;
int i, x;
}
int RawReadSocket(char * buffer, int len) {
}
int RawReadSocket(char * buffer, int len) {
int mlen = len < ptr ? len : ptr;
if (!client_socket)
int mlen = len < ptr ? len : ptr;
if (!client_socket)