diff options
| author | Stelios Tsampas <loathingkernel@gmail.com> | 2017-07-10 16:14:43 +0300 |
|---|---|---|
| committer | Stelios Tsampas <loathingkernel@gmail.com> | 2017-07-16 21:20:53 +0300 |
| commit | d880179b2a3aacae96bb4771a3c9e227ca6d5818 (patch) | |
| tree | 96730dce1e5afeef992abc6ae6884577c8ebf53c /libpcsxcore | |
| parent | 496df34ee4e3861c6e9b0ee8256d575622447563 (diff) | |
| download | pcsxr-d880179b2a3aacae96bb4771a3c9e227ca6d5818.tar.gz | |
Fix compilation on linux.
Diffstat (limited to 'libpcsxcore')
| -rw-r--r-- | libpcsxcore/Makefile.am | 20 | ||||
| -rwxr-xr-x | libpcsxcore/cdriso.c | 6 | ||||
| -rw-r--r-- | libpcsxcore/pgxp_gte.h | 3 |
3 files changed, 23 insertions, 6 deletions
diff --git a/libpcsxcore/Makefile.am b/libpcsxcore/Makefile.am index b67700e4..f46d2df8 100644 --- a/libpcsxcore/Makefile.am +++ b/libpcsxcore/Makefile.am @@ -54,7 +54,17 @@ libpcsxcore_a_SOURCES = \ socket.c \ socket.h \ ppf.c \ - ppf.h + ppf.h \ + pgxp_cpu.c \ + pgxp_cpu.h \ + pgxp_debug.c \ + pgxp_debug.h \ + pgxp_gte.c \ + pgxp_gte.h \ + pgxp_mem.c \ + pgxp_mem.h \ + pgxp_value.c \ + pgxp_value.h if ARCH_X86_64 libpcsxcore_a_SOURCES += \ @@ -66,14 +76,16 @@ libpcsxcore_a_SOURCES += \ ix86_64/ix86_fpu.c \ ix86_64/ix86_3dnow.c \ ix86_64/ix86_mmx.c \ - ix86_64/ix86_sse.c -else + ix86_64/ix86_sse.c \ + ix86_64/iPGXP.h +else if ARCH_X86 libpcsxcore_a_SOURCES += \ ix86/iGte.h \ ix86/iR3000A.c \ ix86/ix86.c \ - ix86/ix86.h + ix86/ix86.h \ + ix86/iPGXP.h endif endif diff --git a/libpcsxcore/cdriso.c b/libpcsxcore/cdriso.c index af4205cf..268f1030 100755 --- a/libpcsxcore/cdriso.c +++ b/libpcsxcore/cdriso.c @@ -88,6 +88,8 @@ static struct { } *compr_img; int (*cdimg_read_func)(FILE *f, unsigned int base, void *dest, int sector); +static int cdread_normal(FILE *f, unsigned int base, void *dest, int sector); +static int cdread_ecm_decode(FILE *f, unsigned int base, void *dest, int sector); char* CALLBACK CDR__getDriveLetter(void); long CALLBACK CDR__configure(void); @@ -1301,7 +1303,7 @@ static int cdread_sub_mixed(FILE *f, unsigned int base, void *dest, int sector) return ret; } -static int uncompress2(void *out, unsigned long *out_size, void *in, unsigned long in_size) +static int uncompress2_internal(void *out, unsigned long *out_size, void *in, unsigned long in_size) { static z_stream z; int ret = 0; @@ -1380,7 +1382,7 @@ static int cdread_compressed(FILE *f, unsigned int base, void *dest, int sector) if (is_compressed) { cdbuffer_size_expect = sizeof(compr_img->buff_raw[0]) << compr_img->block_shift; cdbuffer_size = cdbuffer_size_expect; - ret = uncompress2(compr_img->buff_raw[0], &cdbuffer_size, compr_img->buff_compressed, size); + ret = uncompress2_internal(compr_img->buff_raw[0], &cdbuffer_size, compr_img->buff_compressed, size); if (ret != 0) { SysPrintf("uncompress failed with %d for block %d, sector %d\n", ret, block, sector); diff --git a/libpcsxcore/pgxp_gte.h b/libpcsxcore/pgxp_gte.h index cc38ade1..de607c99 100644 --- a/libpcsxcore/pgxp_gte.h +++ b/libpcsxcore/pgxp_gte.h @@ -60,5 +60,8 @@ void PGXP_GTE_SWC2(u32 instr, u32 rtVal, u32 addr); // copy GTE reg to memory #ifndef max
# define max(a, b) ((a) > (b) ? (a) : (b))
#endif
+#ifndef min
+# define min(a, b) ((a) < (b) ? (a) : (b))
+#endif
#endif /* _PGXP_GTE_H_ */
|