summaryrefslogtreecommitdiff
path: root/pjmedia
diff options
context:
space:
mode:
authorNanang Izzuddin <nanang@teluu.com>2011-02-22 07:31:01 +0000
committerNanang Izzuddin <nanang@teluu.com>2011-02-22 07:31:01 +0000
commitfce82bb77d8bb38f7eb013d45ba721f5e8f47304 (patch)
treed10415792605e31095ed26950d2ae15b15594b21 /pjmedia
parentf5685f7b793f56489a16df6c808898d29cc4bbb5 (diff)
Re #1200: updated IPP codecs to support IPP v7.0 on MSVC, only include "ippsr.lib" in auto link when IPP major version is 6 or below.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3417 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia')
-rw-r--r--pjmedia/src/pjmedia-codec/ipp_codecs.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/pjmedia/src/pjmedia-codec/ipp_codecs.c b/pjmedia/src/pjmedia-codec/ipp_codecs.c
index 948c3e73..360d9b17 100644
--- a/pjmedia/src/pjmedia-codec/ipp_codecs.c
+++ b/pjmedia/src/pjmedia-codec/ipp_codecs.c
@@ -1618,7 +1618,9 @@ static pj_status_t ipp_codec_recover(pjmedia_codec *codec,
# pragma comment( lib, "ippcore.lib")
# pragma comment( lib, "ipps.lib")
# pragma comment( lib, "ippsc.lib")
-# pragma comment( lib, "ippsr.lib")
+# if defined(IPP_VERSION_MAJOR) && IPP_VERSION_MAJOR<=6
+# pragma comment( lib, "ippsr.lib")
+# endif
//# pragma comment( lib, "ippcorel.lib")
//# pragma comment( lib, "ippsemerged.lib")
//# pragma comment( lib, "ippsmerged.lib")