aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorludwig <ludwig@edf5b092-35ff-0310-97b2-ce42778d08ea>2008-07-16 07:15:09 +0000
committerludwig <ludwig@edf5b092-35ff-0310-97b2-ce42778d08ea>2008-07-16 07:15:09 +0000
commitbe835bad3139b2f1437e81c1477415e9335c2e80 (patch)
treea804d3f73683295eb8673c1c33a5606191cdf0a7
parentc98e690aa8f68aa1fef27c22070c646c96fe8690 (diff)
downloadioquake3-aero-be835bad3139b2f1437e81c1477415e9335c2e80.tar.gz
ioquake3-aero-be835bad3139b2f1437e81c1477415e9335c2e80.zip
fix build without VOIP (David Severwright, bug#3720)
git-svn-id: svn://svn.icculus.org/quake3/trunk@1427 edf5b092-35ff-0310-97b2-ce42778d08ea
-rw-r--r--Makefile2
-rw-r--r--code/client/cl_scrn.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index a2c5f5f..336b3e7 100644
--- a/Makefile
+++ b/Makefile
@@ -1356,6 +1356,7 @@ ifeq ($(ARCH),x86)
$(B)/client/snapvectora.o
endif
+ifeq ($(USE_VOIP),1)
ifeq ($(USE_INTERNAL_SPEEX),1)
Q3OBJ += \
$(B)/client/bits.o \
@@ -1399,6 +1400,7 @@ Q3OBJ += \
$(B)/client/vq.o \
$(B)/client/window.o
endif
+endif
ifeq ($(HAVE_VM_COMPILED),true)
diff --git a/code/client/cl_scrn.c b/code/client/cl_scrn.c
index ecf47a5..732913f 100644
--- a/code/client/cl_scrn.c
+++ b/code/client/cl_scrn.c
@@ -343,6 +343,7 @@ void SCR_DrawDemoRecording( void ) {
}
+#ifdef USE_VOIP
/*
=================
SCR_DrawVoipMeter
@@ -381,6 +382,7 @@ void SCR_DrawVoipMeter( void ) {
sprintf( string, "VoIP: [%s]", buffer );
SCR_DrawStringExt( 320 - strlen( string ) * 4, 10, 8, string, g_color_table[7], qtrue, qfalse );
}
+#endif