Skip to content

Commit 3b89bd8

Browse files
committedMay 18, 2021
Fix InsertIcons invocation (addresses #407)
1 parent e9258f4 commit 3b89bd8

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed
 

‎.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
[submodule "src/3rdparty/inserticons"]
3636
path = src/3rdparty/inserticons
37-
url = ../../einaregilsson/InsertIcons
37+
url = ../../samhocevar-forks/inserticons.git
3838

3939
[submodule "src/3rdparty/innosetup"]
4040
path = src/3rdparty/innosetup

‎src/wincompose.sln

+2-2
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ Global
9696
{BBA0B950-2B67-4660-BAD0-C359E99A733F}.Release|Win32.Build.0 = Release|Any CPU
9797
{C037D608-57FD-4ACD-AAC1-BFAD1767B11B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
9898
{C037D608-57FD-4ACD-AAC1-BFAD1767B11B}.Debug|Any CPU.Build.0 = Debug|Any CPU
99-
{C037D608-57FD-4ACD-AAC1-BFAD1767B11B}.Debug|Mixed Platforms.ActiveCfg = Release|Any CPU
100-
{C037D608-57FD-4ACD-AAC1-BFAD1767B11B}.Debug|Mixed Platforms.Build.0 = Release|Any CPU
99+
{C037D608-57FD-4ACD-AAC1-BFAD1767B11B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
100+
{C037D608-57FD-4ACD-AAC1-BFAD1767B11B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
101101
{C037D608-57FD-4ACD-AAC1-BFAD1767B11B}.Debug|Win32.ActiveCfg = Debug|Any CPU
102102
{C037D608-57FD-4ACD-AAC1-BFAD1767B11B}.Debug|Win32.Build.0 = Debug|Any CPU
103103
{C037D608-57FD-4ACD-AAC1-BFAD1767B11B}.Release|Any CPU.ActiveCfg = Release|Any CPU

‎src/wincompose/wincompose.csproj

+3-2
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,8 @@
124124
<PackageReference Include="NLog" Version="4.7.9" />
125125
</ItemGroup>
126126

127-
<Target Name="AfterBuild">
128-
<Exec Command="..\3rdparty\inserticons\bin\Release\InsertIcons.exe $(OutputPath)\$(TargetName).exe &quot;res\icon_normal.ico;res\icon_sequences.ico;res\icon_settings.ico&quot;" />
127+
<Target Name="InsertIcons" AfterTargets="AfterBuild">
128+
<!-- Icons are loaded alphabetically: icon_normal.ico icon_sequences.ico icon_settings.ico -->
129+
<Exec Command="..\3rdparty\inserticons\bin\$(Configuration)\InsertIcons.exe $(OutputPath)$(TargetName).exe res" />
129130
</Target>
130131
</Project>

0 commit comments

Comments
 (0)
Please sign in to comment.