Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: installer/installer.gyp

Issue 5117000430911488: Build for x64 CA library (Closed)
Patch Set: Created March 27, 2014, 5:43 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | installer/src/msi/adblockplusie.wxs » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: installer/installer.gyp
===================================================================
--- a/installer/installer.gyp
+++ b/installer/installer.gyp
@@ -13,6 +13,16 @@
'variables':
{
#
+ # Architecture specification
+ # -- WiX uses {x86,x64}. VS uses {ia32,x64}
+ #
+ 'conditions' :
+ [
+ [ 'target_arch=="ia32"', { 'candle_arch': 'x86' } ],
+ [ 'target_arch=="x64"', { 'candle_arch': 'x64' } ]
+ ],
+
+ #
# Build directories, both common and architecture-specific
#
'build_dir_arch': 'build/<(target_arch)',
@@ -161,7 +171,7 @@
'<(installer_object_file)'
],
'action':
- [ 'candle -nologo -dNoDefault -dVersion=91.0 -dConfiguration=Release ', '-out', '<@(_outputs)', '<(installer_source_top_file)' ]
+ [ 'candle -nologo -arch <(candle_arch) -dNoDefault -dVersion=91.0 -dConfiguration=Release', '-out', '<@(_outputs)', '<(installer_source_top_file)' ]
} ]
},
« no previous file with comments | « no previous file | installer/src/msi/adblockplusie.wxs » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld