Add missing files

[pcsx_rearmed.git] / Makefile

diff --git a/Makefile b/Makefile
index aff5c60..11da964 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ CFLAGS += -Wall -Iinclude -ffast-math
 ifeq ($(DEBUG), 1)
 CFLAGS += -O0 -ggdb
 else
-ifeq ($(platform), vita)
+ifeq ($(platform), $(filter $(platform), vita ctr))
 CFLAGS += -O3 -DNDEBUG
 else
 CFLAGS += -O2 -DNDEBUG
@@ -97,12 +97,14 @@ OBJS += deps/lightning/lib/jit_disasm.o \
                deps/lightrec/memmanager.o \
                deps/lightrec/optimizer.o \
                deps/lightrec/regcache.o \
-               deps/lightrec/recompiler.o
+               deps/lightrec/recompiler.o \
+               deps/lightrec/reaper.o
 ifeq ($(MMAP_WIN32),1)
 CFLAGS += -Ideps/mman
 OBJS += deps/mman/mman.o
 endif
 else ifeq "$(DYNAREC)" "ari64"
+CFLAGS += -DNEW_DYNAREC
 OBJS += libpcsxcore/new_dynarec/backends/psx/emu_if.o \
                libpcsxcore/new_dynarec/new_dynarec.o \
                libpcsxcore/new_dynarec/arm/linkage_arm.o \
@@ -178,6 +180,10 @@ CFLAGS += -DGPU_PEOPS
 plugins/dfxvideo/gpulib_if.o: CFLAGS += -fno-strict-aliasing
 plugins/dfxvideo/gpulib_if.o: plugins/dfxvideo/prim.c plugins/dfxvideo/soft.c
 OBJS += plugins/dfxvideo/gpulib_if.o
+ifeq "$(THREAD_RENDERING)" "1"
+CFLAGS += -DTHREAD_RENDERING
+OBJS += plugins/gpulib/gpulib_thread_if.o
+endif
 endif
 ifeq "$(BUILTIN_GPU)" "unai"
 CFLAGS += -DGPU_UNAI
@@ -188,6 +194,10 @@ OBJS += plugins/gpu_unai/gpulib_if.o
 ifeq "$(ARCH)" "arm"
 OBJS += plugins/gpu_unai/gpu_arm.o
 endif
+ifeq "$(THREAD_RENDERING)" "1"
+CFLAGS += -DTHREAD_RENDERING
+OBJS += plugins/gpulib/gpulib_thread_if.o
+endif
 plugins/gpu_unai/gpulib_if.o: CFLAGS += -DREARMED -O3 
 CC_LINK = $(CXX)
 endif
@@ -197,29 +207,10 @@ OBJS += plugins/cdrcimg/cdrcimg.o
 
 # libchdr
 ifeq "$(HAVE_CHD)" "1"
-CFLAGS += -Ideps/libchdr
+CFLAGS += -Ideps/libchdr/include
+CFLAGS += -Ideps/libchdr/include/libchdr
 OBJS += deps/crypto/md5.o
 OBJS += deps/crypto/sha1.o
-OBJS += deps/flac-1.3.2/src/libFLAC/bitmath.o
-OBJS += deps/flac-1.3.2/src/libFLAC/bitreader.o
-OBJS += deps/flac-1.3.2/src/libFLAC/cpu.o
-OBJS += deps/flac-1.3.2/src/libFLAC/crc.o
-OBJS += deps/flac-1.3.2/src/libFLAC/fixed.o
-OBJS += deps/flac-1.3.2/src/libFLAC/fixed_intrin_sse2.o
-OBJS += deps/flac-1.3.2/src/libFLAC/fixed_intrin_ssse3.o
-OBJS += deps/flac-1.3.2/src/libFLAC/float.o
-OBJS += deps/flac-1.3.2/src/libFLAC/format.o
-OBJS += deps/flac-1.3.2/src/libFLAC/lpc.o
-OBJS += deps/flac-1.3.2/src/libFLAC/lpc_intrin_avx2.o
-OBJS += deps/flac-1.3.2/src/libFLAC/lpc_intrin_sse2.o
-OBJS += deps/flac-1.3.2/src/libFLAC/lpc_intrin_sse41.o
-OBJS += deps/flac-1.3.2/src/libFLAC/lpc_intrin_sse.o
-OBJS += deps/flac-1.3.2/src/libFLAC/md5.o
-OBJS += deps/flac-1.3.2/src/libFLAC/memory.o
-OBJS += deps/flac-1.3.2/src/libFLAC/metadata_iterators.o
-OBJS += deps/flac-1.3.2/src/libFLAC/metadata_object.o
-OBJS += deps/flac-1.3.2/src/libFLAC/stream_decoder.o
-OBJS += deps/flac-1.3.2/src/libFLAC/window.o
 OBJS += deps/lzma-16.04/C/Alloc.o
 OBJS += deps/lzma-16.04/C/Bra86.o
 OBJS += deps/lzma-16.04/C/Bra.o
@@ -233,26 +224,20 @@ OBJS += deps/lzma-16.04/C/LzmaDec.o
 OBJS += deps/lzma-16.04/C/LzmaEnc.o
 OBJS += deps/lzma-16.04/C/LzmaLib.o
 OBJS += deps/lzma-16.04/C/Sort.o
-OBJS += deps/libchdr/bitstream.o
-OBJS += deps/libchdr/cdrom.o
-OBJS += deps/libchdr/chd.o
-OBJS += deps/libchdr/flac.o
-OBJS += deps/libchdr/huffman.o
-
-ifneq (,$(findstring win,$(platform)))
-  CFLAGS += -DHAVE_FSEEKO
-  OBJS += deps/flac-1.3.2/src/libFLAC/windows_unicode_filenames.o
-else
-  CFLAGS += -DHAVE_SYS_PARAM_H
-endif
-
-CFLAGS += -Ideps/crypto -Ideps/flac-1.3.2/include -Ideps/flac-1.3.2/src/libFLAC/include -Ideps/flac-1.3.2/src/libFLAC/include -Ideps/lzma-16.04/C
-CFLAGS += -DHAVE_CHD -D'PACKAGE_VERSION="1.3.2"' -DFLAC__HAS_OGG=0 -DFLAC__NO_DLL -DHAVE_LROUND -DHAVE_STDINT_H -DHAVE_STDLIB_H -DFLAC__NO_DLL -D_7ZIP_ST
+OBJS += deps/libchdr/src/libchdr_bitstream.o
+OBJS += deps/libchdr/src/libchdr_cdrom.o
+OBJS += deps/libchdr/src/libchdr_chd.o
+OBJS += deps/libchdr/src/libchdr_flac.o
+OBJS += deps/libchdr/src/libchdr_huffman.o
+CFLAGS += -Ideps/crypto -Ideps/lzma-16.04/C
+CFLAGS += -DHAVE_CHD -D_7ZIP_ST
 LDFLAGS += -lm
 endif
 
 # dfinput
+ifneq "$(PLATFORM)" "libretro"
 OBJS += plugins/dfinput/main.o plugins/dfinput/pad.o plugins/dfinput/guncon.o
+endif
 
 # frontend/gui
 OBJS += frontend/cspace.o
@@ -310,6 +295,9 @@ CFLAGS += `pkg-config --cflags glib-2.0 libosso dbus-1 hildon-fm-2`
 LDFLAGS += `pkg-config --libs glib-2.0 libosso dbus-1 hildon-fm-2`
 endif
 ifeq "$(PLATFORM)" "libretro"
+OBJS += libretro-common/compat/fopen_utf8.o
+OBJS += libretro-common/encodings/compat_strl.o
+OBJS += libretro-common/encodings/encoding_utf.o
 OBJS += frontend/libretro.o
 CFLAGS += -Ilibretro-common/include
 CFLAGS += -DFRONTEND_SUPPORTS_RGB565