X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=ff8d1bb6adb15b8734d924af8a581beedb9d98d0;hb=4d74a45a59e004497a65359666ac47867093143f;hp=91bf5773dadeea37f83983e45aee02f9400bb816;hpb=6ce0b00a79f4fa7c4a1735be9f48bfbc644b080c;p=pcsx_rearmed.git

diff --git a/Makefile b/Makefile
index 91bf5773..ff8d1bb6 100644
--- a/Makefile
+++ b/Makefile
@@ -57,7 +57,7 @@ OBJS += libpcsxcore/cdriso.o libpcsxcore/cdrom.o libpcsxcore/cheat.o libpcsxcore
 OBJS += libpcsxcore/gte.o libpcsxcore/gte_nf.o libpcsxcore/gte_divider.o
 
 ifeq ($(DEBUG), 1)
-OBJS += libpcsxcore/debug.o	libpcsxcore/socket.o libpcsxcore/disr3000a.o
+#OBJS += libpcsxcore/debug.o	libpcsxcore/socket.o libpcsxcore/disr3000a.o
 endif
 
 ifeq ($(WANT_ZLIB),1)
@@ -91,12 +91,18 @@ ifeq "$(DYNAREC)" "lightrec"
 CFLAGS += -Ideps/lightning/include -Ideps/lightrec -Iinclude/lightning -Iinclude/lightrec \
 		  -DLIGHTREC -DLIGHTREC_STATIC
 LIGHTREC_CUSTOM_MAP ?= 0
-CFLAGS += -DLIGHTREC_CUSTOM_MAP=$(LIGHTREC_CUSTOM_MAP)
+LIGHTREC_THREADED_COMPILER ?= 0
+CFLAGS += -DLIGHTREC_CUSTOM_MAP=$(LIGHTREC_CUSTOM_MAP) \
+	  -DLIGHTREC_ENABLE_THREADED_COMPILER=$(LIGHTREC_THREADED_COMPILER)
 deps/lightning/lib/%.o: CFLAGS += -DHAVE_MMAP
 ifeq ($(LIGHTREC_CUSTOM_MAP),1)
 LDLIBS += -lrt
 OBJS += libpcsxcore/lightrec/mem.o
 endif
+ifeq ($(LIGHTREC_THREADED_COMPILER),1)
+OBJS += deps/lightrec/recompiler.o \
+	deps/lightrec/reaper.o
+endif
 OBJS += deps/lightrec/tlsf/tlsf.o
 OBJS += libpcsxcore/lightrec/plugin.o
 OBJS += deps/lightning/lib/jit_disasm.o \
@@ -107,15 +113,14 @@ OBJS += deps/lightning/lib/jit_disasm.o \
 		deps/lightning/lib/jit_size.o \
 		deps/lightning/lib/lightning.o \
 		deps/lightrec/blockcache.o \
+		deps/lightrec/constprop.o \
 		deps/lightrec/disassembler.o \
 		deps/lightrec/emitter.o \
 		deps/lightrec/interpreter.o \
 		deps/lightrec/lightrec.o \
 		deps/lightrec/memmanager.o \
 		deps/lightrec/optimizer.o \
-		deps/lightrec/regcache.o \
-		deps/lightrec/recompiler.o \
-		deps/lightrec/reaper.o
+		deps/lightrec/regcache.o
 libpcsxcore/lightrec/mem.o: CFLAGS += -D_GNU_SOURCE
 ifeq ($(MMAP_WIN32),1)
 CFLAGS += -Iinclude/mman -I deps/mman
@@ -136,7 +141,7 @@ OBJS += libpcsxcore/new_dynarec/pcsxmem.o
 else
 CFLAGS += -DDRC_DISABLE
 endif
-OBJS += libpcsxcore/new_dynarec/emu_if.o
+OBJS += libpcsxcore/new_dynarec/emu_if.o libpcsxcore/new_dynarec/events.o
 libpcsxcore/new_dynarec/new_dynarec.o: libpcsxcore/new_dynarec/pcsxmem_inline.c
 ifdef DRC_DBG
 libpcsxcore/new_dynarec/emu_if.o: CFLAGS += -D_FILE_OFFSET_BITS=64