aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>2006-01-06 00:33:24 +0000
committertma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>2006-01-06 00:33:24 +0000
commit85935ca083c451f9ddfa51c20699e1870cee91bd (patch)
tree41b6c876f9c2a4539dfdb0d4fb43bf26623c7828
parent4b00232c7b9c20dbfb4df44ae309363fa4d0c411 (diff)
downloadioquake3-aero-85935ca083c451f9ddfa51c20699e1870cee91bd.tar.gz
ioquake3-aero-85935ca083c451f9ddfa51c20699e1870cee91bd.zip
* 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
-rw-r--r--code/unix/Makefile26
1 files changed, 17 insertions, 9 deletions
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 \