aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authornotaz2011-09-25 16:47:14 +0300
committernotaz2011-09-27 02:09:35 +0300
commit59774ed0120d20c731ee20da88ba6356d184dc8a (patch)
tree2d025303afb700215faf1bf95fa9735e5eaa68f7 /Makefile
parent41f55c9fb3e682e2c424e98ec70ab6aad226f85d (diff)
downloadpcsx_rearmed-59774ed0120d20c731ee20da88ba6356d184dc8a.tar.gz
pcsx_rearmed-59774ed0120d20c731ee20da88ba6356d184dc8a.tar.bz2
pcsx_rearmed-59774ed0120d20c731ee20da88ba6356d184dc8a.zip
gte: split arm code for pollux, generate flagless handlers
flagless are unused but will be used later, at least I hope so.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 8 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index d942e1c..25cd3e9 100644
--- a/Makefile
+++ b/Makefile
@@ -47,7 +47,10 @@ OBJS += libpcsxcore/cdriso.o libpcsxcore/cdrom.o libpcsxcore/cheat.o libpcsxcore
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
-OBJS += libpcsxcore/gte.o libpcsxcore/gte_divider.o
+OBJS += libpcsxcore/gte.o libpcsxcore/gte_nf.o libpcsxcore/gte_divider.o
+ifeq "$(ARCH)" "arm"
+OBJS += libpcsxcore/gte_arm.o
+endif
ifeq "$(HAVE_NEON)" "1"
OBJS += libpcsxcore/gte_neon.o
endif
@@ -56,7 +59,6 @@ libpcsxcore/misc.o libpcsxcore/psxbios.o: CFLAGS += -Wno-nonnull
# dynarec
ifndef NO_NEW_DRC
-libpcsxcore/new_dynarec/linkage_arm.o: ASFLAGS += --defsym HAVE_ARMV7=$(HAVE_ARMV7)
OBJS += libpcsxcore/new_dynarec/new_dynarec.o libpcsxcore/new_dynarec/linkage_arm.o
OBJS += libpcsxcore/new_dynarec/pcsxmem.o
endif
@@ -149,9 +151,13 @@ ifndef NO_TSLIB
frontend/%.o: CFLAGS += -DHAVE_TSLIB
OBJS += frontend/pl_gun_ts.o
endif
+%.o: ASFLAGS += --defsym HAVE_ARMV7=$(HAVE_ARMV7)
frontend/%.o: CFLAGS += -DIN_EVDEV
frontend/menu.o: frontend/revision.h
+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"/' > $@_
@diff -q $@_ $@ > /dev/null 2>&1 || cp $@_ $@