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
2012-06-04 19:10:43 +00:00 · 2012-06-04 19:10:43 +00:00 · ad6083f414
commit ad6083f414
parent 77fd39aa99
1 changed files with 11 additions and 1 deletions
--- 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': [