From 8118ed28b3f2ea435d0633047a8520453d55fa61 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Thu, 11 Jul 2013 18:53:53 +0000 Subject: [PATCH] Add multi_threaded_dll option to cefclient.gyp (issue #970). git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1303 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- tools/distrib/cefclient.gyp | 43 +++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/tools/distrib/cefclient.gyp b/tools/distrib/cefclient.gyp index 7e33a547b..23fd9cf44 100644 --- a/tools/distrib/cefclient.gyp +++ b/tools/distrib/cefclient.gyp @@ -17,6 +17,9 @@ }, { 'pkg-config': 'pkg-config' }], + [ 'OS=="win"', { + 'multi_threaded_dll%': 0, + }], ] }, 'includes': [ @@ -109,6 +112,26 @@ '<@(cefclient_sources_win)', ], }], + [ 'OS=="win" and multi_threaded_dll', { + 'configurations': { + 'Debug': { + 'msvs_settings': { + 'VCCLCompilerTool': { + 'RuntimeLibrary': 3, + 'WarnAsError': 'false', + }, + }, + }, + 'Release': { + 'msvs_settings': { + 'VCCLCompilerTool': { + 'RuntimeLibrary': 2, + 'WarnAsError': 'false', + }, + }, + } + } + }], [ 'OS=="mac"', { 'product_name': 'cefclient', 'dependencies': [ @@ -243,6 +266,26 @@ 'gtk', ], }], + [ 'OS=="win" and multi_threaded_dll', { + 'configurations': { + 'Debug': { + 'msvs_settings': { + 'VCCLCompilerTool': { + 'RuntimeLibrary': 3, + 'WarnAsError': 'false', + }, + }, + }, + 'Release': { + 'msvs_settings': { + 'VCCLCompilerTool': { + 'RuntimeLibrary': 2, + 'WarnAsError': 'false', + }, + }, + } + } + }], ], }, ],