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

Side by Side Diff: speex.gyp

Issue 8692003: set type 'settings' to 'none' in gyp file in case using the system lib (Closed) Base URL: http://git.chromium.org/chromium/deps/speex.git@master
Patch Set: Created 9 years, 1 month 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 | « no previous file | no next file » | 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) 2010 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2010 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 'use_system_speex%': 0, 7 'use_system_speex%': 0,
8 }, 8 },
9 'conditions': [ 9 'conditions': [
10 ['use_system_speex==0', { 10 ['use_system_speex==0', {
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 'include', # Clients expect <speex/speex.h> to be a system header . 87 'include', # Clients expect <speex/speex.h> to be a system header .
88 ], 88 ],
89 }, 89 },
90 'msvs_disabled_warnings': [4244, 4305], 90 'msvs_disabled_warnings': [4244, 4305],
91 }, 91 },
92 ], 92 ],
93 }, { # use_system_speex != 0 93 }, { # use_system_speex != 0
94 'targets': [ 94 'targets': [
95 { 95 {
96 'target_name': 'libspeex', 96 'target_name': 'libspeex',
97 'type': 'settings', 97 'type': 'none',
98 'direct_dependent_settings': { 98 'direct_dependent_settings': {
99 'cflags': [ 99 'cflags': [
100 '<!@(pkg-config --cflags speex)', 100 '<!@(pkg-config --cflags speex)',
101 ], 101 ],
102 'defines': [ 102 'defines': [
103 'USE_SYSTEM_SPEEX', 103 'USE_SYSTEM_SPEEX',
104 ], 104 ],
105 }, 105 },
106 'link_settings': { 106 'link_settings': {
107 'ldflags': [ 107 'ldflags': [
108 '<!@(pkg-config --libs-only-L --libs-only-other speex)', 108 '<!@(pkg-config --libs-only-L --libs-only-other speex)',
109 ], 109 ],
110 'libraries': [ 110 'libraries': [
111 '<!@(pkg-config --libs-only-l speex)', 111 '<!@(pkg-config --libs-only-l speex)',
112 ], 112 ],
113 }, 113 },
114 }, 114 },
115 ], 115 ],
116 }], 116 }],
117 ], 117 ],
118 } 118 }
119 119
120 # Local Variables: 120 # Local Variables:
121 # tab-width:2 121 # tab-width:2
122 # indent-tabs-mode:nil 122 # indent-tabs-mode:nil
123 # End: 123 # End:
124 # vim: set expandtab tabstop=2 shiftwidth=2: 124 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698