From 0460c7294a2bab212d623d7732edafc022c0fd9d Mon Sep 17 00:00:00 2001 From: "tommi@webrtc.org" Date: Tue, 19 Feb 2013 12:13:03 +0000 Subject: [PATCH] Remove the dependency on dxguid.lib. It turns out we don't really need it and therefore can also get rid of the added lib directory. Review URL: https://webrtc-codereview.appspot.com/1094015 git-svn-id: http://webrtc.googlecode.com/svn/trunk@3530 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/modules/video_render/video_render.gypi | 15 --------------- .../windows/video_render_windows_impl.h | 2 -- 2 files changed, 17 deletions(-) diff --git a/webrtc/modules/video_render/video_render.gypi b/webrtc/modules/video_render/video_render.gypi index cb7affe5b..cb0abadaa 100644 --- a/webrtc/modules/video_render/video_render.gypi +++ b/webrtc/modules/video_render/video_render.gypi @@ -139,21 +139,6 @@ 'include_dirs': [ '<(directx_sdk_path)/Include', ], - - 'VCLinkerTool': { - 'conditions': [ - ['target_arch=="x86"', { - 'AdditionalLibraryDirectories': [ - '<(directx_sdk_path)/Lib/x86', - ], - }], - ['target_arch=="x64"', { - 'AdditionalLibraryDirectories': [ - '<(directx_sdk_path)/Lib/x64', - ], - }], - ], # conditions - }, # VCLinkerTool }], ['OS!="win" or include_internal_video_render==0', { 'sources!': [ diff --git a/webrtc/modules/video_render/windows/video_render_windows_impl.h b/webrtc/modules/video_render/windows/video_render_windows_impl.h index c04cdcd9f..0d4c15f61 100644 --- a/webrtc/modules/video_render/windows/video_render_windows_impl.h +++ b/webrtc/modules/video_render/windows/video_render_windows_impl.h @@ -22,8 +22,6 @@ class CriticalSectionWrapper; #define EXPAND(x) x, sizeof(x)/sizeof(TCHAR) -#pragma comment(lib, "dxguid.lib") - enum VideoRenderWinMethod { kVideoRenderWinD3D9 = 0, };