generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Makes webrtc and libjingle build from the same gyp-file. Also, the libjingle and webrtc DEPS revisions were mismatching. This cl takes the most recent revision of mismatches. Also disables 64 bit Mac builds for libjingle

Browse Source 
BUG=1932
TESTED=git try
R=andrew@webrtc.org, fischman@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/1836004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4382 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrike@webrtc.org
2013-07-23 00:27:43 +00:00
parent 390fcb7a20
commit 5fcddf2334
5 changed files with 92 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
talk/libjingle_all.gyp
View File

@@ -1,40 +0,0 @@
#
# libjingle
# Copyright 2012, Google Inc.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# 1. Redistributions of source code must retain the above copyright notice,
# this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
# 3. The name of the author may not be used to endorse or promote products
# derived from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
{
'targets': [
{
'target_name': 'All',
'type': 'none',
'dependencies': [
'libjingle.gyp:*',
'libjingle_examples.gyp:*',
'libjingle_tests.gyp:*',
],
},
],
}