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

Condition for DirectX variable on Windows

Browse Source 
The directx_sdk_path GYP variable got the value $(DXSDK_DIR) on non-windows platforms which is normally an uninitialized environment variable, causing an error during GYP generation.
Putting this include within a condition for Windows resolves this.

This was only triggered when GYP_GENERATORS=ninja and not for the default on Linux (make), so the bots haven't noticed this.

BUG=none
TEST=All default trybots passing. Successfully generating projects on Linux and Mac for make and ninja (plus XCode on Mac). Successful compile on Windows without DirectX SDK installed (but with files located in third_party/directxsdk/files).

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3156 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
kjellander@webrtc.org 2012-11-23 09:41:42 +00:00
parent 849fb8ebd2
commit 6ba79a88e5
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,7 +19,6 @@
'include_dirs': [
'include',
'../interface',
'<(directx_sdk_path)/Include',
],
'direct_dependent_settings': {
'include_dirs': [
@ -120,6 +119,11 @@
'include_dirs': ['mac',],
},
}],
['OS=="win"', {
'include_dirs': [
'<(directx_sdk_path)/Include',
],
}],
['OS!="win" or include_internal_video_render==0', {
'sources!': [
'windows/i_video_render_win.h',