From 85935ca083c451f9ddfa51c20699e1870cee91bd Mon Sep 17 00:00:00 2001 From: tma Date: Fri, 6 Jan 2006 00:33:24 +0000 Subject: * Somebody fedex me a Mac and an x86_64 PC please? git-svn-id: svn://svn.icculus.org/quake3/trunk@464 edf5b092-35ff-0310-97b2-ce42778d08ea --- code/unix/Makefile | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) (limited to 'code') diff --git a/code/unix/Makefile b/code/unix/Makefile index 395428d..87b358f 100644 --- a/code/unix/Makefile +++ b/code/unix/Makefile @@ -825,12 +825,29 @@ Q3OBJ = \ ifeq ($(ARCH),i386) Q3OBJ += $(B)/client/vm_x86.o + Q3OBJ += \ + $(B)/client/snd_mixa.o \ + $(B)/client/matha.o \ + $(B)/client/ftola.o \ + $(B)/client/snapvectora.o endif ifeq ($(ARCH),x86) Q3OBJ += $(B)/client/vm_x86.o + Q3OBJ += \ + $(B)/client/snd_mixa.o \ + $(B)/client/matha.o \ + $(B)/client/ftola.o \ + $(B)/client/snapvectora.o endif ifeq ($(ARCH),x86_64) Q3OBJ += $(B)/client/vm_x86_64.o + + #FIXME: why do these need to be here? + Q3OBJ += \ + $(B)/client/snd_mixa.o \ + $(B)/client/matha.o \ + $(B)/client/ftola.o \ + $(B)/client/snapvectora.o endif ifeq ($(ARCH),ppc) @@ -839,15 +856,6 @@ ifeq ($(ARCH),ppc) endif endif -# x86 asm versions of various functions -# Guarded by #if id386, so safe to link -# on any platform -Q3OBJ += \ - $(B)/client/snd_mixa.o \ - $(B)/client/matha.o \ - $(B)/client/ftola.o \ - $(B)/client/snapvectora.o - ifeq ($(PLATFORM),mingw32) Q3OBJ += \ $(B)/client/win_gamma.o \ -- cgit v1.2.3