OLD | NEW |
1 # Copyright (c) 2012 The WebRTC Project Authors. All rights reserved. | 1 # Copyright (c) 2012 The WebRTC Project Authors. All rights reserved. |
2 # | 2 # |
3 # Use of this source code is governed by a BSD-style license | 3 # Use of this source code is governed by a BSD-style license |
4 # that can be found in the LICENSE file in the root of the source | 4 # that can be found in the LICENSE file in the root of the source |
5 # tree. An additional intellectual property rights grant can be found | 5 # tree. An additional intellectual property rights grant can be found |
6 # in the file PATENTS. All contributing project authors may | 6 # in the file PATENTS. All contributing project authors may |
7 # be found in the AUTHORS file in the root of the source tree. | 7 # be found in the AUTHORS file in the root of the source tree. |
8 { | 8 { |
9 'includes': [ | 9 'includes': [ |
10 '../talk/build/common.gypi', | 10 '../talk/build/common.gypi', |
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
131 'libraries': [ | 131 'libraries': [ |
132 '<!@(pkg-config --libs-only-l glib-2.0 gobject-2.0' | 132 '<!@(pkg-config --libs-only-l glib-2.0 gobject-2.0' |
133 ' gthread-2.0 gtk+-2.0)', | 133 ' gthread-2.0 gtk+-2.0)', |
134 '-lX11', | 134 '-lX11', |
135 '-lXcomposite', | 135 '-lXcomposite', |
136 '-lXext', | 136 '-lXext', |
137 '-lXrender', | 137 '-lXrender', |
138 ], | 138 ], |
139 }, | 139 }, |
140 }], # OS=="linux" | 140 }], # OS=="linux" |
| 141 ['OS=="linux" and target_arch=="ia32"', { |
| 142 'cflags': [ |
| 143 '-Wno-sentinel', |
| 144 ], |
| 145 }], # OS=="linux" and target_arch=="ia32" |
141 ], # conditions | 146 ], # conditions |
142 }, # target peerconnection_client | 147 }, # target peerconnection_client |
143 ], # targets | 148 ], # targets |
144 }], # OS=="linux" or OS=="win" | 149 }], # OS=="linux" or OS=="win" |
145 | 150 |
146 ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', { | 151 ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', { |
147 'targets': [ | 152 'targets': [ |
148 { | 153 { |
149 'target_name': 'apprtc_common', | 154 'target_name': 'apprtc_common', |
150 'type': 'static_library', | 155 'type': 'static_library', |
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
436 'apk_name': 'AppRTCDemoTest', | 441 'apk_name': 'AppRTCDemoTest', |
437 'java_in_dir': 'examples/androidtests', | 442 'java_in_dir': 'examples/androidtests', |
438 'is_test_apk': 1, | 443 'is_test_apk': 1, |
439 }, | 444 }, |
440 'includes': [ '../build/java_apk.gypi' ], | 445 'includes': [ '../build/java_apk.gypi' ], |
441 }, | 446 }, |
442 ], # targets | 447 ], # targets |
443 }], # OS=="android" | 448 }], # OS=="android" |
444 ], | 449 ], |
445 } | 450 } |
OLD | NEW |