From ed2e2eecae5cfbe1058a8b29f284c0b4b792f348 Mon Sep 17 00:00:00 2001 From: "stefan@webrtc.org" Date: Wed, 12 Sep 2012 14:43:00 +0000 Subject: [PATCH] Revert removal of libjpeg include paths. BUG= Review URL: https://webrtc-codereview.appspot.com/791006 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2757 4adac7df-926f-26a2-2b94-8c16560cd09d --- src/common_video/common_video.gyp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/common_video/common_video.gyp b/src/common_video/common_video.gyp index 31b0b5e56..fae08be4c 100644 --- a/src/common_video/common_video.gyp +++ b/src/common_video/common_video.gyp @@ -7,6 +7,16 @@ # be found in the AUTHORS file in the root of the source tree. { + 'variables': { + 'use_libjpeg_turbo%': '<(use_libjpeg_turbo)', + 'conditions': [ + ['use_libjpeg_turbo==1', { + 'libjpeg_include_dir%': [ '<(DEPTH)/third_party/libjpeg_turbo', ], + }, { + 'libjpeg_include_dir%': [ '<(DEPTH)/third_party/libjpeg', ], + }], + ], + }, 'includes': ['../build/common.gypi'], 'targets': [ {