From d6cbf3366e63e4e4333e49377ee994d26b266a6c Mon Sep 17 00:00:00 2001 From: Tim Angus Date: Fri, 24 Aug 2007 00:32:53 +0000 Subject: * Merged ioq3-r1133 + PNG image loader + Non-gas dependent x86_64 VM + Collision optimisations + Slew of other bug fixes --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 2f3f339c..37ec7fe1 100644 --- a/Makefile +++ b/Makefile @@ -924,6 +924,7 @@ Q3OBJ = \ $(B)/client/q_shared.o \ \ $(B)/client/unzip.o \ + $(B)/client/puff.o \ $(B)/client/vm.o \ $(B)/client/vm_interpreted.o \ \ @@ -999,7 +1000,7 @@ ifeq ($(HAVE_VM_COMPILED),true) Q3OBJ += $(B)/client/vm_x86.o endif ifeq ($(ARCH),x86_64) - Q3OBJ += $(B)/client/vm_x86_64.o + Q3OBJ += $(B)/client/vm_x86_64.o $(B)/client/vm_x86_64_assembler.o endif ifeq ($(ARCH),ppc) Q3OBJ += $(B)/client/vm_ppc.o @@ -1125,7 +1126,7 @@ ifeq ($(HAVE_VM_COMPILED),true) Q3DOBJ += $(B)/ded/vm_x86.o endif ifeq ($(ARCH),x86_64) - Q3DOBJ += $(B)/ded/vm_x86_64.o + Q3DOBJ += $(B)/ded/vm_x86_64.o $(B)/client/vm_x86_64_assembler.o endif ifeq ($(ARCH),ppc) Q3DOBJ += $(B)/ded/vm_ppc.o -- cgit