From 6ba79a88e51006ed980aa0d1dd18539a6c90b480 Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" Date: Fri, 23 Nov 2012 09:41:42 +0000 Subject: [PATCH] Condition for DirectX variable on Windows 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 --- webrtc/modules/video_render/video_render.gypi | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/webrtc/modules/video_render/video_render.gypi b/webrtc/modules/video_render/video_render.gypi index 85539aa7d3..3ab2f0706e 100644 --- a/webrtc/modules/video_render/video_render.gypi +++ b/webrtc/modules/video_render/video_render.gypi @@ -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',