Commit graph

361 commits

Author SHA1 Message Date
Simon McVittie
cff1fcd658 Look for system Vorbis, Opus and Ogg via pkg-config
As usual, the order of precedence is: user override, pkg-config,
or assume they're in standard locations.

In particular, Opus isn't in the default search path on Debian.
2013-05-19 21:31:26 +01:00
Simon McVittie
c817ab5ae0 Find system zlib via user override, pkg-config or in standard locations 2013-05-19 21:31:12 +01:00
Simon McVittie
9ff2fc3324 Allow system libjpeg to be in a non-standard location
It doesn't have pkg-config metadata (at least on Debian), so if the
user doesn't override it, assume normal system paths.
2013-05-19 21:28:31 +01:00
Simon McVittie
2821aa41d7 Allow OpenAL to be in a non-standard location on all platforms
Similar to libcurl, we didn't use OPENAL_LIBS and assumed it was
always "-lopenal".
2013-05-19 21:27:24 +01:00
Simon McVittie
b1da355644 Allow libcurl to be in a non-standard location on all platforms
We didn't add CURL_CFLAGS to CLIENT_CFLAGS on all platforms, and didn't
use CURL_LIBS at all, so if "pkg-config --libs" returned "-L... -lcurl"
or even "/.../libcurl.a", it wouldn't work.
2013-05-19 21:23:50 +01:00
Simon McVittie
608347c84d Centralize checks for Freetype, with a user override
This lets us find a library in a non-standard library directory
(via -L in the pkg-config metadata), and allows overrides similar to
the Autoconf convention, e.g.

    make FREETYPE_CFLAGS=-I/opt/freetype/include \
        FREETYPE_LIBS="-L/opt/freetype/lib -lfreetype"

If pkg-config didn't work, assume that Freetype is in the default
location.
2013-05-19 21:20:43 +01:00
Simon McVittie
1fe4e0c239 Add USE_INTERNAL_LIBS, a default for USE_INTERNAL_*
Linux distributions that want to link dependencies externally will
generally want to link (almost) every dependency externally; similarly,
minimal-dependency builds that want to use the embedded copies of
dependencies will generally want to do so for (almost) every dependency.
Make it easier to choose one of those by setting USE_INTERNAL_LIBS=0
or USE_INTERNAL_LIBS=1, respectively.

The default can still be overridden per-dependency; for instance,
"make USE_INTERNAL_LIBS=0 USE_INTERNAL_OPUS=1" will use the system
version of everything except Opus.
2013-05-19 21:19:52 +01:00
Tim Angus
d9d52f0306 Merge branch 'master' into sdl2
Conflicts:
	Makefile
	code/renderercommon/qgl.h
	code/renderergl1/tr_local.h
	code/sdl/sdl_glimp.c
2013-05-08 14:27:15 +01:00
Jonathan Gray
a88357b93c sync the OpenBSD cflags with Linux 2013-05-05 11:56:24 +10:00
Jonathan Gray
258c4782c6 correct the linked libs on OpenBSD 2013-05-05 11:40:57 +10:00
Tim Angus
efaa87de10 Fix typo preventing OSX native compiles 2013-03-28 11:13:58 +00:00
Tim Angus
0183f3978a Fix OSX app/ub scripts 2013-03-28 09:56:29 +00:00
Zack Middleton
59061e853e Change missionpack QVM build order in Makefile
Now it matches native libs and baseq3 QVMs.
2013-03-27 14:26:34 -05:00
Tim Angus
2b3c5492c7 Add option to create archive of build product 2013-03-27 14:35:11 +00:00
Tim Angus
838fcf45cb Make the build summary more pretty 2013-03-26 23:12:17 +00:00
Tim Angus
946c89b5f1 Fix 'make -jX clean release' 2013-03-26 20:58:55 +00:00
Tim Angus
352cd151e0 Cross compiling for OS X 2013-03-25 22:41:45 +00:00
Tim Angus
4f452fcfed Enable building QVMs when cross-compiling 2013-03-24 22:06:45 +00:00
Tim Angus
cae7ae9ce6 (bug #5904) Fix OpenBSD and Solaris builds 2013-03-23 12:14:03 +00:00
Tim Angus
02a625a1b3 Fix it more 2013-03-22 14:47:37 +00:00
Tim Angus
6155816672 (Hopefully) fix the Jenkins build 2013-03-22 14:26:29 +00:00
Tim Angus
b720b60295 Move cross-make-mingw.sh's functionality to the Makefile and remove it 2013-03-22 13:49:50 +00:00
Tim Angus
e4151c1d55 Add DEBUG_MAKEFILE to... debug the Makefile 2013-03-22 13:42:11 +00:00
Tim Angus
8d70929d12 Ditch 'historical compatibility' and use 'logic' instead 2013-03-22 11:33:27 +00:00
Tim Angus
bba199e795 Fix comment grammar (and test jenkins) 2013-03-21 22:37:44 +00:00
Tim Angus
2c8e751130 Consolidate architecture names
amd64, x64, x86_64 -> x86_64
i386, i86pc, x86 -> x86
powerpc, ppc -> ppc
powerpc64, ppc64 -> ppc64
axp -> alpha

Some exceptions are made for the actual build product names
2013-03-21 18:00:17 +00:00
Tim Angus
dfbad1360f Fix some clang warnings 2013-03-12 21:50:59 +00:00
Tim Angus
78132cf829 Remove old x86_64 JIT compiler 2013-03-11 22:20:10 +00:00
Zack Middleton
2a31f33fc6 Add libogg 1.3.0 2013-02-17 18:56:06 -06:00
Zack Middleton
3dd5c5d862 Add Ogg Opus support 2013-02-17 18:32:05 -06:00
Tim Angus
93e6183ce3 Move some things into renderercommon 2013-02-16 12:15:36 +00:00
Tim Angus
f6fb9eb602 renderer -> renderergl1, rend2 -> renderergl2 2013-02-15 23:46:37 +00:00
Tim Angus
517c65d85e Fix some SMP bits I missed 2013-01-26 21:40:45 +00:00
Tim Angus
51df89ab13 Remove the SMP renderer feature 2013-01-24 22:53:08 +00:00
Tim Angus
b43f766141 Update bundled SDL headers/libs 2013-01-21 22:40:05 +00:00
Tim Angus
f478761e07 Use SDL 2 instead of SDL 1.2 2013-01-17 18:20:03 +00:00
Tim Angus
6999fdba91 Assorted whitespace fixes 2013-01-05 15:35:50 +00:00
Tim Angus
631db38d25 Fix dist target and comment refering to svn 2013-01-05 15:35:32 +00:00
Tim Angus
20ef1b0115 Fix whitespace 2013-01-05 15:05:30 +00:00
Tim Angus
f6c98fd29f Replace svnversion use with git equivalent 2013-01-03 21:08:28 +00:00
Richard Allen
6a7a67a497 More fixes to the macosx buildsystem. This removes the SDL Framework and makes use of a SDL library that is position independant. This also brings back PPC builds into the UB and also as a standa alone build choice. 2012-12-31 01:32:15 +00:00
Richard Allen
1c8fa31c0d Changed the MacOS-X build system to make UB's containing i386 and x86_64 arches and made make-macosx.sh not build UB's but only standard binaries 2012-12-20 00:15:17 +00:00
Zack Middleton
76584dbcec Makefile fixes for OpenBSD by Jonathan Gray. (#5728) 2012-12-16 02:58:47 +00:00
James Canete
edb414b34a #5808 - Include and use .glsl in source (rend2) 2012-12-04 01:56:52 +00:00
James Canete
b5eb31b4f6 From /dev/humancontroller:
when hard-linking renderers, put the old renderer (not the new one) into the "ioquake3" executable, and use a distinguished "ioquake3_rend2" executable for the new renderer
(Fixes bug #5789.)
2012-10-28 21:04:41 +00:00
James Canete
dfdfc656ea From /dev/humancontroller:
fix the SMP functionality not being utilized (as of the import of Rend2)
2012-10-28 20:56:26 +00:00
James Canete
4f7eb9fa21 Added Rend2, an alternate renderer. (Bug #4358) 2012-10-26 01:23:06 +00:00
Zachary Slater
afffc10a54 switch mac to the framework SDL... 2012-07-18 04:57:52 +00:00
Zack Middleton
73a5f01baf Don't use local SDL headers on Linux (need system sdl-config and SDL library anyway). 2012-05-07 23:31:38 +00:00
Zack Middleton
ea0102d403 - Added support for enabling FreeType Support (make USE_FREETYPE=1).
- Fixed compiling tr_font.c for dynamic renderer.
2012-03-29 04:05:13 +00:00
Ludwig Nussel
6c8a9af300 fix mingw64 installer 2012-02-07 09:29:13 +00:00
Zack Middleton
c84377854a Unix clients can now enter commands from tty console. Patch by Rambetter with some edits by me. (#4799) 2012-02-06 21:05:57 +00:00
Zack Middleton
bdf1af34dc Fixed typo in Makefiles copyfiles directory path check. 2011-12-10 00:37:59 +00:00
Tim Angus
5e7e61a648 * More Makefile configuration (ZTurtleMan) 2011-10-28 19:12:43 +00:00
Tim Angus
7d570e693d * (bug #5283) Changes to the Makefile to make building standalone games
easier (JBravo)
2011-10-27 21:39:05 +00:00
Tim Angus
fd986dae06 * Fix various warnings with GCC and clang 2011-10-27 21:32:28 +00:00
Tim Angus
675e7a641a * clang support 2011-10-21 22:48:53 +00:00
Thilo Schulz
171f98474f BitBlt Patch #0000 (#5176) 2011-09-29 02:44:08 +00:00
Zack Middleton
b3c9d55f50 Include extra dlls in NSIS installer if needed (renderer, curl, speex, zlib, jpeg). 2011-08-29 15:17:47 +00:00
Zack Middleton
efd5f47bf6 Fixed copyfiles when USE_RENDERER_DLOPEN is disabled. 2011-08-11 05:51:08 +00:00
Thilo Schulz
08acc75a1a - More MacOSX changes to Makefile
- Ship libSDL-1.2.0.dylib with x86_64 platform support
2011-08-10 21:14:17 +00:00
Thilo Schulz
99e157e066 - Add x86_64 platform for MacOSX
- Fix compilation on MacOSX gcc
2011-08-10 20:48:53 +00:00
Zack Middleton
b9a060bfe2 Don't create clientsmp directory (which is no longer used), pointed out by DevHC. 2011-08-05 20:47:02 +00:00
Zack Middleton
702c519057 Moved various per-platform ifs/defines to be only done once for all platforms. 2011-08-02 22:00:57 +00:00
Zack Middleton
1ea0df54f8 Change x86_64 to x64 for mingw. 2011-08-02 21:03:14 +00:00
Thilo Schulz
fb24020f89 Fix compilation on MINGW 2011-08-01 13:25:55 +00:00
Thilo Schulz
89b53079cc Add SDL library to renderer lib 2011-08-01 13:15:31 +00:00
Thilo Schulz
83f228a42f Add patch by Zack Middleton to fix building for USE_RENDERER_DLOPEN=0 2011-08-01 13:10:35 +00:00
Thilo Schulz
6713bbbab3 Make client/server cflags configurable 2011-08-01 12:48:31 +00:00
Thilo Schulz
b151d91777 Remove unneeded library dependencies with new modular renderer 2011-08-01 11:53:59 +00:00
Thilo Schulz
40dfcee06e Modular rendering system. Patch by use.less01
This might break MSVC builds. I'll take care of it later
2011-08-01 01:19:55 +00:00
Thilo Schulz
9dc32d55e2 Bug 4812 - GCC __attribute__ annotations for printf, non-returning functions etc., patch by linux@youmustbejoking.demon.co.uk and Zack Middleton 2011-07-18 14:56:57 +00:00
Thilo Schulz
fe7b088de2 Get rid of redundancy 2011-06-24 23:25:30 +00:00
Thilo Schulz
b8f81e8065 Fixes for bugs introduced in last several revisions 2011-06-16 22:50:33 +00:00
Thilo Schulz
77d764c457 Patch and description by ensiform (#5043):
This patch moves cg_particles.c out of cg_marks.c to the actual file that was
already there but not used.  By default WOLF_PARTICLES definition is commented
out if someone wants to use the old cg_particles.c changes.  cg_particles.c has
been added to the makefile and msvc projects.
2011-06-16 21:58:46 +00:00
Thilo Schulz
001cdf4497 - mingw64 now links against SDL64.dll to allow for 32 and 64 bit version in the same directory
- Add library files for MinGW64
2011-06-13 15:47:43 +00:00
Thilo Schulz
03201aff22 - Add MASM assembler files for MSVC x64 projects to support vm_x86 in x64 mode
- Clean up ftol()/snapvector() mess
- Make use of SSE instructions for ftol()/snapvector() if available
- move ftol/snapvector pure assembler to inline assembler, this will add x86_64 and improve support for different calling conventions
- Set FPU control word at program startup to get consistent behaviour on all platforms
2011-06-13 09:56:39 +00:00
Thilo Schulz
960dca2cd4 Makefile fix for mips architecture (#4995):
Fixes the \n in the $ARCH variable for IRIX/mips

Patch by Patrick Baggett
2011-06-06 15:03:27 +00:00
Thilo Schulz
bd2b704c91 OpenBSD compile fixes, patch provided by Jonathan Gray (#4994) 2011-06-06 14:59:54 +00:00
Thilo Schulz
c174143dc2 - Add x86_64 support to vm_x86.c
- Fix warning on mingw64
2011-06-01 15:17:18 +00:00
Thilo Schulz
2ae1bf3dcd IQM skin support and print limit info, make other limit info consistent, patch by Zack Middleton (#4978) 2011-05-06 11:43:07 +00:00
Thilo Schulz
c5e2654b54 - Add Inter-Quake Model (IQM) Format support, patch by gimhael with minor modifications by myself (#4965)
- Changed model_t::md4 to model_t::modelData
- Fix R_ModelBounds for MD4, MDR and IQM models (#4966)
- Support Model format fallback similar to image formats in tr_image.c, patch by Zack Middleton (#4967)
2011-05-02 15:50:19 +00:00
Thilo Schulz
76bbd95207 Bug 4935 - dedicated server linked against libjpeg if using system libjpeg, patch by Simon McVittie 2011-03-17 12:40:39 +00:00
Thilo Schulz
0c10adaf92 - Migrate to jpeg-8c
- Add possibility to link against system libjpeg
2011-03-12 16:45:15 +00:00
Thilo Schulz
0b8ca2b417 Revert premature change to Makefile for migration to jpeg-8c. *sigh* 2011-03-11 14:40:07 +00:00
Thilo Schulz
641256f7f0 strtod exists in bg_lib.c now so Q_isanumber will work in the VMs, too. 2011-03-11 13:51:36 +00:00
Thilo Schulz
fd4cf3b783 Thank you devhc 2011-02-07 04:34:39 +00:00
Thilo Schulz
54aa7f2583 Allow user to specify different temp dir for building (#4349) 2011-02-07 04:03:19 +00:00
Thilo Schulz
58a8f5ef8b Fix GNU/kFreeBSD patch by Cyril Brulebois. --> ... <-- 2011-02-06 20:10:43 +00:00
Thilo Schulz
cef9b8ce62 Fix compilation on alpha, fix by Steve Langasek (#4703) 2011-02-06 17:19:06 +00:00
Thilo Schulz
d2f8b9f4bb Support GNU/kFreeBSD, patch by Cyril Brulebois. Thanks. 2011-02-04 17:31:12 +00:00
Zachary Slater
80c24e46e8 ffffffffffffffffffffaaaaaaaaaaaaaassssssssst math movement on freebsd to OPTIMIZE 2011-01-27 07:19:25 +00:00
Ludwig Nussel
112287088e rename x86_64 -> x64 for Windows 2010-03-19 08:59:22 +00:00
Ludwig Nussel
05d7ce9c18 don't link librt on FreeBSD (bug 4507) 2010-03-06 11:55:29 +00:00
Ludwig Nussel
760f4a1949 64bit Windows support (patch by Michael Menegakis) 2010-02-28 09:00:02 +00:00
Tim Angus
3ebe048968 * Fix a memory leak in OS X Sys_Dialog
* Fix compilation on Snow Leopard
2010-02-26 16:32:49 +00:00
Tim Angus
ed313e3606 * Oops, missed a bit 2010-02-16 09:43:44 +00:00
Tim Angus
005f870ebe * Sys_Dialog for more user friendly error reporting
* (bug #3932) Recovery from bad video settings
2010-02-15 16:20:33 +00:00
Tim Angus
240b25a41f * (bug #4271) FreeBSD fixes (Dominic Fandrey) 2010-01-07 19:53:52 +00:00
Tim Angus
af4e46bfe2 * (bug #4364) Fix missing -DNDEBUG 2009-12-18 21:52:36 +00:00
Tony J. White =
db1cd85977 * build the dedicated server with voip support (benmachine) 2009-12-08 22:36:48 +00:00
Thilo Schulz
3cb58d7cc5 A few fixes for the new changes 2009-11-08 17:36:05 +00:00
Thilo Schulz
cd38bf6bf5 Rework CFLAGS: separate CFLAGS for client, server, and VMs. (#3533) 2009-11-08 17:04:30 +00:00
Thilo Schulz
c90eae4de5 Make debug cflags configurable like via Makefile.local 2009-11-03 19:23:51 +00:00
Tim Angus
83d0755ad1 * Whitespace 2009-10-28 22:12:56 +00:00
Ludwig Nussel
2fecf6d6bc get rid of gas remains 2009-10-26 21:59:03 +00:00
Ludwig Nussel
2fc4023e0b fix zlib includes 2009-10-24 14:19:39 +00:00
Ludwig Nussel
55943c51f3 -lz must be specified after object files using it
If it's specified first newer gcc resp the --as-needed option
doesn't work.
2009-10-23 12:57:45 +00:00
Thilo Schulz
cc919c05fd Just unix2dos, nothing to see here ... 2009-10-19 14:00:16 +00:00
Tim Angus
5dfed62006 * Reverted fix for #3533 2009-10-17 23:40:10 +00:00
Tim Angus
9e80310d44 * (bug #3533) -ffast-math is apparently problematic on OSX 2009-10-17 23:29:54 +00:00
Tim Angus
ab4bf148a1 * Quieten pkg-config and sdl-config tests down, portably 2009-10-15 13:11:49 +00:00
Tim Angus
1da457889e * Fix cross compilation 2009-10-14 00:16:17 +00:00
Tim Angus
2fd7ffe754 * Unquieten [pkg|sdl]-config for the time being 2009-10-13 16:33:54 +00:00
Thilo Schulz
290f51e353 - Change default openal lib to libopenal.so.1
- USE_OPENAL_DLOPEN=1 now default
2009-10-13 15:39:39 +00:00
Tim Angus
4ad2955cab * Make the MinGW build explicitly use gcc
* Quieten pkg-config and sdl-config tests down
* Improve speed of dependency processing, particularly on MinGW
2009-10-13 15:22:43 +00:00
Thilo Schulz
93aedb5bbf fix comment 2009-10-08 22:29:55 +00:00
Thilo Schulz
40c773d80e Don't set SDL variables if we don't build the client -> removes error messages when building on a server without SDL installed. 2009-10-08 19:21:42 +00:00
Tim Angus
f89092fda6 * Revert r1624 and r1626-r1628 2009-09-15 09:48:11 +00:00
Ryan C. Gordon
ec4ab19090 FreeBSD Makefile updates.
Fixes Bugzilla #4271.
2009-09-15 06:49:18 +00:00
Ryan C. Gordon
f8604a64f4 Added a real GUI message box to Sys_ErrorDialog() on Mac OS X.
Fixes Bugzilla #3654.
2009-09-15 05:38:27 +00:00
Ryan C. Gordon
e2d63b1fea Enable -fvisibility=hidden on Linux.
This will prevent further symbol clashes, and makes the shared libraries
 10 to 20 percent smaller.

We should enable this on other platforms, too, if we can guarantee they'll
 use gcc 4.0 or later and the platform supports it.
2009-09-15 02:48:17 +00:00
Ryan C. Gordon
592062c548 Make TOOLS_CFLAGS more easily customisable in the Makefile.
Fixes Bugzilla #4155.
2009-09-15 01:36:17 +00:00
Ryan C. Gordon
2f0abce691 Makefile: Allow overriding options for different setups, OpenBSD fixes.
Fixes Bugzilla #3955.
2009-09-14 23:49:20 +00:00
Zachary Slater
ca91bb1ab5 Patch from kevlarman for fixing external speex compile 2009-08-02 02:21:23 +00:00
Ludwig Nussel
161dc2ddf5 fall back to sdl-config if SDL_CFLAGS are empty
works around buggy Solaris installations where pkg-config is
installed but can't find the SDL config file
2009-05-05 18:19:34 +00:00
Ludwig Nussel
b8097554ac set SDL CFLAGS and LIBS at central place 2009-05-03 18:49:48 +00:00
Ludwig Nussel
94bc49653d increase version in trunk 2009-04-13 20:20:05 +00:00
Ludwig Nussel
2864898147 Makefile: Enable new sparc JIT on Linux.
Signed-off-by: David S. Miller <davem@davemloft.net>
2009-03-02 17:29:46 +00:00
Ludwig Nussel
913e81522c Makefile: Use "-mtune=ultrasparc3 -mv8plus" on Linux/Sparc.
Signed-off-by: David S. Miller <davem@davemloft.net>
2009-03-02 17:29:26 +00:00
Ludwig Nussel
a1f9885664 fix build with newer git installations 2009-01-13 07:57:01 +00:00
Ludwig Nussel
057e7edf18 use -fno-strict-aliasing again. code is just not ready yet. 2008-11-12 13:40:04 +00:00
Ludwig Nussel
1828da63de fix empty loops causing build failures in mingw
Patch by Przemysław Iskra (#3813)
2008-11-10 09:47:02 +00:00
Ludwig Nussel
b546e4712d enable new powerpc vm
Patch by Przemysław Iskra (#3796)
2008-11-10 09:46:41 +00:00
Ludwig Nussel
c754d6fdfb fix strict aliasing issues
Patch by Przemysław Iskra (#3805)
2008-11-03 17:03:54 +00:00
Ludwig Nussel
e1983208f0 libraries do not belong to LDFLAGS.
Patch creates separate *LIBS variables for libraries, leaving LDFLAGS for real
flags, like -shared or --as-needed. Also CFLAGS are used when linking:
-m32/-m64 belongs to CFLAGS, not LDFLAGS; linker additionally optimizes output
file when -O* is in flags.
Patch by Przemysław Iskra (#3813)
2008-11-02 17:32:21 +00:00
Ludwig Nussel
c3a8156cb6 x86_64_assembler should use separate object file for dedicated server
patch by  Przemysław Iskra
2008-11-02 17:32:18 +00:00
Tim Angus
b555d68b3f * (bug #3729) server dependencies on client.h (Ben Millwood)
* (bug #3731) BUILD_MISSIONPACK flag in Makefile (Gabriel Schnoering
  <gabriel.schnoering@gmail.com>)
* (bug #3756) Q3VM crashes on unaligned block copy with SIGBUS (Patrick Baggett
  <baggett.patrick@figglesoftware.com>) and...
* (bug #3755) IOQuake3 shouldn't use GCC-specific __FUNCTION__
2008-08-22 22:47:26 +00:00
Tim Angus
953200cafc * Update to jpeg-6b (only a decade old) 2008-08-21 23:29:09 +00:00
Tim Angus
9705664d2c * Alpha sort the jpeg file list in the Makefile, just because 2008-08-19 10:03:14 +00:00
Tim Angus
7edcc7d16a * Use IPv6 header qcommon/wspiapi.h if it has been added by the end user
* Update README to explain the Windows XP requirement
2008-08-09 19:12:30 +00:00
Tim Angus
1b87aff448 * Elaborate on the reasons for requiring Windows XP 2008-08-04 11:34:04 +00:00
Ludwig Nussel
2ed334b2be fix build without VOIP (David Severwright, bug#3720) 2008-07-16 07:15:09 +00:00
Ludwig Nussel
5208bf8273 also define proper version when using git-svn 2008-07-16 07:14:55 +00:00
Tim Angus
956ce9bf12 * (bug 3692) Makefile infinitely recurses if no targets are defined 2008-07-05 22:34:23 +00:00
Ludwig Nussel
5513fa3d75 fix the build on openbsd (Ian Lindsay) 2008-06-20 07:08:40 +00:00
Ludwig Nussel
35e2091c90 allow linking against an external speex library 2008-06-05 08:55:08 +00:00
Ryan C. Gordon
b9a9727689 Allow USE_LOCAL_HEADERS to work with SDL on Linux builds.
Otherwise, cross-compiling doesn't work.
2008-06-04 05:28:54 +00:00
Ludwig Nussel
b8d3888f31 move voip cflags definition to platform independent place 2008-06-02 12:12:00 +00:00
Ryan C. Gordon
d43ecc9909 Fixed non-VoIP builds. 2008-06-02 06:46:41 +00:00