From f17d7d1dde5c1a42b67d216ff9a3fcf172a48744 Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" Date: Mon, 5 Nov 2012 13:13:05 +0000 Subject: [PATCH] Using proper GYP references for Strmiids.lib on Windows This makes it possible to link properly using Ninja on Windows. Another issue exists due to the path containing spaces in webrtc/modules/video_capture/windows/direct_show_base_classes.gyp but that can be worked around by copying the baseclasses dir from the SDK into a path without spaces and then overriding the direct_show_dir variable with GYP_DEFINES. Example: set GYP_DEFINES=direct_show_dir=C:/WinSDKv7.1_directshow_baseclasses/ gclient runhooks ninja -C out/Debug Notice that the ending slash is needed for the direct_show_dir variable. BUG=none TEST=local compilation with the baseclasses copied from Windows SDK 7.1 into C:/WinSDKv7.1_directshow_baseclasses. Review URL: https://webrtc-codereview.appspot.com/936014 git-svn-id: http://webrtc.googlecode.com/svn/trunk@3043 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/modules/video_capture/video_capture.gypi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/webrtc/modules/video_capture/video_capture.gypi b/webrtc/modules/video_capture/video_capture.gypi index 0f801cbb72..f0c0d366aa 100644 --- a/webrtc/modules/video_capture/video_capture.gypi +++ b/webrtc/modules/video_capture/video_capture.gypi @@ -97,10 +97,10 @@ 'windows/device_info_windows.cc', 'windows/video_capture_factory_windows.cc', ], - 'msvs_settings': { - 'VCLibrarianTool': { - 'AdditionalDependencies': 'Strmiids.lib', - }, + 'link_settings': { + 'libraries': [ + '-lStrmiids.lib', + ], }, }], # win ['OS=="android"', {