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 '../gpu/gpu.gyp:gles2_implementation', | 9 '../gpu/gpu.gyp:gles2_implementation', |
10 '../gpu/gpu.gyp:gpu_ipc', | 10 '../gpu/gpu.gyp:gpu_ipc', |
(...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
371 '<(DEPTH)/third_party/angle/include', | 371 '<(DEPTH)/third_party/angle/include', |
372 '<(DEPTH)/third_party/openmax/il', | 372 '<(DEPTH)/third_party/openmax/il', |
373 ], | 373 ], |
374 'link_settings': { | 374 'link_settings': { |
375 'libraries': [ | 375 'libraries': [ |
376 '-lEGL', | 376 '-lEGL', |
377 '-lGLESv2', | 377 '-lGLESv2', |
378 ], | 378 ], |
379 }, | 379 }, |
380 }], | 380 }], |
381 ['target_arch=="x64" and chromeos == 1', { | |
382 'dependencies': [ | |
383 '../media/media.gyp:media', | |
384 ], | |
385 'sources': [ | |
386 'common/gpu/media/h264_dpb.cc', | |
Ami GONE FROM CHROMIUM
2012/03/21 13:16:24
l.386-389 are not cros/x64-specific, are they?
(mo
Pawel Osciak
2012/03/21 18:40:35
Do we want to compile them in if they are not used
Ami GONE FROM CHROMIUM
2012/03/22 17:01:36
I'm on the fence. Leave them for now I guess.
Pawel Osciak
2012/04/05 10:37:20
Assuming you meant leave them as is.
| |
387 'common/gpu/media/h264_dpb.h', | |
388 'common/gpu/media/h264_parser.cc', | |
389 'common/gpu/media/h264_parser.h', | |
390 'common/gpu/media/vaapi_h264_decoder.cc', | |
391 'common/gpu/media/vaapi_h264_decoder.h', | |
392 'common/gpu/media/vaapi_video_decode_accelerator.cc', | |
393 'common/gpu/media/vaapi_video_decode_accelerator.h', | |
394 ], | |
395 'include_dirs': [ | |
396 '<(DEPTH)/third_party/libva', | |
397 ], | |
398 }], | |
381 ['OS=="win"', { | 399 ['OS=="win"', { |
382 'dependencies': [ | 400 'dependencies': [ |
383 '../media/media.gyp:media', | 401 '../media/media.gyp:media', |
384 '../ui/gfx/gl/gl.gyp:gl', | 402 '../ui/gfx/gl/gl.gyp:gl', |
385 ], | 403 ], |
386 'link_settings': { | 404 'link_settings': { |
387 'libraries': [ | 405 'libraries': [ |
388 '-ld3d9.lib', | 406 '-ld3d9.lib', |
389 '-ld3dx9.lib', | 407 '-ld3dx9.lib', |
390 '-ldxva2.lib', | 408 '-ldxva2.lib', |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
432 '../build/extract_from_cab.py', | 450 '../build/extract_from_cab.py', |
433 '..\\third_party\\directxsdk\\files\\Redist\\<(input)', | 451 '..\\third_party\\directxsdk\\files\\Redist\\<(input)', |
434 '<(output)', | 452 '<(output)', |
435 '<(PRODUCT_DIR)', | 453 '<(PRODUCT_DIR)', |
436 ], | 454 ], |
437 }, | 455 }, |
438 ] | 456 ] |
439 }] | 457 }] |
440 ], | 458 ], |
441 } | 459 } |
OLD | NEW |