| OLD | NEW | 
|    1 # Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. |    1 # Copyright (c) 2016 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 if (is_android) { |    9 if (is_android) { | 
|   10   import("//build/config/android/config.gni") |   10   import("//build/config/android/config.gni") | 
| (...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  384       # Gtk requires gmodule, but it does not list it as a dependency in some |  384       # Gtk requires gmodule, but it does not list it as a dependency in some | 
|  385       # misconfigured systems. |  385       # misconfigured systems. | 
|  386       packages = [ |  386       packages = [ | 
|  387         "gmodule-2.0", |  387         "gmodule-2.0", | 
|  388         "gtk+-2.0", |  388         "gtk+-2.0", | 
|  389         "gthread-2.0", |  389         "gthread-2.0", | 
|  390       ] |  390       ] | 
|  391     } |  391     } | 
|  392   } |  392   } | 
|  393  |  393  | 
 |  394   config("peerconnection_client_warnings_config") { | 
 |  395     if (is_win && is_clang) { | 
 |  396       cflags = [ | 
 |  397         # Disable warnings failing when compiling with Clang on Windows. | 
 |  398         # https://bugs.chromium.org/p/webrtc/issues/detail?id=5366 | 
 |  399         "-Wno-format", | 
 |  400  | 
 |  401         # See https://bugs.chromium.org/p/webrtc/issues/detail?id=6271 | 
 |  402         # for -Wno-reorder and -Wno-sign-compare | 
 |  403         "-Wno-reorder", | 
 |  404         "-Wno-sign-compare", | 
 |  405       ] | 
 |  406     } | 
 |  407   } | 
 |  408  | 
|  394   executable("peerconnection_client") { |  409   executable("peerconnection_client") { | 
|  395     sources = [ |  410     sources = [ | 
|  396       "peerconnection/client/conductor.cc", |  411       "peerconnection/client/conductor.cc", | 
|  397       "peerconnection/client/conductor.h", |  412       "peerconnection/client/conductor.h", | 
|  398       "peerconnection/client/defaults.cc", |  413       "peerconnection/client/defaults.cc", | 
|  399       "peerconnection/client/defaults.h", |  414       "peerconnection/client/defaults.h", | 
|  400       "peerconnection/client/peer_connection_client.cc", |  415       "peerconnection/client/peer_connection_client.cc", | 
|  401       "peerconnection/client/peer_connection_client.h", |  416       "peerconnection/client/peer_connection_client.h", | 
|  402     ] |  417     ] | 
|  403     if (is_clang) { |  418     if (is_clang) { | 
|  404       # Suppress warnings from the Chromium Clang plugin. |  419       # Suppress warnings from the Chromium Clang plugin. | 
|  405       # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |  420       # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 
|  406       configs -= [ "//build/config/clang:find_bad_constructs" ] |  421       configs -= [ "//build/config/clang:find_bad_constructs" ] | 
|  407     } |  422     } | 
|  408     if (is_win) { |  423     if (is_win) { | 
|  409       sources += [ |  424       sources += [ | 
|  410         "peerconnection/client/flagdefs.h", |  425         "peerconnection/client/flagdefs.h", | 
|  411         "peerconnection/client/main.cc", |  426         "peerconnection/client/main.cc", | 
|  412         "peerconnection/client/main_wnd.cc", |  427         "peerconnection/client/main_wnd.cc", | 
|  413         "peerconnection/client/main_wnd.h", |  428         "peerconnection/client/main_wnd.h", | 
|  414       ] |  429       ] | 
|  415       cflags = [ "/wd4245" ] |  430       cflags = [ "/wd4245" ] | 
|  416       configs += [ "//build/config/win:windowed" ] |  431       configs += [ "//build/config/win:windowed" ] | 
|  417     } |  432     } | 
|  418     if (is_win && is_clang) { |  | 
|  419       cflags = [ |  | 
|  420         # Disable warnings failing when compiling with Clang on Windows. |  | 
|  421         # https://bugs.chromium.org/p/webrtc/issues/detail?id=5366 |  | 
|  422         "-Wno-reorder", |  | 
|  423         "-Wno-unused-function", |  | 
|  424       ] |  | 
|  425     } |  | 
|  426     if (is_linux) { |  433     if (is_linux) { | 
|  427       sources += [ |  434       sources += [ | 
|  428         "peerconnection/client/linux/main.cc", |  435         "peerconnection/client/linux/main.cc", | 
|  429         "peerconnection/client/linux/main_wnd.cc", |  436         "peerconnection/client/linux/main_wnd.cc", | 
|  430         "peerconnection/client/linux/main_wnd.h", |  437         "peerconnection/client/linux/main_wnd.h", | 
|  431       ] |  438       ] | 
|  432       libs = [ |  439       libs = [ | 
|  433         "X11", |  440         "X11", | 
|  434         "Xcomposite", |  441         "Xcomposite", | 
|  435         "Xext", |  442         "Xext", | 
|  436         "Xrender", |  443         "Xrender", | 
|  437       ] |  444       ] | 
|  438       public_configs = [ ":gtk2_config" ] |  445       public_configs = [ ":gtk2_config" ] | 
|  439     } |  446     } | 
|  440     deps = [ |  447     deps = [ | 
|  441       "//build/config/sanitizers:deps", |  448       "//build/config/sanitizers:deps", | 
|  442       "//webrtc/api:libjingle_peerconnection", |  449       "//webrtc/api:libjingle_peerconnection", | 
|  443       "//webrtc/system_wrappers:field_trial_default", |  450       "//webrtc/system_wrappers:field_trial_default", | 
|  444       "//webrtc/system_wrappers:metrics_default", |  451       "//webrtc/system_wrappers:metrics_default", | 
|  445     ] |  452     ] | 
 |  453     configs += [ ":peerconnection_client_warnings_config" ] | 
|  446     if (rtc_build_json) { |  454     if (rtc_build_json) { | 
|  447       deps += [ "//third_party/jsoncpp" ] |  455       deps += [ "//third_party/jsoncpp" ] | 
|  448     } |  456     } | 
|  449   } |  457   } | 
|  450   executable("peerconnection_server") { |  458   executable("peerconnection_server") { | 
|  451     sources = [ |  459     sources = [ | 
|  452       "peerconnection/server/data_socket.cc", |  460       "peerconnection/server/data_socket.cc", | 
|  453       "peerconnection/server/data_socket.h", |  461       "peerconnection/server/data_socket.h", | 
|  454       "peerconnection/server/main.cc", |  462       "peerconnection/server/main.cc", | 
|  455       "peerconnection/server/peer_channel.cc", |  463       "peerconnection/server/peer_channel.cc", | 
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  514       "//webrtc/system_wrappers:field_trial_default", |  522       "//webrtc/system_wrappers:field_trial_default", | 
|  515       "//webrtc/system_wrappers:metrics_default", |  523       "//webrtc/system_wrappers:metrics_default", | 
|  516     ] |  524     ] | 
|  517     if (is_clang) { |  525     if (is_clang) { | 
|  518       # Suppress warnings from the Chromium Clang plugin. |  526       # Suppress warnings from the Chromium Clang plugin. | 
|  519       # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |  527       # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 
|  520       configs -= [ "//build/config/clang:find_bad_constructs" ] |  528       configs -= [ "//build/config/clang:find_bad_constructs" ] | 
|  521     } |  529     } | 
|  522   } |  530   } | 
|  523 } |  531 } | 
| OLD | NEW |