Index: third_party/iccjpeg/iccjpeg.gyp |
=================================================================== |
--- third_party/iccjpeg/iccjpeg.gyp (revision 67381) |
+++ third_party/iccjpeg/iccjpeg.gyp (working copy) |
@@ -8,9 +8,6 @@ |
'target_name': 'iccjpeg', |
'product_name': 'iccjpeg', |
'type': '<(library)', |
- 'dependencies': [ |
- '../libjpeg/libjpeg.gyp:libjpeg', |
- ], |
'sources': [ |
'iccjpeg.c', |
'iccjpeg.h', |
@@ -20,6 +17,17 @@ |
'.', |
], |
}, |
+ 'conditions': [ |
+ ['libjpeg_turbo==1', { |
+ 'dependencies': [ |
+ '../libjpeg_turbo/libjpeg.gyp:libjpeg', |
+ ], |
+ }, { |
+ 'dependencies': [ |
+ '../libjpeg/libjpeg.gyp:libjpeg', |
+ ], |
+ }], |
+ ], |
}, |
], |
} |