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

Side by Side Diff: media/cast/cast.gyp

Issue 153223002: Use gyp targets to link in X11 libraries instead of setting -lXfoo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address feedback, try to fix cros_x86 gyp error Created 6 years, 10 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 | « content/content_plugin.gypi ('k') | media/media.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 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 'include_tests%': 1, 7 'include_tests%': 1,
8 'chromium_code': 1, 8 'chromium_code': 1,
9 }, 9 },
10 'targets': [ 10 'targets': [
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 '<(DEPTH)/testing/gtest.gyp:gtest', 139 '<(DEPTH)/testing/gtest.gyp:gtest',
140 '<(DEPTH)/media/cast/transport/cast_transport.gyp:cast_transport', 140 '<(DEPTH)/media/cast/transport/cast_transport.gyp:cast_transport',
141 '<(DEPTH)/media/cast/test/utility/utility.gyp:cast_test_utility', 141 '<(DEPTH)/media/cast/test/utility/utility.gyp:cast_test_utility',
142 '<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv', 142 '<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv',
143 ], 143 ],
144 'sources': [ 144 'sources': [
145 '<(DEPTH)/media/cast/test/receiver.cc', 145 '<(DEPTH)/media/cast/test/receiver.cc',
146 ], 146 ],
147 'conditions': [ 147 'conditions': [
148 ['OS == "linux"', { 148 ['OS == "linux"', {
149 'dependencies': [
150 '<(DEPTH)/build/linux/system.gyp:x11',
151 '<(DEPTH)/build/linux/system.gyp:xext',
152 ],
149 'sources': [ 153 'sources': [
150 '<(DEPTH)/media/cast/test/linux_output_window.cc', 154 '<(DEPTH)/media/cast/test/linux_output_window.cc',
151 '<(DEPTH)/media/cast/test/linux_output_window.h', 155 '<(DEPTH)/media/cast/test/linux_output_window.h',
152 ], 156 ],
153 'libraries': [
154 '-lXext',
155 '-lX11',
156 ],
157 }], 157 }],
158 ], 158 ],
159 }, 159 },
160 ], # targets 160 ], # targets
161 }], # include_tests 161 }], # include_tests
162 ], 162 ],
163 } 163 }
OLDNEW
« no previous file with comments | « content/content_plugin.gypi ('k') | media/media.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698