Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 07:13:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 924107 - Make dist/include available in all of the WebRTC code; r=jesup,glandium

Browse Source
This commit is contained in:
Ehsan Akhgari 2013-10-15 15:08:43 -04:00
parent 84c1274b4a
commit 956afb018e
6 changed files with 2 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
media/webrtc/signaling/signaling.gyp
View File

@ -53,7 +53,6 @@
'../../../ipc/chromium/src',
'../../../ipc/chromium/src/base/third_party/nspr',
'../../../xpcom/base',
'$(DEPTH)/dist/include',
'../../../dom/base',
'../../../content/media',
'../../../media/mtransport',
@ -286,7 +285,6 @@
'../../../dom/base',
'../trunk/third_party/libsrtp/srtp/include',
'../trunk/third_party/libsrtp/srtp/crypto/include',
'$(DEPTH)/dist/include',
# Danger: this is to include config.h. This could be bad.
'../trunk/third_party/libsrtp/config',
],

17
media/webrtc/trunk/third_party/libyuv/libyuv.gyp vendored
View File

@ -27,13 +27,6 @@
'-ljpeg',
],
},
'conditions': [
['build_with_mozilla==1', {
'include_dirs': [
'$(DEPTH)/dist/include',
],
}],
],
}],
],
'defines': [
@ -56,16 +49,6 @@
'YUV_DISABLE_ASM',
],
}],
['build_with_mozilla==1', {
'include_dirs': [
'$(DEPTH)/dist/include',
],
'direct_dependent_settings': {
'include_dirs': [
'$(DEPTH)/dist/include',
],
},
}],
],
'sources': [
# includes.

6
media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py
View File

@ -76,10 +76,8 @@ endif
# Don't use STL wrappers when compiling Google code.
STL_FLAGS =
# Skip Mozilla-specific include locations.
# Specific GYP files can add them back by adding
# $(DIST)/include to their includes.
INCLUDES = -I. $(LOCAL_INCLUDES)
# Skip most Mozilla-specific include locations.
INCLUDES = -I. $(LOCAL_INCLUDES) -I$(DEPTH)/dist/include
# Ensure that subdirs for sources get created before compiling
ifdef OBJS

14
media/webrtc/trunk/webrtc/common_audio/common_audio.gyp
View File

@ -21,26 +21,12 @@
'resampler/include',
'signal_processing/include',
],
'target_conditions': [
['build_with_mozilla==1', {
'include_dirs': [
'$(DEPTH)/dist/include',
],
}],
],
'direct_dependent_settings': {
'include_dirs': [
'resampler/include',
'signal_processing/include',
'vad/include',
],
'conditions': [
['build_with_mozilla==1', {
'include_dirs': [
'$(DEPTH)/dist/include',
],
}],
],
},
'sources': [
'audio_util.cc',

2
media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi
View File

@ -25,8 +25,6 @@
'include',
'../interface',
'<(webrtc_root)/common_video/libyuv/include',
# added for mozilla for use_system_libjpeg
'$(DIST)/include',
],
'sources': [
'device_info_impl.cc',

3
media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8.gyp
View File

@ -31,9 +31,6 @@
'<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx',
],
},{
'include_dirs': [
'$(DIST)/include',
],
'link_settings': {
'libraries': [
'$(LIBVPX_OBJ)/libvpx.a',