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

Side by Side Diff: media/media.gyp

Issue 23868020: Fix remaining shared_library link_settings propagation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 7 years, 2 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
« no previous file with comments | « gpu/gpu_config.gypi ('k') | net/net.gyp » ('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 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 # Override to dynamically link the cras (ChromeOS audio) library. 8 # Override to dynamically link the cras (ChromeOS audio) library.
9 'use_cras%': 0, 9 'use_cras%': 0,
10 # Option e.g. for Linux distributions to link pulseaudio directly 10 # Option e.g. for Linux distributions to link pulseaudio directly
(...skipping 695 matching lines...) Expand 10 before | Expand all | Expand 10 after
706 'audio/pulse/pulse_output.h', 706 'audio/pulse/pulse_output.h',
707 'audio/pulse/pulse_unified.cc', 707 'audio/pulse/pulse_unified.cc',
708 'audio/pulse/pulse_unified.h', 708 'audio/pulse/pulse_unified.h',
709 'audio/pulse/pulse_util.cc', 709 'audio/pulse/pulse_util.cc',
710 'audio/pulse/pulse_util.h', 710 'audio/pulse/pulse_util.h',
711 ], 711 ],
712 }], 712 }],
713 ['OS=="mac"', { 713 ['OS=="mac"', {
714 'link_settings': { 714 'link_settings': {
715 'libraries': [ 715 'libraries': [
716 '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framewor k',
716 '$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework', 717 '$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework',
717 '$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework', 718 '$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework',
718 '$(SDKROOT)/System/Library/Frameworks/CoreAudio.framework', 719 '$(SDKROOT)/System/Library/Frameworks/CoreAudio.framework',
720 '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
719 '$(SDKROOT)/System/Library/Frameworks/CoreMIDI.framework', 721 '$(SDKROOT)/System/Library/Frameworks/CoreMIDI.framework',
720 '$(SDKROOT)/System/Library/Frameworks/CoreVideo.framework', 722 '$(SDKROOT)/System/Library/Frameworks/CoreVideo.framework',
723 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
721 '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', 724 '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
722 '$(SDKROOT)/System/Library/Frameworks/QTKit.framework', 725 '$(SDKROOT)/System/Library/Frameworks/QTKit.framework',
723 ], 726 ],
724 }, 727 },
725 }], 728 }],
726 ['OS=="win"', { 729 ['OS=="win"', {
727 'link_settings': { 730 'link_settings': {
728 'libraries': [ 731 'libraries': [
729 '-lmf.lib', 732 '-lmf.lib',
730 '-lmfplat.lib', 733 '-lmfplat.lib',
(...skipping 793 matching lines...) Expand 10 before | Expand all | Expand 10 after
1524 ], 1527 ],
1525 }], 1528 }],
1526 ], 1529 ],
1527 }], 1530 }],
1528 ], 1531 ],
1529 }, 1532 },
1530 ], 1533 ],
1531 }], 1534 }],
1532 ], 1535 ],
1533 } 1536 }
OLDNEW
« no previous file with comments | « gpu/gpu_config.gypi ('k') | net/net.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698