From ad6083f4141aacae73057f47dd78c626e0f53d0d Mon Sep 17 00:00:00 2001 From: "mflodman@webrtc.org" Date: Mon, 4 Jun 2012 19:10:43 +0000 Subject: [PATCH] Added condition for which jpeg lib to use. BUG= TEST= Review URL: https://webrtc-codereview.appspot.com/638004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2357 4adac7df-926f-26a2-2b94-8c16560cd09d --- src/common_video/jpeg/jpeg.gypi | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/common_video/jpeg/jpeg.gypi b/src/common_video/jpeg/jpeg.gypi index c44b5b790..a363fcf6f 100644 --- a/src/common_video/jpeg/jpeg.gypi +++ b/src/common_video/jpeg/jpeg.gypi @@ -51,7 +51,17 @@ ], }, { # Need to add a directory normally exported by libjpeg.gyp. - 'include_dirs': [ '<(DEPTH)/third_party/libjpeg', ], + 'conditions': [ + ['use_libjpeg_turbo==1', { + 'include_dirs': [ + '<(DEPTH)/third_party/libjpeg_turbo', + ], + }, { + 'include_dirs': [ + '<(DEPTH)/third_party/libjpeg', + ], + } + ] # conditions }], ], 'sources': [