diff options
| author | iCatButler <i.am.catbutler@gmail.com> | 2018-03-13 17:25:13 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-13 17:25:13 +0000 |
| commit | 768332417644451d38ce1a737465656c7cc75de3 (patch) | |
| tree | e6ca381effb72ccc4161d40f224b817a6631bc03 /libpcsxcore/Makefile.am | |
| parent | 15fe3782c1375634b7a9bd9bbbadfd75e7b06fed (diff) | |
| parent | 2d0b10f982e0b835f4b27be26b138703907a4219 (diff) | |
| download | pcsxr-768332417644451d38ce1a737465656c7cc75de3.tar.gz | |
Merge pull request #6 from loathingKernel/fix-linux-build
Fix compilation on Linux and add the new setting to the UI
Diffstat (limited to 'libpcsxcore/Makefile.am')
| -rw-r--r-- | libpcsxcore/Makefile.am | 92 |
1 files changed, 52 insertions, 40 deletions
diff --git a/libpcsxcore/Makefile.am b/libpcsxcore/Makefile.am index b67700e4..ee585ab7 100644 --- a/libpcsxcore/Makefile.am +++ b/libpcsxcore/Makefile.am @@ -4,25 +4,25 @@ AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \ noinst_LIBRARIES = libpcsxcore.a libpcsxcore_a_SOURCES = \ - psxbios.c \ - cdrom.c \ - psxcounters.c \ - psxdma.c \ - disr3000a.c \ - gpu.c \ - gpu.h \ - spu.c \ - sio.c \ - psxhw.c \ - mdec.c \ - psxmem.c \ - misc.c \ - plugins.c \ - decode_xa.c \ - r3000a.c \ - psxinterpreter.c \ - gte.c \ - psxhle.c \ + psxbios.c \ + cdrom.c \ + psxcounters.c \ + psxdma.c \ + disr3000a.c \ + gpu.c \ + gpu.h \ + spu.c \ + sio.c \ + psxhw.c \ + mdec.c \ + psxmem.c \ + misc.c \ + plugins.c \ + decode_xa.c \ + r3000a.c \ + psxinterpreter.c \ + gte.c \ + psxhle.c \ cdrom.h \ coff.h \ debug.c \ @@ -54,37 +54,49 @@ 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 += \ - ix86_64/iGte.h \ - ix86_64/iR3000A-64.c \ - ix86_64/ix86-64.c \ - ix86_64/ix86-64.h \ - ix86_64/ix86_cpudetect.c \ - ix86_64/ix86_fpu.c \ - ix86_64/ix86_3dnow.c \ - ix86_64/ix86_mmx.c \ - ix86_64/ix86_sse.c -else + ix86_64/iGte.h \ + ix86_64/iR3000A-64.c \ + ix86_64/ix86-64.c \ + ix86_64/ix86-64.h \ + ix86_64/ix86_cpudetect.c \ + ix86_64/ix86_fpu.c \ + ix86_64/ix86_3dnow.c \ + ix86_64/ix86_mmx.c \ + 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/iGte.h \ + ix86/iR3000A.c \ + ix86/ix86.c \ + ix86/ix86.h \ + ix86/iPGXP.h endif endif if ARCH_PPC libpcsxcore_a_SOURCES += \ - ppc/pGte.h \ - ppc/pR3000A.c \ - ppc/ppc.c \ - ppc/ppc.h \ - ppc/ppc_mnemonics.h \ - ppc/reguse.c \ + ppc/pGte.h \ + ppc/pR3000A.c \ + ppc/ppc.c \ + ppc/ppc.h \ + ppc/ppc_mnemonics.h \ + ppc/reguse.c \ ppc/reguse.h libpcsxcore_a_CCASFLAGS = -x assembler-with-cpp -mregnames -D__POWERPC__ endif |