X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=d1585a17594b8664bab62f94fe3633fa8ac5cd60;hb=437b1e617808119c3a24a72c77cd2fa86a5d3220;hp=3f33bd3754a8aac9e8098db4bde72c416ae2905d;hpb=ebed7428a3e7e817bb4befe7fdfc1f5681577e50;p=pcsx_rearmed.git diff --git a/Makefile b/Makefile index 3f33bd37..d1585a17 100644 --- a/Makefile +++ b/Makefile @@ -47,6 +47,9 @@ ifdef PCNT 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 \ @@ -88,8 +91,12 @@ libpcsxcore/psxbios.o: CFLAGS += -Wno-nonnull # dynarec ifeq "$(DYNAREC)" "lightrec" -CFLAGS += -Ideps/lightning/include -Ideps/lightrec \ - -DLIGHTREC -DLIGHTREC_STATIC +CFLAGS += -Ideps/lightning/include -Ideps/lightrec -Iinclude/lightning -Iinclude/lightrec \ + -DLIGHTREC -DLIGHTREC_STATIC -DHAVE_MMAP +ifeq ($(LIGHTREC_CUSTOM_MAP),1) +LDLIBS += -lrt +OBJS += libpcsxcore/lightrec/mem.o +endif OBJS += libpcsxcore/lightrec/plugin.o OBJS += deps/lightning/lib/jit_disasm.o \ deps/lightning/lib/jit_memory.o \ @@ -108,8 +115,9 @@ OBJS += deps/lightning/lib/jit_disasm.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) -CFLAGS += -Ideps/mman +CFLAGS += -Iinclude/mman OBJS += deps/mman/mman.o endif else ifeq "$(DYNAREC)" "ari64" @@ -366,7 +374,7 @@ libpcsxcore/gte_nf.o: libpcsxcore/gte.c $(CC) -c -o $@ $^ $(CFLAGS) -DFLAGLESS frontend/revision.h: FORCE - @(git describe || echo) | sed -e 's/.*/#define REV "\0"/' > $@_ + @(git describe --always || echo) | sed -e 's/.*/#define REV "\0"/' > $@_ @diff -q $@_ $@ > /dev/null 2>&1 || cp $@_ $@ @rm $@_ @@ -410,7 +418,7 @@ endif # ----------- release ----------- -VER ?= $(shell git describe HEAD) +VER ?= $(shell git describe --always HEAD) ifeq "$(PLATFORM)" "generic" OUT = pcsx_rearmed_$(VER)