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

Add direct_dependent_settings in common.gypi.

Browse Source 
When building chromium targets that depend on webrtc, compiler settings must
have the include path to webrtc and webrtc-specific defines that the headers
may depend on. Added direct_dependent_settings in common.gyp, so that all
webrtc target propagate these settings to dependencies.

R=andrew@webrtc.org, tommi@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4084 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
sergeyu@chromium.org
2013-05-22 18:22:21 +00:00
parent 5f8f112a7b
commit 6ebfd346ae
2 changed files with 53 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
webrtc/build/common.gypi
View File

@@ -308,6 +308,59 @@
], ],
}], }],
], # conditions ], # conditions
'direct_dependent_settings': {
'include_dirs': [
'../..',
],
'conditions': [
['build_with_mozilla==1', {
'defines': [
# Changes settings for Mozilla build.
'WEBRTC_MOZILLA_BUILD',
],
}],
['build_with_chromium==1', {
'defines': [
# Changes settings for Chromium build.
'WEBRTC_CHROMIUM_BUILD',
],
}],
['OS=="mac"', {
'defines': [
'WEBRTC_MAC',
],
}],
['OS=="ios"', {
'defines': [
'WEBRTC_MAC',
'WEBRTC_IOS',
],
}],
['OS=="win"', {
'defines': [
'WEBRTC_WIN',
],
}],
['OS=="linux"', {
'defines': [
'WEBRTC_LINUX',
],
}],
['OS=="android"', {
'defines': [
'WEBRTC_LINUX',
'WEBRTC_ANDROID',
],
'conditions': [
['enable_android_opensl==1', {
'defines': [
'WEBRTC_ANDROID_OPENSLES',
],
}]
],
}],
],
},
}, # target_defaults }, # target_defaults
} }

17
webrtc/modules/desktop_capture/desktop_capture.gypi
View File

@@ -26,23 +26,6 @@
'dependencies': [ 'dependencies': [
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
], ],
'direct_dependent_settings': {
# Headers may use include path relative to webrtc root and depend on
# WEBRTC_WIN define, so we need to make sure dependent targets have
# these settings.
#
# TODO(sergeyu): Move these settings to common.gypi
'include_dirs': [
'../../..',
],
'conditions': [
['OS=="win"', {
'defines': [
'WEBRTC_WIN',
],
}],
],
},
'sources': [ 'sources': [
"desktop_capturer.h", "desktop_capturer.h",
"desktop_frame.cc", "desktop_frame.cc",