X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=7616cac55f1bcaacc5d3f7a5a0132bff8d169a19;hb=cdc2da64d4c55a97c4507b6c9389bf4dca04695b;hp=0db94f7772205a0a541a5fe5ad967203ecf5dec0;hpb=2a014d73faf4cec54f8bf51134828173f0debfaa;p=pcsx_rearmed.git diff --git a/Makefile b/Makefile index 0db94f77..7616cac5 100644 --- a/Makefile +++ b/Makefile @@ -39,13 +39,14 @@ CFLAGS += -DPCNT endif # core -OBJS += libpcsxcore/cdriso.o libpcsxcore/cdrom.o libpcsxcore/cheat.o libpcsxcore/database.o libpcsxcore/debug.o \ - libpcsxcore/decode_xa.o libpcsxcore/disr3000a.o libpcsxcore/mdec.o \ +OBJS += libpcsxcore/cdriso.o libpcsxcore/cdrom.o libpcsxcore/cheat.o libpcsxcore/database.o \ + libpcsxcore/decode_xa.o libpcsxcore/mdec.o \ libpcsxcore/misc.o libpcsxcore/plugins.o libpcsxcore/ppf.o libpcsxcore/psxbios.o \ libpcsxcore/psxcommon.o libpcsxcore/psxcounters.o libpcsxcore/psxdma.o libpcsxcore/psxhle.o \ libpcsxcore/psxhw.o libpcsxcore/psxinterpreter.o libpcsxcore/psxmem.o libpcsxcore/r3000a.o \ - libpcsxcore/sio.o libpcsxcore/socket.o libpcsxcore/spu.o + libpcsxcore/sio.o libpcsxcore/spu.o OBJS += libpcsxcore/gte.o libpcsxcore/gte_nf.o libpcsxcore/gte_divider.o +#OBJS += libpcsxcore/debug.o libpcsxcore/socket.o libpcsxcore/disr3000a.o ifeq "$(ARCH)" "arm" OBJS += libpcsxcore/gte_arm.o endif @@ -266,7 +267,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 $@_ @@ -307,7 +308,7 @@ endif # ----------- release ----------- -VER ?= $(shell git describe HEAD) +VER ?= $(shell git describe --always HEAD) ifeq "$(PLATFORM)" "generic" OUT = pcsx_rearmed_$(VER)