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

Clean directx_sdk_path as it is already defined in base/common.gypi

Browse Source 
R=kjellander@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7237 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
andresp@webrtc.org
2014-09-19 08:14:12 +00:00
parent 5ca6008236
commit 2036a7bb40
2 changed files with 1 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
webrtc/modules/video_render/video_render.gypi
View File

@@ -142,22 +142,6 @@
'windows/video_render_direct3d9.cc', 'windows/video_render_direct3d9.cc',
'windows/video_render_windows_impl.cc', 'windows/video_render_windows_impl.cc',
], ],
'variables': {
# 'directx_sdk_path' will be overridden in the condition block
# below, but it must not be declared as empty here since gyp
# will check if the first character is '/' for some reason.
# If it's empty, we'll get an out-of-bounds error.
'directx_sdk_path': 'will_be_overridden',
'directx_sdk_default_path': '<(DEPTH)/third_party/directxsdk/files',
'conditions': [
['"<!(python <(DEPTH)/build/dir_exists.py <(directx_sdk_default_path))"=="True"', {
'directx_sdk_path': '<(DEPTH)/third_party/directxsdk/files',
}, {
'directx_sdk_path': '$(DXSDK_DIR)',
}],
],
},
'include_dirs': [ 'include_dirs': [
'<(directx_sdk_path)/Include', '<(directx_sdk_path)/Include',
], ],

16
webrtc/test/webrtc_test_common.gyp
View File

@@ -104,22 +104,6 @@
'sources!': [ 'sources!': [
'null_platform_renderer.cc', 'null_platform_renderer.cc',
], ],
'variables': {
# 'directx_sdk_path' will be overridden in the condition block
# below, but it must not be declared as empty here since gyp
# will check if the first character is '/' for some reason.
# If it's empty, we'll get an out-of-bounds error.
'directx_sdk_path': 'will_be_overridden',
'directx_sdk_default_path': '<(DEPTH)/third_party/directxsdk/files',
'conditions': [
['"<!(python <(DEPTH)/build/dir_exists.py <(directx_sdk_default_path))"=="True"', {
'directx_sdk_path': '<(DEPTH)/third_party/directxsdk/files',
}, {
'directx_sdk_path': '$(DXSDK_DIR)',
}],
],
},
'include_dirs': [ 'include_dirs': [
'<(directx_sdk_path)/Include', '<(directx_sdk_path)/Include',
], ],