notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Get rid of bit fields in union
[pcsx_rearmed.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
a1d6336
..
616feeb
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-47,6
+47,9
@@
ifdef PCNT
CFLAGS += -DPCNT
endif
CFLAGS += -DPCNT
endif
+LIGHTREC_CUSTOM_MAP ?= 0
+CFLAGS += -DLIGHTREC_CUSTOM_MAP=$(LIGHTREC_CUSTOM_MAP)
+
# core
OBJS += libpcsxcore/cdriso.o libpcsxcore/cdrom.o libpcsxcore/cheat.o libpcsxcore/database.o \
libpcsxcore/decode_xa.o libpcsxcore/mdec.o \
# core
OBJS += libpcsxcore/cdriso.o libpcsxcore/cdrom.o libpcsxcore/cheat.o libpcsxcore/database.o \
libpcsxcore/decode_xa.o libpcsxcore/mdec.o \
@@
-90,6
+93,12
@@
libpcsxcore/psxbios.o: CFLAGS += -Wno-nonnull
ifeq "$(DYNAREC)" "lightrec"
CFLAGS += -Ideps/lightning/include -Ideps/lightrec -Iinclude/lightning -Iinclude/lightrec \
-DLIGHTREC -DLIGHTREC_STATIC
ifeq "$(DYNAREC)" "lightrec"
CFLAGS += -Ideps/lightning/include -Ideps/lightrec -Iinclude/lightning -Iinclude/lightrec \
-DLIGHTREC -DLIGHTREC_STATIC
+deps/lightning/lib/%.o: CFLAGS += -DHAVE_MMAP
+ifeq ($(LIGHTREC_CUSTOM_MAP),1)
+LDLIBS += -lrt
+OBJS += libpcsxcore/lightrec/mem.o
+endif
+OBJS += deps/lightrec/tlsf/tlsf.o
OBJS += libpcsxcore/lightrec/plugin.o
OBJS += deps/lightning/lib/jit_disasm.o \
deps/lightning/lib/jit_memory.o \
OBJS += libpcsxcore/lightrec/plugin.o
OBJS += deps/lightning/lib/jit_disasm.o \
deps/lightning/lib/jit_memory.o \
@@
-108,8
+117,9
@@
OBJS += deps/lightning/lib/jit_disasm.o \
deps/lightrec/regcache.o \
deps/lightrec/recompiler.o \
deps/lightrec/reaper.o
deps/lightrec/regcache.o \
deps/lightrec/recompiler.o \
deps/lightrec/reaper.o
+libpcsxcore/lightrec/mem.o: CFLAGS += -D_GNU_SOURCE
ifeq ($(MMAP_WIN32),1)
ifeq ($(MMAP_WIN32),1)
-CFLAGS += -I
deps
/mman
+CFLAGS += -I
include
/mman
OBJS += deps/mman/mman.o
endif
else ifeq "$(DYNAREC)" "ari64"
OBJS += deps/mman/mman.o
endif
else ifeq "$(DYNAREC)" "ari64"