From 7f49b96a8a06e0dd76a5a29e52063a644776dfe8 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Tue, 12 Mar 2019 00:05:27 +0100 Subject: [PATCH] Fix Windows compilation and InnoSetup --- rtgui/myicon.rc | 2 +- tools/win/InnoSetup/WindowsInnoSetup.iss.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rtgui/myicon.rc b/rtgui/myicon.rc index 88f5f79fa..fa8fa8c0b 100644 --- a/rtgui/myicon.rc +++ b/rtgui/myicon.rc @@ -1 +1 @@ -1 ICON "../rtdata/images/non-themed/rawtherapee.ico" +1 ICON "../rtdata/images/rawtherapee.ico" diff --git a/tools/win/InnoSetup/WindowsInnoSetup.iss.in b/tools/win/InnoSetup/WindowsInnoSetup.iss.in index b9b3aa8ec..e4ae43536 100644 --- a/tools/win/InnoSetup/WindowsInnoSetup.iss.in +++ b/tools/win/InnoSetup/WindowsInnoSetup.iss.in @@ -50,7 +50,7 @@ AllowNoIcons=yes LicenseFile={#MyBuildBasePath}\LICENSE.txt OutputDir={#MyBuildBasePath}\..\ OutputBaseFilename={#MyAppName}_{#MyAppVersion}_{#MySystemName}_{#MyBitDepth} -SetupIconFile={#MySourceBasePath}\rtdata\images\non-themed\rawtherapee.ico +SetupIconFile={#MySourceBasePath}\rtdata\images\rawtherapee.ico WizardImageFile={#MySourceBasePath}\tools\win\InnoSetup\installerStrip.bmp WizardImageBackColor=$2A2A2A Compression=lzma