Index: installer/src/msi/adblockplusie.wxs |
=================================================================== |
--- a/installer/src/msi/adblockplusie.wxs |
+++ b/installer/src/msi/adblockplusie.wxs |
@@ -50,10 +50,12 @@ |
<?define Minimum_Version="100"?> |
<?define Program_Files="ProgramFilesFolder"?> |
<?define Product_Name="!(loc.ProductName32)"?> |
+ <?define build_dir="ia32"?> |
<?elseif $(sys.BUILDARCH)="x64"?> |
<?define Minimum_Version="200"?> |
<?define Program_Files="ProgramFiles64Folder"?> |
<?define Product_Name="!(loc.ProductName64)"?> |
+ <?define build_dir="x64"?> |
<?else?> |
<?error Unsupported value of sys.BUILDARCH=$(sys.BUILDARCH)?> |
<?endif?> |
@@ -159,7 +161,7 @@ |
<!-- |
Note that we're using a 32-bit custom action library for both 32- and 64-bit installers. |
--> |
- <Binary Id="installer_ca" SourceFile="$(var.installer_dir)\build\ia32\$(var.CA_Configuration)\installer-ca.dll"/> |
+ <Binary Id="installer_ca" SourceFile="$(var.installer_dir)\build\$(var.build_dir)\$(var.CA_Configuration)\installer-ca.dll"/> |
<InstallUISequence> |
<!-- |
The LaunchConditions action occurs near the beginning, before any of the expensive operations. |