summaryrefslogtreecommitdiff
path: root/src/unix
diff options
context:
space:
mode:
authorTim Angus <tim@ngus.net>2006-01-06 02:21:29 +0000
committerTim Angus <tim@ngus.net>2006-01-06 02:21:29 +0000
commitdc6118816aa49c9b1e6dd82e6c6504f2153c37df (patch)
treecfcc2d80bd03f2abdaacc8292677650bd8e8181d /src/unix
parent4e6ae21de9bc373801b68a28b66067480bda4288 (diff)
* Added traps to query demo state
* Demo state now displayed from cgame * Merged ioq3-r464 - gcc4/-O0 bug fix - zone/hunk megs faffage
Diffstat (limited to 'src/unix')
-rw-r--r--src/unix/Makefile10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/unix/Makefile b/src/unix/Makefile
index db7802dd..4769b075 100644
--- a/src/unix/Makefile
+++ b/src/unix/Makefile
@@ -108,12 +108,10 @@ UDIR=$(MOUNT_DIR)/unix
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
JPDIR=$(MOUNT_DIR)/jpeg-6
-SPLNDIR=$(MOUNT_DIR)/splines
# extract version info
VERSION=$(shell grep Q3_VERSION ../qcommon/q_shared.h | \
@@ -830,6 +828,13 @@ ifeq ($(ARCH),x86)
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)
@@ -838,7 +843,6 @@ ifeq ($(ARCH),ppc)
endif
endif
-
ifeq ($(PLATFORM),mingw32)
Q3OBJ += \
$(B)/client/win_gamma.o \