X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=6a83f46baf0dcfcff0f703532117ed604123bd0a;hb=b74a54b1ac0fa605f56411704fb902d7cf17c71a;hp=3f33bd3754a8aac9e8098db4bde72c416ae2905d;hpb=ebed7428a3e7e817bb4befe7fdfc1f5681577e50;p=pcsx_rearmed.git diff --git a/Makefile b/Makefile index 3f33bd37..6a83f46b 100644 --- a/Makefile +++ b/Makefile @@ -88,7 +88,7 @@ libpcsxcore/psxbios.o: CFLAGS += -Wno-nonnull # dynarec ifeq "$(DYNAREC)" "lightrec" -CFLAGS += -Ideps/lightning/include -Ideps/lightrec \ +CFLAGS += -Ideps/lightning/include -Ideps/lightrec -Iinclude/lightning -Iinclude/lightrec \ -DLIGHTREC -DLIGHTREC_STATIC OBJS += libpcsxcore/lightrec/plugin.o OBJS += deps/lightning/lib/jit_disasm.o \ @@ -109,7 +109,7 @@ OBJS += deps/lightning/lib/jit_disasm.o \ deps/lightrec/recompiler.o \ deps/lightrec/reaper.o ifeq ($(MMAP_WIN32),1) -CFLAGS += -Ideps/mman +CFLAGS += -Iinclude/mman OBJS += deps/mman/mman.o endif else ifeq "$(DYNAREC)" "ari64" @@ -366,7 +366,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 +410,7 @@ endif # ----------- release ----------- -VER ?= $(shell git describe HEAD) +VER ?= $(shell git describe --always HEAD) ifeq "$(PLATFORM)" "generic" OUT = pcsx_rearmed_$(VER)