Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(247)

Unified Diff: third_party/modp_b64/modp_b64.gyp

Issue 103333004: Allow Win64 build of base library even in a Win32 build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Base Win64: Address CR feedback Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sandbox/win/sandbox_win.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/modp_b64/modp_b64.gyp
diff --git a/third_party/modp_b64/modp_b64.gyp b/third_party/modp_b64/modp_b64.gyp
index baed111858a5b639a747eaf1dd822a7c9165ae6d..6176c5deeaa8c635dbb1d351738262c02ada3d97 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',
+ },
+ },
+ },
+ ],
+ }],
+ ],
}
« no previous file with comments | « sandbox/win/sandbox_win.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698