From 5e1316f9bb5e799a71e188560f8d22f42d7d2c7e Mon Sep 17 00:00:00 2001 From: "henrika@google.com" Date: Mon, 20 Jun 2011 09:53:51 +0000 Subject: [PATCH] Adds condition in gyp-files to ensure that we can build MFC applications with different settings of the "Use of MFC" setting in VS for Windows. Review URL: http://webrtc-codereview.appspot.com/43003 git-svn-id: http://webrtc.googlecode.com/svn/trunk@101 4adac7df-926f-26a2-2b94-8c16560cd09d --- video_engine/main/test/WindowsTest/windowstest.gyp | 10 ++++++++-- voice_engine.gyp | 8 +++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/video_engine/main/test/WindowsTest/windowstest.gyp b/video_engine/main/test/WindowsTest/windowstest.gyp index 486083f4ca..28d1432b8a 100644 --- a/video_engine/main/test/WindowsTest/windowstest.gyp +++ b/video_engine/main/test/WindowsTest/windowstest.gyp @@ -49,10 +49,16 @@ 'CaptureDevicePool.h', ], - 'configurations': { + 'configurations': { 'Common_Base': { 'msvs_configuration_attributes': { - 'UseOfMFC': '1', # Static + 'conditions': [ + ['component=="shared_library"', { + 'UseOfMFC': '2', # Shared DLL + },{ + 'UseOfMFC': '1', # Static + }], + ], }, }, }, diff --git a/voice_engine.gyp b/voice_engine.gyp index 4556e4572e..0587cd302d 100644 --- a/voice_engine.gyp +++ b/voice_engine.gyp @@ -163,7 +163,13 @@ 'configurations': { 'Common_Base': { 'msvs_configuration_attributes': { - 'UseOfMFC': '1', # Static + 'conditions': [ + ['component=="shared_library"', { + 'UseOfMFC': '2', # Shared DLL + },{ + 'UseOfMFC': '1', # Static + }], + ], }, }, },