# Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
#
# 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.

{
  'includes': [
    'common_settings.gypi', # Common settings
  ],
 'targets': [
    {
      'target_name': 'auto_tests',
      'type': 'none',
      'dependencies': [
        'voice_engine.gyp:voe_auto_test',
        'video_engine.gyp:vie_auto_test',
      ],
    },

    {
      'target_name': 'peerconnection_client',
      'conditions': [
        ['OS=="win"', {
          'type': 'executable',
          'sources': [
            'peerconnection/samples/client/conductor.cc',
            'peerconnection/samples/client/conductor.h',
            'peerconnection/samples/client/defaults.cc',
            'peerconnection/samples/client/defaults.h',
            'peerconnection/samples/client/main.cc',
            'peerconnection/samples/client/main_wnd.cc',
            'peerconnection/samples/client/main_wnd.h',
            'peerconnection/samples/client/peer_connection_client.cc',
            'peerconnection/samples/client/peer_connection_client.h',
            '../third_party/libjingle/source/talk/base/win32socketinit.cc',
            '../third_party/libjingle/source/talk/base/win32socketserver.cc',
          ],
          'msvs_settings': {
            'VCLinkerTool': {
             'SubSystem': '2',   # Windows
            },
          },
        }, {
          'type': 'none',
        }],
      ],  # conditions
      'dependencies': [
        '../third_party/libjingle/libjingle.gyp:libjingle_app',
      ],
      'include_dirs': [
        '../third_party/libjingle/source',
      ],
    },
    
    {
      'target_name': 'peerconnection_server',
      'type': 'executable',
      'sources': [
        'peerconnection/samples/server/data_socket.cc',
        'peerconnection/samples/server/data_socket.h',
        'peerconnection/samples/server/main.cc',
        'peerconnection/samples/server/peer_channel.cc',
        'peerconnection/samples/server/peer_channel.h',
        'peerconnection/samples/server/utils.cc',
        'peerconnection/samples/server/utils.h',
      ],
    },
  ],
}

@@ -656,17 +656,20 @@
 ,%0A    %7D,
-%0A
+    
 %0A    %7B%0A 
@@ -704,22 +704,180 @@
 nection_
-client
+server',%0A      'type': 'executable',%0A      'sources': %5B%0A        'peerconnection/samples/server/data_socket.cc',%0A        'peerconnection/samples/server/data_socket.h
 ',%0A     
@@ -881,47 +881,400 @@
     
+ 
-'conditions': %5B%0A        %5B'OS==%22win%22', %7B
+ 'peerconnection/samples/server/main.cc',%0A        'peerconnection/samples/server/peer_channel.cc',%0A        'peerconnection/samples/server/peer_channel.h',%0A        'peerconnection/samples/server/utils.cc',%0A        'peerconnection/samples/server/utils.h',%0A      %5D,%0A    %7D,%0A  %5D,%0A  'conditions': %5B%0A    %5B'OS==%22win%22', %7B%0A      'targets': %5B%0A        %7B%0A          'target_name': 'peerconnection_client',
 %0A   
@@ -2165,78 +2165,8 @@
     
-    %7D, %7B%0A          'type': 'none',%0A        %7D%5D,%0A      %5D,  # conditions%0A
     
@@ -2177,32 +2177,36 @@
 ependencies': %5B%0A
+    
         '../thir
@@ -2255,27 +2255,35 @@
 app',%0A      
-%5D,%0A
+    %5D,%0A    
       'inclu
@@ -2290,24 +2290,28 @@
 de_dirs': %5B%0A
+    
         '../
@@ -2351,513 +2351,87 @@
     
-%5D,%0A
     
-%7D
+%5D
 ,%0A    
-%0A
     
-%7B%0A      'target_name': 'peerconnection_server',%0A      'type': 'executable',%0A      'sources': %5B%0A        'peerconnection/samples/server/data_socket.cc',%0A        'peerconnection/samples/server/data_socket.h',%0A        'peerconnection/samples/server/main.cc',%0A        'peerconnection/samples/server/peer_channel.cc',%0A        'peerconnection/samples/server/peer_channel.h',%0A        'peerconnection/samples/server/utils.cc',%0A        'peerconnection/samples/server/utils.h',%0A      %5D,%0A    %7D,%0A  %5D,
+%7D,%0A      %5D,  # targets%0A    %7D, %5D,  # OS=%22win%22%0A  %5D,  # conditions  
 %0A%7D%0A

Change the conditions for the peerconnectin_client project. Now the project is completely within a "win" condition which should fix the mac build problem. Review URL: http://webrtc-codereview.appspot.com/20021