r462 - trunk/code/unix

[DONOTREPLY at icculus.org]

Author: tma
Date: 2006-01-05 17:53:55 -0500 (Thu, 05 Jan 2006)
New Revision: 462

Modified:
   trunk/code/unix/Makefile
Log:
* Fix to x86_64 build
* Removal of a couple of unused variables


Modified: trunk/code/unix/Makefile
===================================================================
--- trunk/code/unix/Makefile	2006-01-05 16:49:59 UTC (rev 461)
+++ trunk/code/unix/Makefile	2006-01-05 22:53:55 UTC (rev 462)
@@ -107,13 +107,11 @@
 W32DIR=$(MOUNT_DIR)/win32
 GDIR=$(MOUNT_DIR)/game
 CGDIR=$(MOUNT_DIR)/cgame
-BAIDIR=$(GDIR)
 BLIBDIR=$(MOUNT_DIR)/botlib
 NDIR=$(MOUNT_DIR)/null
 UIDIR=$(MOUNT_DIR)/ui
 Q3UIDIR=$(MOUNT_DIR)/q3_ui
 JPDIR=$(MOUNT_DIR)/jpeg-6
-SPLNDIR=$(MOUNT_DIR)/splines
 
 # extract version info
 VERSION=$(shell grep Q3_VERSION ../qcommon/q_shared.h | \
@@ -827,19 +825,9 @@
 
 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
@@ -851,6 +839,14 @@
   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 += \