Unified Diff: installer/Makefile
Issue 22887001:
Custom action library, initial version (Closed)
Patch Set:
Created Oct. 28, 2013, 9:37 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« installer/Doxyfile ('k')
|
installer/adblockplusie.wxs » ('j')
|
installer/installer.gyp » ('J')
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 |
| @@ -43,6 +43,14 @@ |
| !error Unknown variable ARCH=$(ARCH) |
| !endif |
| +default: |
| + @echo Available targets |
| + @echo - ia32 |
| + @echo - x64 |
| + @echo - setup |
| + @echo - install-ia32 |
| + @echo - install-x64 |
| + |
| all: ia32 x64 setup |
| ia32: $(Installer_ia32) |
| @@ -79,8 +87,8 @@ |
| Light = light -notidy -nologo -cultures:en-us -ext WixUIExtension -out $@ |
| -$(Installer_ia32): $(objects_ia32) $(objects_common) "..\build\ia32\$(Configuration)\AdblockPlus.dll" |
| - $(Light) $(objects_ia32) $(objects_common) -loc en-us.wxl |
| +$(Installer_ia32): $(objects_ia32) $(objects_common) "..\build\ia32\$(Configuration)\AdblockPlus.dll" "build\ia32\Debug\installer-ca.dll" |
| + $(Light) $(objects_ia32) $(objects_common) -loc en-us.wxl -sval |
| # TODO: Don't ignore errors here (fix install paths) |
| $(Installer_x64): $(objects_x64) $(objects_common) "..\build\ia32\$(Configuration)\AdblockPlus.dll" "..\build\x64\$(Configuration)\AdblockPlus.dll" |
« no previous file with comments
|
« installer/Doxyfile ('k')
|
installer/adblockplusie.wxs » ('j')
|
installer/installer.gyp » ('J')
