Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 { | 5 { |
| 6 'dependencies': [ | 6 'dependencies': [ |
| 7 '../base/base.gyp:base', | 7 '../base/base.gyp:base', |
| 8 '../build/temp_gyp/googleurl.gyp:googleurl', | 8 '../build/temp_gyp/googleurl.gyp:googleurl', |
| 9 '../components/tracing.gyp:tracing', | 9 '../components/tracing.gyp:tracing', |
| 10 '../media/media.gyp:media', | 10 '../media/media.gyp:media', |
| (...skipping 432 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 443 '../build/linux/system.gyp:gtk', | 443 '../build/linux/system.gyp:gtk', |
| 444 ], | 444 ], |
| 445 }], | 445 }], |
| 446 ['OS=="linux"', { | 446 ['OS=="linux"', { |
| 447 'dependencies': [ | 447 'dependencies': [ |
| 448 '../build/linux/system.gyp:pangocairo', | 448 '../build/linux/system.gyp:pangocairo', |
| 449 ], | 449 ], |
| 450 }], | 450 }], |
| 451 ['use_x11 == 1', { | 451 ['use_x11 == 1', { |
| 452 'include_dirs': [ | 452 'include_dirs': [ |
| 453 '<(DEPTH)/third_party/khronos', | 453 '<(DEPTH)/third_party/khronos', |
|
Ami GONE FROM CHROMIUM
2013/05/22 23:59:47
Argh please don't rebase & address comments in the
Pawel Osciak
2013/05/24 01:46:39
Sorry.
| |
| 454 ], | 454 ], |
| 455 'link_settings': { | 455 'link_settings': { |
| 456 'libraries': [ | 456 'libraries': [ |
| 457 '-lXcomposite', | 457 '-lXcomposite', |
| 458 ], | 458 ], |
| 459 }, | 459 }, |
| 460 }], | 460 }], |
| 461 ['use_x11 == 1 and (target_arch != "arm" or chromeos == 0)', { | 461 ['use_x11 == 1 and (target_arch != "arm" or chromeos == 0)', { |
| 462 'sources': [ | 462 'sources': [ |
| 463 'common/gpu/x_util.cc', | 463 'common/gpu/x_util.cc', |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 506 ], | 506 ], |
| 507 'link_settings': { | 507 'link_settings': { |
| 508 'libraries': [ | 508 'libraries': [ |
| 509 '-lEGL', | 509 '-lEGL', |
| 510 '-lGLESv2', | 510 '-lGLESv2', |
| 511 ], | 511 ], |
| 512 }, | 512 }, |
| 513 }], | 513 }], |
| 514 ['target_arch != "arm" and chromeos == 1 and use_x11 == 1', { | 514 ['target_arch != "arm" and chromeos == 1 and use_x11 == 1', { |
| 515 'sources': [ | 515 'sources': [ |
| 516 'common/gpu/media/vaapi_delegate.cc', | |
| 517 'common/gpu/media/vaapi_delegate.h', | |
| 516 'common/gpu/media/h264_dpb.cc', | 518 'common/gpu/media/h264_dpb.cc', |
| 517 'common/gpu/media/h264_dpb.h', | 519 'common/gpu/media/h264_dpb.h', |
| 518 'common/gpu/media/vaapi_h264_decoder.cc', | 520 'common/gpu/media/vaapi_h264_decoder.cc', |
| 519 'common/gpu/media/vaapi_h264_decoder.h', | 521 'common/gpu/media/vaapi_h264_decoder.h', |
| 520 'common/gpu/media/vaapi_video_decode_accelerator.cc', | 522 'common/gpu/media/vaapi_video_decode_accelerator.cc', |
| 521 'common/gpu/media/vaapi_video_decode_accelerator.h', | 523 'common/gpu/media/vaapi_video_decode_accelerator.h', |
| 522 ], | 524 ], |
| 523 'include_dirs': [ | 525 'include_dirs': [ |
| 524 '<(DEPTH)/third_party/libva', | 526 '<(DEPTH)/third_party/libva', |
| 525 ], | 527 ], |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 577 '..\\third_party\\directxsdk\\files\\Redist\\<(input)', | 579 '..\\third_party\\directxsdk\\files\\Redist\\<(input)', |
| 578 '<(output)', | 580 '<(output)', |
| 579 '<(PRODUCT_DIR)', | 581 '<(PRODUCT_DIR)', |
| 580 ], | 582 ], |
| 581 'msvs_cygwin_shell': 1, | 583 'msvs_cygwin_shell': 1, |
| 582 }, | 584 }, |
| 583 ] | 585 ] |
| 584 }], | 586 }], |
| 585 ], | 587 ], |
| 586 } | 588 } |
| OLD | NEW |