Unified Diff: installer/Makefile
Issue 10945039:
Switch to gyp (Closed)
Patch Set: Final version
Created June 21, 2013, 2:16 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« defaults.gypi ('k')
|
installer/adblockplusie.wxs » ('j')
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: installer/Makefile |
| =================================================================== |
| --- a/installer/Makefile |
| +++ b/installer/Makefile |
| @@ -11,17 +11,17 @@ |
| .SUFFIXES: .msi .wixobj .wxs |
| Build_Dir_common = ..\build\ # |
| Build_Dir_ia32 = ..\build\ia32\ # comment prevents newline |
| Build_Dir_x64 = ..\build\x64\ # |
| !ifndef Configuration |
| -Configuration = Release Test |
| +Configuration = Release |
| !endif |
| !ifndef VERSION |
| VERSION = 99.9 |
| !endif |
| #--------------------- |
| # Default Targets |
| @@ -77,17 +77,17 @@ object_setup = $(Build_Dir_common)setup- |
| # light .wixobj --> .msi |
| #--------------------- |
| Light = light -notidy -nologo -cultures:en-us -loc en-us.wxl -ext WixUIExtension -out $@ |
| $(Installer_ia32): $(objects_ia32) $(objects_common) "..\build\ia32\$(Configuration)\AdblockPlus.dll" |
| $(Light) $(objects_ia32) $(objects_common) |
| -$(Installer_x64): $(objects_x64) $(objects_common) "..\build\x64\$(Configuration)\AdblockPlusx64.dll" |
| +$(Installer_x64): $(objects_x64) $(objects_common) "..\build\ia32\$(Configuration)\AdblockPlus.dll" "..\build\x64\$(Configuration)\AdblockPlus.dll" |
| $(Light) $(objects_x64) $(objects_common) |
| #--------------------- |
| # light .wixobj --> .exe |
| #--------------------- |
| $(Setup): $(object_setup) |
| $(Light) $(object_setup) -ext WixBalExtension |
« no previous file with comments
|
« defaults.gypi ('k')
|
installer/adblockplusie.wxs » ('j')
|
no next file with comments »
