refactor: mv res/app.ico src/gui/src/app.ico
This commit is contained in:
parent
031c393e0d
commit
18e66271ae
4 changed files with 4 additions and 3 deletions
1
res/dist/wix/Include.wxi.in
vendored
1
res/dist/wix/Include.wxi.in
vendored
|
|
@ -6,6 +6,7 @@
|
|||
<?define Author="@DESKFLOW_AUTHOR_NAME@"?>
|
||||
<?define BinDir="@CMAKE_RUNTIME_OUTPUT_DIRECTORY@"?>
|
||||
<?define ProjectResDir="@DESKFLOW_PROJECT_RES_DIR@"?>
|
||||
<?define ProjectIcon="@CMAKE_SOURCE_DIR@/src/gui/src/app.ico"?>
|
||||
<?define ResDir="@DESKFLOW_RES_DIR@"?>
|
||||
<?define QtDir="@QT_PATH@"?>
|
||||
<?define QtBinDir="$(var.QtDir)\bin"?>
|
||||
|
|
|
|||
4
res/dist/wix/Product.wxs
vendored
4
res/dist/wix/Product.wxs
vendored
|
|
@ -45,7 +45,7 @@
|
|||
</DirectoryRef>
|
||||
<Property Id="CommonBackground">CommonBackground</Property>
|
||||
<Binary Id="CommonBackground" SourceFile="$(var.ResDir)\dist\wix\images\common_background.png"/>
|
||||
<Icon Id="AppIcon" SourceFile="$(var.ResDir)/app.ico"/>
|
||||
<Icon Id="AppIcon" SourceFile="$(var.ProjectIcon)"/>
|
||||
<WixVariable Id="WixUIBannerBmp" Value="$(var.ResDir)\dist\wix\images\banner.png"/>
|
||||
<WixVariable Id="WixUIDialogBmp" Value="$(var.ResDir)\dist\wix\images\dialog.png"/>
|
||||
<Property Id="ARPPRODUCTICON" Value="AppIcon"/>
|
||||
|
|
@ -99,7 +99,7 @@
|
|||
<Component Guid="BAC8149B-6287-45BF-9C27-43D71ED40214" Id="Gui">
|
||||
<File Id="GuiProgram" KeyPath="yes" Source="$(var.BinDir)/$(var.GuiBin)">
|
||||
<Shortcut Advertise="yes" Directory="ProgramMenuFolder" Icon="$(var.GuiBin)" Id="GuiShortcut" Name="$(var.Name)">
|
||||
<Icon Id="$(var.GuiBin)" SourceFile="$(var.ResDir)/app.ico"/>
|
||||
<Icon Id="$(var.GuiBin)" SourceFile="$(var.ProjectIcon)"/>
|
||||
</Shortcut>
|
||||
<fire:FirewallException Id="GuiFirewallException" IgnoreFailure="yes" Name="$(var.Name)" Scope="any"/>
|
||||
</File>
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 56 KiB After Width: | Height: | Size: 56 KiB |
|
|
@ -1 +1 @@
|
|||
IDI_ICON1 ICON DISCARDABLE "../../app.ico"
|
||||
IDI_ICON1 ICON DISCARDABLE "app.ico"
|
||||
|
|
|
|||
Loading…
Reference in a new issue