Chromium Code Reviews| Index: base/base.isolate |
| diff --git a/base/base.isolate b/base/base.isolate |
| index 021c01cda1012cf0b02524de722c7fd224c264f6..f9784c2fd3729a299ad4012e5bc9ed0d9848af18 100644 |
| --- a/base/base.isolate |
| +++ b/base/base.isolate |
| @@ -53,23 +53,27 @@ |
| ], |
| }, |
| }], |
| + # Copy the VS runtime DLLs into the isolate so that they |
| + # don't have to be preinstalled on the target machine. |
| + ['OS=="win" and component=="shared_library" and CONFIGURATION_NAME=="Debug"', { |
|
scottmg
2015/02/03 20:40:18
You might need a /x64/msvcr120.dll for shared_libr
Nico
2015/02/03 20:45:22
Uhhh…added it, but nothing's red because of that.
|
| + 'variables': { |
| + 'files': [ |
| + '<(PRODUCT_DIR)/x64/msvcp120d.dll', |
|
M-A Ruel
2015/02/03 20:40:01
cute
So both 32 and 64 bits versions need to be m
|
| + '<(PRODUCT_DIR)/x64/msvcr120d.dll', |
| + ], |
| + }, |
| + }], |
| ['OS=="win" and component=="shared_library" and (CONFIGURATION_NAME=="Debug" or CONFIGURATION_NAME=="Debug_x64")', { |
| 'variables': { |
| 'files': [ |
| - # Copy the VS runtime DLLs into the isolate so that they |
| - # don't have to be preinstalled on the target machine. |
| '<(PRODUCT_DIR)/msvcp120d.dll', |
| '<(PRODUCT_DIR)/msvcr120d.dll', |
| - '<(PRODUCT_DIR)/x64/msvcp120d.dll', |
| - '<(PRODUCT_DIR)/x64/msvcr120d.dll', |
| ], |
| }, |
| }], |
| ['OS=="win" and component=="shared_library" and (CONFIGURATION_NAME=="Release" or CONFIGURATION_NAME=="Release_x64")', { |
| 'variables': { |
| 'files': [ |
| - # Copy the VS runtime DLLs into the isolate so that they |
| - # don't have to be preinstalled on the target machine. |
| '<(PRODUCT_DIR)/msvcp120.dll', |
| '<(PRODUCT_DIR)/msvcr120.dll', |
| ], |