Commit 145998b6 authored by fbarchard@google.com's avatar fbarchard@google.com

make libyuv library depend on libjpeg

BUG=none
TEST=none
Review URL: https://webrtc-codereview.appspot.com/405001

git-svn-id: http://libyuv.googlecode.com/svn/trunk@186 16f28f9a-4ce2-e073-06de-1de4eb20be90
parent 57397eba
...@@ -33,6 +33,7 @@ deps = { ...@@ -33,6 +33,7 @@ deps = {
"trunk/third_party/yasm/": "trunk/third_party/yasm/":
Var("chromium_trunk") + "/src/third_party/yasm@" + Var("chromium_revision"), Var("chromium_trunk") + "/src/third_party/yasm@" + Var("chromium_revision"),
# TODO(fbarchard): Review yasm dependency
"trunk/third_party/yasm/source/patched-yasm": "trunk/third_party/yasm/source/patched-yasm":
Var("chromium_trunk") + "/deps/third_party/yasm/patched-yasm@73761", Var("chromium_trunk") + "/deps/third_party/yasm/patched-yasm@73761",
......
...@@ -11,6 +11,9 @@ ...@@ -11,6 +11,9 @@
{ {
'target_name': 'libyuv', 'target_name': 'libyuv',
'type': 'static_library', 'type': 'static_library',
'dependencies': [
'third_party/libjpeg_turbo/libjpeg.gyp:libjpeg',
],
'defines': [ 'defines': [
'HAVE_JPEG', 'HAVE_JPEG',
], ],
......
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
# The tests are based on gtest # The tests are based on gtest
'testing/gtest.gyp:gtest', 'testing/gtest.gyp:gtest',
'testing/gtest.gyp:gtest_main', 'testing/gtest.gyp:gtest_main',
'third_party/libjpeg_turbo/libjpeg.gyp:libjpeg',
], ],
'sources': [ 'sources': [
# headers # headers
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment