diff options
| author | petewil@chromium.org <petewil@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-09 18:48:05 +0000 |
|---|---|---|
| committer | petewil@chromium.org <petewil@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-09 18:48:05 +0000 |
| commit | ef1af5c3183fe154fa51ff89f71f0977b72ac3b4 (patch) | |
| tree | 5ce852b4b5391d03b4dd0189c9c84c4414fa8e56 /third_party | |
| parent | 140cc3f38bf484809401e1bccba891c53f56491d (diff) | |
| download | chromium_src-ef1af5c3183fe154fa51ff89f71f0977b72ac3b4.zip chromium_src-ef1af5c3183fe154fa51ff89f71f0977b72ac3b4.tar.gz chromium_src-ef1af5c3183fe154fa51ff89f71f0977b72ac3b4.tar.bz2 | |
Allow Win64 build of base library even in a Win32 build.
Some components of a 32 bit build of chrome for Windows need to be built
as Win64 Dlls. To allow those components to use base, we make a Win64
build of the base library even when building chrome 32 bit.
This is needed by the Chrome Desk Band code. crbug.com/327435.
https://codereview.chromium.org/79173004/
BUG=327435
Review URL: https://codereview.chromium.org/103333004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243936 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/modp_b64/modp_b64.gyp | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/third_party/modp_b64/modp_b64.gyp b/third_party/modp_b64/modp_b64.gyp index baed111..6176c5d 100644 --- a/third_party/modp_b64/modp_b64.gyp +++ b/third_party/modp_b64/modp_b64.gyp @@ -18,4 +18,31 @@ ], }, ], + 'conditions': [ + ['OS == "win" and target_arch=="ia32"', { + # Even if we are building the browser for Win32, we need a few modules + # to be built for Win64, and this is a prerequsite. + 'targets': [ + { + 'target_name': 'modp_b64_win64', + 'type': 'static_library', + # We can't use dynamic_annotations target for win64 build since it is + # a 32-bit library. + 'include_dirs': [ + '../..', + ], + 'sources': [ + 'modp_b64.cc', + 'modp_b64.h', + 'modp_b64_data.h', + ], + 'configurations': { + 'Common_Base': { + 'msvs_target_platform': 'x64', + }, + }, + }, + ], + }], + ], } |