diff options
| author | tommi@google.com <tommi@google.com@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2011-05-31 15:49:22 +0000 |
|---|---|---|
| committer | tommi@google.com <tommi@google.com@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2011-05-31 15:49:22 +0000 |
| commit | aefcdf49ba47b14fbcaa1a31c94a80de44985fca (patch) | |
| tree | d34da017348b889ba0eedb9271ddd1e6ad60a231 /webrtc.gyp | |
| parent | 3ec779893be6fc6418d20ede6a702598450ed26a (diff) | |
| download | webrtc-aefcdf49ba47b14fbcaa1a31c94a80de44985fca.tar.gz | |
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
git-svn-id: http://webrtc.googlecode.com/svn/trunk@20 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'webrtc.gyp')
| -rw-r--r-- | webrtc.gyp | 60 |
1 files changed, 29 insertions, 31 deletions
diff --git a/webrtc.gyp b/webrtc.gyp index 2605465863..49d35d9de1 100644 --- a/webrtc.gyp +++ b/webrtc.gyp @@ -18,12 +18,26 @@ 'voice_engine.gyp:voe_auto_test', 'video_engine.gyp:vie_auto_test', ], - }, - + }, { - 'target_name': 'peerconnection_client', - 'conditions': [ - ['OS=="win"', { + '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', + ], + }, + ], + 'conditions': [ + ['OS=="win"', { + 'targets': [ + { + 'target_name': 'peerconnection_client', 'type': 'executable', 'sources': [ 'peerconnection/samples/client/conductor.cc', @@ -43,30 +57,14 @@ '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', - ], - }, - ], + 'dependencies': [ + '../third_party/libjingle/libjingle.gyp:libjingle_app', + ], + 'include_dirs': [ + '../third_party/libjingle/source', + ], + }, + ], # targets + }, ], # OS="win" + ], # conditions } |