diff options
| author | Tim Angus <tim@ngus.net> | 2007-08-24 00:32:53 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2007-08-24 00:32:53 +0000 |
| commit | d6cbf3366e63e4e4333e49377ee994d26b266a6c (patch) | |
| tree | 18c6488dbd654cb747534fc7a1dcd240be492bdb /Makefile | |
| parent | 9bb5d25cc24fd678660af34b9b19e21a37f09bd3 (diff) | |
* Merged ioq3-r1133
+ PNG image loader
+ Non-gas dependent x86_64 VM
+ Collision optimisations
+ Slew of other bug fixes
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -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 |