Left: | ||
Right: |
OLD | NEW |
---|---|
1 #---------------------------------- | 1 #---------------------------------- |
2 # Makefile for Microsoft NMAKE | 2 # Makefile for Microsoft NMAKE |
3 # | 3 # |
4 # Call with only the version parameter to set the default target to all installe rs. | 4 # Call with only the version parameter to set the default target to all installe rs. |
5 # nmake VERSION=1.2.3 | 5 # nmake VERSION=1.2.3 |
6 # Call with a definition of the NMAKE variable ARCH on the command line | 6 # Call with a definition of the NMAKE variable ARCH on the command line |
7 # nmake VERSION=1.2.3 ARCH=ia32 | 7 # nmake VERSION=1.2.3 ARCH=ia32 |
8 # nmake VERSION=1.2.3 ARCH=x64 | 8 # nmake VERSION=1.2.3 ARCH=x64 |
9 # If an architecture is specified, the default target is constrained to it. | 9 # If an architecture is specified, the default target is constrained to it. |
10 #---------------------------------- | 10 #---------------------------------- |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
48 ia32: $(Installer_ia32) | 48 ia32: $(Installer_ia32) |
49 | 49 |
50 x64: $(Installer_x64) | 50 x64: $(Installer_x64) |
51 | 51 |
52 setup: $(Setup) | 52 setup: $(Setup) |
53 | 53 |
54 #--------------------- | 54 #--------------------- |
55 # candle .wxs --> .wixobj | 55 # candle .wxs --> .wixobj |
56 #--------------------- | 56 #--------------------- |
57 | 57 |
58 Candle = candle -nologo -dNoDefault -dVersion=$(VERSION) "-dConfiguration=$(Conf iguration)" $(CANDLE_FLAGS) $(*F).wxs -out $@ | 58 Candle = candle -nologo -dNoDefault -dVersion=$(VERSION) "-dConfiguration=$(Conf iguration)" $(CANDLE_FLAGS) $** -out $@ |
59 .wxs{$(Build_Dir_common)}.wixobj: | |
60 $(Candle) | |
Eric
2013/06/14 15:36:48
The common .wxs files shouldn't be version depende
| |
61 .wxs{$(Build_Dir_ia32)}.wixobj: | |
62 $(Candle) -arch x86 | |
63 .wxs{$(Build_Dir_x64)}.wixobj: | |
64 $(Candle) -arch x64 | |
65 | 59 |
66 objects_common = $(Build_Dir_common)custom_WixUI_InstallDir.wixobj | 60 objects_common = $(Build_Dir_common)custom_WixUI_InstallDir.wixobj |
67 objects_ia32 = $(Build_Dir_ia32)adblockplusie.wixobj $(objects_common) | 61 $(objects_common): custom_WixUI_InstallDir.wxs |
68 objects_x64 = $(Build_Dir_x64)adblockplusie.wixobj $(objects_common) | 62 » » $(Candle) |
69 | 63 |
70 object_setup = $(Build_Dir_common)setup.wixobj | 64 objects_ia32 = $(Build_Dir_ia32)adblockplusie-$(VERSION).wixobj |
65 $(objects_ia32): adblockplusie.wxs | |
Eric
2013/06/14 15:36:48
Looking at this line, I realize I forgot to add de
| |
66 » » $(Candle) -arch x86 | |
67 | |
68 objects_x64 = $(Build_Dir_x64)adblockplusie-$(VERSION).wixobj | |
69 $(objects_x64): adblockplusie.wxs | |
Eric
2013/06/14 15:36:48
Same .wxi dependencies needed here.
| |
70 » » $(Candle) -arch x64 | |
71 | |
72 object_setup = $(Build_Dir_common)setup-$(VERSION).wixobj | |
71 $(object_setup): setup.wxs | 73 $(object_setup): setup.wxs |
72 $(Candle) -ext WixBalExtension | 74 $(Candle) -ext WixBalExtension |
73 | 75 |
74 #--------------------- | 76 #--------------------- |
75 # light .wixobj --> .msi | 77 # light .wixobj --> .msi |
76 #--------------------- | 78 #--------------------- |
77 | 79 |
78 Light = light -notidy -nologo -cultures:en-us -loc en-us.wxl -ext WixUIExtension -out $@ | 80 Light = light -notidy -nologo -cultures:en-us -loc en-us.wxl -ext WixUIExtension -out $@ |
79 | 81 |
80 $(Installer_ia32): $(objects_ia32) "..\build\ia32\$(Configuration)\AdblockPlus.d ll" | 82 $(Installer_ia32): $(objects_ia32) $(objects_common) "..\build\ia32\$(Configurat ion)\AdblockPlus.dll" |
81 $(Light) $(objects_ia32) | 83 $(Light) $(objects_ia32) $(objects_common) |
Eric
2013/06/14 15:36:48
The common object is the custom-modified UI. There
| |
82 | 84 |
83 $(Installer_x64): $(objects_x64) "..\build\x64\$(Configuration)\AdblockPlusx64.d ll" | 85 $(Installer_x64): $(objects_x64) $(objects_common) "..\build\x64\$(Configuration )\AdblockPlusx64.dll" |
84 $(Light) $(objects_x64) | 86 $(Light) $(objects_x64) $(objects_common) |
85 | 87 |
86 #--------------------- | 88 #--------------------- |
87 # light .wixobj --> .exe | 89 # light .wixobj --> .exe |
88 #--------------------- | 90 #--------------------- |
89 | 91 |
90 $(Setup): $(object_setup) | 92 $(Setup): $(object_setup) |
91 $(Light) $(object_setup) -ext WixBalExtension | 93 $(Light) $(object_setup) -ext WixBalExtension |
92 | 94 |
93 #--------------------- | 95 #--------------------- |
94 # msiexec .msi --> installed --> uninstalled | 96 # msiexec .msi --> installed --> uninstalled |
(...skipping 18 matching lines...) Expand all Loading... | |
113 | 115 |
114 install-setup: $(Setup) | 116 install-setup: $(Setup) |
115 $(Setup) | 117 $(Setup) |
116 | 118 |
117 #--------------------- | 119 #--------------------- |
118 # Miscellaneous | 120 # Miscellaneous |
119 #--------------------- | 121 #--------------------- |
120 | 122 |
121 clean: | 123 clean: |
122 del $(objects_ia32) | 124 del $(objects_ia32) |
OLD | NEW |