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
always describe to get git hash in log messages
[pcsx_rearmed.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
3f4b87d
..
3dac458
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-60,8
+60,10
@@
OBJS += libpcsxcore/new_dynarec/new_dynarec.o
OBJS += libpcsxcore/new_dynarec/pcsxmem.o
ifeq "$(ARCH)" "arm"
OBJS += libpcsxcore/new_dynarec/linkage_arm.o
OBJS += libpcsxcore/new_dynarec/pcsxmem.o
ifeq "$(ARCH)" "arm"
OBJS += libpcsxcore/new_dynarec/linkage_arm.o
+ libpcsxcore/new_dynarec/new_dynarec.o: libpcsxcore/new_dynarec/assem_arm.c
else ifeq "$(ARCH)" "aarch64"
OBJS += libpcsxcore/new_dynarec/linkage_arm64.o
else ifeq "$(ARCH)" "aarch64"
OBJS += libpcsxcore/new_dynarec/linkage_arm64.o
+ libpcsxcore/new_dynarec/new_dynarec.o: libpcsxcore/new_dynarec/assem_arm64.c
else
$(error no dynarec support for architecture $(ARCH))
endif
else
$(error no dynarec support for architecture $(ARCH))
endif
@@
-69,14
+71,13
@@
else
CFLAGS += -DDRC_DISABLE
endif
OBJS += libpcsxcore/new_dynarec/emu_if.o
CFLAGS += -DDRC_DISABLE
endif
OBJS += libpcsxcore/new_dynarec/emu_if.o
-libpcsxcore/new_dynarec/new_dynarec.o: libpcsxcore/new_dynarec/assem_arm.c \
- libpcsxcore/new_dynarec/pcsxmem_inline.c
+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
CFLAGS += -DDRC_DBG
endif
ifdef DRC_DBG
libpcsxcore/new_dynarec/emu_if.o: CFLAGS += -D_FILE_OFFSET_BITS=64
CFLAGS += -DDRC_DBG
endif
-ifeq "$(
DRC_CACHE_BASE
)" "1"
-libpcsxcore/new_dynarec/%.o: CFLAGS += -DBASE_ADDR_
FIXED
=1
+ifeq "$(
BASE_ADDR_DYNAMIC
)" "1"
+libpcsxcore/new_dynarec/%.o: CFLAGS += -DBASE_ADDR_
DYNAMIC
=1
endif
# spu
endif
# spu
@@
-265,7
+266,7
@@
libpcsxcore/gte_nf.o: libpcsxcore/gte.c
$(CC) -c -o $@ $^ $(CFLAGS) -DFLAGLESS
frontend/revision.h: FORCE
$(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 $@_
@diff -q $@_ $@ > /dev/null 2>&1 || cp $@_ $@
@rm $@_
@@
-306,7
+307,7
@@
endif
# ----------- release -----------
# ----------- release -----------
-VER ?= $(shell git describe HEAD)
+VER ?= $(shell git describe
--always
HEAD)
ifeq "$(PLATFORM)" "generic"
OUT = pcsx_rearmed_$(VER)
ifeq "$(PLATFORM)" "generic"
OUT = pcsx_rearmed_$(VER)