Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(740)

Side by Side Diff: content/content_common.gypi

Issue 11737027: Remove dependency on d3dx9_43.dll. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | content/content_gpu.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/components_tracing.gyp:tracing', 9 '../components/components_tracing.gyp:tracing',
10 '../media/media.gyp:media', 10 '../media/media.gyp:media',
(...skipping 513 matching lines...) Expand 10 before | Expand all | Expand 10 after
524 ], 524 ],
525 }], 525 }],
526 ['OS=="win"', { 526 ['OS=="win"', {
527 'dependencies': [ 527 'dependencies': [
528 '../media/media.gyp:media', 528 '../media/media.gyp:media',
529 '../ui/gl/gl.gyp:gl', 529 '../ui/gl/gl.gyp:gl',
530 ], 530 ],
531 'link_settings': { 531 'link_settings': {
532 'libraries': [ 532 'libraries': [
533 '-ld3d9.lib', 533 '-ld3d9.lib',
534 '-ld3dx9.lib',
535 '-ldxva2.lib', 534 '-ldxva2.lib',
536 '-lstrmiids.lib', 535 '-lstrmiids.lib',
537 '-lmf.lib', 536 '-lmf.lib',
538 '-lmfplat.lib', 537 '-lmfplat.lib',
539 '-lmfuuid.lib', 538 '-lmfuuid.lib',
540 ], 539 ],
541 'msvs_settings': { 540 'msvs_settings': {
542 'VCLinkerTool': { 541 'VCLinkerTool': {
543 'AdditionalLibraryDirectories': ['$(DXSDK_DIR)/lib/x86'], 542 'AdditionalLibraryDirectories': ['$(DXSDK_DIR)/lib/x86'],
544 'DelayLoadDLLs': [ 543 'DelayLoadDLLs': [
545 'd3d9.dll', 544 'd3d9.dll',
546 'd3dx9_43.dll',
547 'dxva2.dll', 545 'dxva2.dll',
548 'mf.dll', 546 'mf.dll',
549 'mfplat.dll', 547 'mfplat.dll',
550 ], 548 ],
551 }, 549 },
552 }, 550 },
553 }, 551 },
554 'sources': [ 552 'sources': [
555 'common/gpu/media/dxva_video_decode_accelerator.cc', 553 'common/gpu/media/dxva_video_decode_accelerator.cc',
556 'common/gpu/media/dxva_video_decode_accelerator.h', 554 'common/gpu/media/dxva_video_decode_accelerator.h',
(...skipping 22 matching lines...) Expand all
579 '../build/extract_from_cab.py', 577 '../build/extract_from_cab.py',
580 '..\\third_party\\directxsdk\\files\\Redist\\<(input)', 578 '..\\third_party\\directxsdk\\files\\Redist\\<(input)',
581 '<(output)', 579 '<(output)',
582 '<(PRODUCT_DIR)', 580 '<(PRODUCT_DIR)',
583 ], 581 ],
584 }, 582 },
585 ] 583 ]
586 }], 584 }],
587 ], 585 ],
588 } 586 }
OLDNEW
« no previous file with comments | « no previous file | content/content_gpu.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698