From 11e5099eb7abb2e016527795ffd32c5094e5324f Mon Sep 17 00:00:00 2001
From: tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>
Date: Fri, 4 Nov 2005 22:32:00 +0000
Subject: * Replaced a bunch of inline and __inline with ID_INLINE * Replaced a
 bunch of __i386__ with id386 * General tidy up of asm preprocessor decisions
 * Removed C_ONLY from the dedicated server build

git-svn-id: svn://svn.icculus.org/quake3/trunk@269 edf5b092-35ff-0310-97b2-ce42778d08ea
---
 code/unix/Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'code/unix/Makefile')

diff --git a/code/unix/Makefile b/code/unix/Makefile
index f708233..c048426 100644
--- a/code/unix/Makefile
+++ b/code/unix/Makefile
@@ -506,7 +506,7 @@ DO_DEBUG_CC=$(CC) $(DEBUG_CFLAGS) -o $@ -c $<
 DO_SHLIB_CC=$(CC) $(CFLAGS) $(SHLIBCFLAGS) -o $@ -c $<
 DO_SHLIB_DEBUG_CC=$(CC) $(DEBUG_CFLAGS) $(SHLIBCFLAGS) -o $@ -c $<
 DO_AS=$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
-DO_DED_CC=$(CC) -DDEDICATED -DC_ONLY $(CFLAGS) -o $@ -c $<
+DO_DED_CC=$(CC) -DDEDICATED $(CFLAGS) -o $@ -c $<
 DO_WINDRES=$(WINDRES) -i $< -o $@
 
 #############################################################################
@@ -1111,7 +1111,8 @@ Q3DOBJ = \
   $(B)/ded/null_snddma.o
 
 ifeq ($(ARCH),i386)
-  Q3DOBJ += $(B)/ded/vm_x86.o $(B)/ded/ftola.o $(B)/ded/snapvectora.o
+  Q3DOBJ += $(B)/ded/vm_x86.o $(B)/ded/ftola.o \
+      $(B)/ded/snapvectora.o $(B)/ded/matha.o
 endif
 
 ifeq ($(ARCH),x86_64)
@@ -1196,6 +1197,7 @@ $(B)/ded/vm_interpreted.o : $(CMDIR)/vm_interpreted.c; $(DO_DED_CC)
 
 $(B)/ded/ftola.o : $(UDIR)/ftola.s; $(DO_AS)
 $(B)/ded/snapvectora.o : $(UDIR)/snapvectora.s; $(DO_AS)
+$(B)/ded/matha.o : $(UDIR)/matha.s; $(DO_AS)
 
 $(B)/ded/vm_x86.o : $(CMDIR)/vm_x86.c; $(DO_DED_CC)
 $(B)/ded/vm_x86_64.o : $(CMDIR)/vm_x86_64.c; $(DO_DED_CC)
-- 
cgit v1.2.3