From d5a8161e257a7a96667c4cf0187c401fad923e40 Mon Sep 17 00:00:00 2001 From: icculus Date: Mon, 2 Jun 2008 06:46:41 +0000 Subject: Fixed non-VoIP builds. git-svn-id: svn://svn.icculus.org/quake3/trunk@1353 edf5b092-35ff-0310-97b2-ce42778d08ea --- Makefile | 86 +++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 45 insertions(+), 41 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index b0913c0..29e7cde 100644 --- a/Makefile +++ b/Makefile @@ -1314,47 +1314,6 @@ Q3OBJ = \ $(B)/client/jmemnobs.o \ $(B)/client/jutils.o \ \ - $(B)/client/bits.o \ - $(B)/client/buffer.o \ - $(B)/client/cb_search.o \ - $(B)/client/exc_10_16_table.o \ - $(B)/client/exc_10_32_table.o \ - $(B)/client/exc_20_32_table.o \ - $(B)/client/exc_5_256_table.o \ - $(B)/client/exc_5_64_table.o \ - $(B)/client/exc_8_128_table.o \ - $(B)/client/fftwrap.o \ - $(B)/client/filterbank.o \ - $(B)/client/filters.o \ - $(B)/client/gain_table.o \ - $(B)/client/gain_table_lbr.o \ - $(B)/client/hexc_10_32_table.o \ - $(B)/client/hexc_table.o \ - $(B)/client/high_lsp_tables.o \ - $(B)/client/jitter.o \ - $(B)/client/kiss_fft.o \ - $(B)/client/kiss_fftr.o \ - $(B)/client/lpc.o \ - $(B)/client/lsp.o \ - $(B)/client/lsp_tables_nb.o \ - $(B)/client/ltp.o \ - $(B)/client/mdf.o \ - $(B)/client/modes.o \ - $(B)/client/modes_wb.o \ - $(B)/client/nb_celp.o \ - $(B)/client/preprocess.o \ - $(B)/client/quant_lsp.o \ - $(B)/client/resample.o \ - $(B)/client/sb_celp.o \ - $(B)/client/smallft.o \ - $(B)/client/speex.o \ - $(B)/client/speex_callbacks.o \ - $(B)/client/speex_header.o \ - $(B)/client/stereo.o \ - $(B)/client/vbr.o \ - $(B)/client/vq.o \ - $(B)/client/window.o \ - \ $(B)/client/tr_animation.o \ $(B)/client/tr_backend.o \ $(B)/client/tr_bsp.o \ @@ -1407,6 +1366,51 @@ ifeq ($(ARCH),x86) $(B)/client/snapvectora.o endif +ifeq ($(USE_VOIP),1) +Q3OBJ += \ + $(B)/client/bits.o \ + $(B)/client/buffer.o \ + $(B)/client/cb_search.o \ + $(B)/client/exc_10_16_table.o \ + $(B)/client/exc_10_32_table.o \ + $(B)/client/exc_20_32_table.o \ + $(B)/client/exc_5_256_table.o \ + $(B)/client/exc_5_64_table.o \ + $(B)/client/exc_8_128_table.o \ + $(B)/client/fftwrap.o \ + $(B)/client/filterbank.o \ + $(B)/client/filters.o \ + $(B)/client/gain_table.o \ + $(B)/client/gain_table_lbr.o \ + $(B)/client/hexc_10_32_table.o \ + $(B)/client/hexc_table.o \ + $(B)/client/high_lsp_tables.o \ + $(B)/client/jitter.o \ + $(B)/client/kiss_fft.o \ + $(B)/client/kiss_fftr.o \ + $(B)/client/lpc.o \ + $(B)/client/lsp.o \ + $(B)/client/lsp_tables_nb.o \ + $(B)/client/ltp.o \ + $(B)/client/mdf.o \ + $(B)/client/modes.o \ + $(B)/client/modes_wb.o \ + $(B)/client/nb_celp.o \ + $(B)/client/preprocess.o \ + $(B)/client/quant_lsp.o \ + $(B)/client/resample.o \ + $(B)/client/sb_celp.o \ + $(B)/client/smallft.o \ + $(B)/client/speex.o \ + $(B)/client/speex_callbacks.o \ + $(B)/client/speex_header.o \ + $(B)/client/stereo.o \ + $(B)/client/vbr.o \ + $(B)/client/vq.o \ + $(B)/client/window.o +endif + + ifeq ($(HAVE_VM_COMPILED),true) ifeq ($(ARCH),i386) Q3OBJ += $(B)/client/vm_x86.o -- cgit v1.2.3