r464 - trunk/code/unix

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Thu Jan 5 19:33:24 EST 2006


Author: tma
Date: 2006-01-05 19:33:24 -0500 (Thu, 05 Jan 2006)
New Revision: 464

Modified:
   trunk/code/unix/Makefile
Log:
* Somebody fedex me a Mac and an x86_64 PC please?


Modified: trunk/code/unix/Makefile
===================================================================
--- trunk/code/unix/Makefile	2006-01-06 00:04:05 UTC (rev 463)
+++ trunk/code/unix/Makefile	2006-01-06 00:33:24 UTC (rev 464)
@@ -825,12 +825,29 @@
 
 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 @@
   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 \




More information about the quake3-commits mailing list