Bug 983504 - Buildsystem changes for multimonitor support. r=ted
authorMatthew A. Miller <linuxwolf@outer-planes.net>
Wed, 16 Jul 2014 19:16:38 +0200
changeset 216335 35b31cf451bc07030159c469b4ba441303e1ecb0
parent 216334 bef05df2ed8a61fe5d50f79b6e7d9fa915400ba4
child 216336 a8af0fea5e651de277cf642204c4164046600a60
push id515
push userraliiev@mozilla.com
push dateMon, 06 Oct 2014 12:51:51 +0000
treeherdermozilla-release@267c7a481bef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs983504
milestone33.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 983504 - Buildsystem changes for multimonitor support. r=ted
media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture.gypi
--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture.gypi
+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture.gypi
@@ -2,16 +2,19 @@
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
 {
+  'variables': {
+    'multi_monitor_screenshare%' : 0,
+  },
   'targets': [
     {
       'target_name': 'desktop_capture',
       'type': 'static_library',
       'dependencies': [
         '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
       ],
       'sources': [
@@ -49,16 +52,21 @@
         "window_capturer.cc",
         "window_capturer.h",
         "desktop_device_info.h",
         "desktop_device_info.cc",
         "app_capturer.h",
         "app_capturer.cc",
       ],
       'conditions': [
+        ['multi_monitor_screenshare != 0', {
+          'defines': [
+            'MULTI_MONITOR_SCREENSHARE'
+          ],
+        }],
         ['OS!="ios" and (target_arch=="ia32" or target_arch=="x64")', {
           'dependencies': [
             'desktop_capture_differ_sse2',
           ],
         }],
         ['use_x11 == 1', {
           'defines':[
             'USE_X11',