Logo in the Windows installer.

pfusik · Dec 23, 2021 · 5ea8fd4 · 5ea8fd4
1 parent 49b3dc1
commit 5ea8fd4
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 6 deletions.
diff --git a/win32/.gitignore b/win32/.gitignore
@@ -1,4 +1,3 @@
 *.wixobj
 QOI.plg64
 signed
-signed-msi
diff --git a/win32/setup/banner.jpg b/win32/setup/banner.jpg
diff --git a/win32/setup/dialog.jpg b/win32/setup/dialog.jpg
diff --git a/win32/license.rtf → win32/setup/license.rtf b/win32/license.rtf → win32/setup/license.rtf
diff --git a/win32/qoi-ci.wxs → win32/setup/qoi-ci.wxs b/win32/qoi-ci.wxs → win32/setup/qoi-ci.wxs
@@ -8,8 +8,12 @@
 		<MajorUpgrade DowngradeErrorMessage="Newer version of Quite OK Image plugins is already installed!" />
 		<Media Id="1" Cabinet="qoici.cab" EmbedCab="yes" CompressionLevel="high" />
 
+		<Icon Id="qoi.ico" SourceFile="win32/setup/qoi.ico" />
 		<Property Id="ARPHELPLINK" Value="https://github.com/pfusik/qoi-ci" />
-		<WixVariable Id="WixUILicenseRtf" Value="win32/license.rtf" />
+		<Property Id="ARPPRODUCTICON" Value="qoi.ico" />
+		<WixVariable Id="WixUILicenseRtf" Value="win32/setup/license.rtf" />
+		<WixVariable Id="WixUIDialogBmp" Value="win32/setup/dialog.jpg" />
+		<WixVariable Id="WixUIBannerBmp" Value="win32/setup/banner.jpg" />
 
 		<UI Id="MyWixUI_FeatureTree">
 			<!-- customized WixUI_FeatureTree from Wix 3.0 - my changes commented -->

diff --git a/win32/setup/qoi.ico b/win32/setup/qoi.ico
diff --git a/win32/win32.mk b/win32/win32.mk
@@ -18,13 +18,14 @@ install-imagine: win32/QOI.plg64
 install-paint.net: win32/QOIPaintDotNet.dll
 	$(SUDO) cp $< "$(PAINT_NET_DIR)/FileTypes/QOIPaintDotNet.dll"
 
-../qoi-ci-$(VERSION)-win64.msi: win32/qoi-ci.wixobj win32/license.rtf file-qoi.exe win32/QOI.plg64 win32/QOIPaintDotNet.dll Xqoi.usr win32/signed
+../qoi-ci-$(VERSION)-win64.msi: win32/setup/qoi-ci.wixobj win32/setup/qoi.ico win32/setup/license.rtf win32/setup/dialog.jpg win32/setup/banner.jpg \
+	file-qoi.exe win32/QOI.plg64 win32/QOIPaintDotNet.dll Xqoi.usr win32/signed
 	light -nologo -o $@ -spdb -ext WixUIExtension -sice:ICE69 -sice:ICE80 $<
 
-win32/qoi-ci.wixobj: win32/qoi-ci.wxs
+win32/setup/qoi-ci.wixobj: win32/setup/qoi-ci.wxs
 	candle -nologo -o $@ -dVERSION=$(VERSION) -arch x64 $<
 
-win32/signed-msi: ../qoi-ci-$(VERSION)-win64.msi
+win32/setup/signed: ../qoi-ci-$(VERSION)-win64.msi
 	$(DO_SIGN)
 
 win32/signed: file-qoi.exe win32/QOI.plg64 win32/QOIPaintDotNet.dll Xqoi.usr
@@ -37,6 +38,6 @@ deb64:
 	scp vm:qoi-ci-gimp_$(VERSION)-1_amd64.deb ..
 	scp vm:qoi-ci-xnview_$(VERSION)-1_amd64.deb ..
 
-CLEAN += win32/QOI.plg64 win32/QOIPaintDotNet.dll win32/signed-msi win32/signed
+CLEAN += win32/QOI.plg64 win32/QOIPaintDotNet.dll win32/setup/qoi-ci.wixobj win32/setup/signed win32/signed
 
 .PHONY: install-imagine install-paint.net deb64