Bug 1072296 - make webrtc only define WINVER and _WIN32_WINNT if we're not building for mozilla; r=mshal
authorNathan Froyd <froydnj@mozilla.com>
Mon, 27 Oct 2014 15:50:43 -0400
changeset 237758 a07e226542b536fbf7d9c779c5f0316bf169b2b9
parent 237757 6eea06e3b9086fad2548c3189b935874b513d219
child 237759 c3624a3708406844f3dbdc46a1a61937d162f197
push id4311
push userraliiev@mozilla.com
push dateMon, 12 Jan 2015 19:37:41 +0000
treeherdermozilla-beta@150c9fed433b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1072296
milestone36.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 1072296 - make webrtc only define WINVER and _WIN32_WINNT if we're not building for mozilla; r=mshal
media/webrtc/trunk/build/common.gypi
--- a/media/webrtc/trunk/build/common.gypi
+++ b/media/webrtc/trunk/build/common.gypi
@@ -3314,28 +3314,32 @@
             },
           }],
         ],  # target_conditions
       },  # target_defaults
     }],  # OS=="ios"
     ['OS=="win"', {
       'target_defaults': {
         'defines': [
-          '_WIN32_WINNT=0x0602',
-          'WINVER=0x0602',
           'WIN32',
           '_WINDOWS',
           'NOMINMAX',
           'PSAPI_VERSION=1',
           '_CRT_RAND_S',
           'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS',
           'WIN32_LEAN_AND_MEAN',
           '_ATL_NO_OPENGL',
         ],
         'conditions': [
+          ['build_with_mozilla==0', {
+              'defines': [
+                '_WIN32_WINNT=0x0602',
+                'WINVER=0x0602',
+              ],
+          }],
           ['buildtype=="Official"', {
               # In official builds, targets can self-select an optimization
               # level by defining a variable named 'optimize', and setting it
               # to one of
               # - "size", optimizes for minimal code size - the default.
               # - "speed", optimizes for speed over code size.
               # - "max", whole program optimization and link-time code
               #   generation. This is very expensive and should be used