* 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
This commit is contained in:
Tim Angus 2005-11-04 22:32:00 +00:00
parent 857a5e264e
commit e4b7a04d5c
24 changed files with 506 additions and 795 deletions

View file

@ -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)