From 27a09093e4140872bac55ff6912978ac1d5dd334 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sat, 8 May 2021 17:23:11 +0100
Subject: [PATCH] Move icon declarations out of putty-common.rc2.

Now they're done by putty.rc and puttytel.rc, before including
putty-common.rc2. So another user of putty-common.rc2 can disagree on
what icons to use.
---
 windows/putty-common.rc2 | 6 ------
 windows/putty.rc         | 4 ++++
 windows/puttytel.rc      | 4 ++++
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/windows/putty-common.rc2 b/windows/putty-common.rc2
index 79b79ea1..056a2837 100644
--- a/windows/putty-common.rc2
+++ b/windows/putty-common.rc2
@@ -13,12 +13,6 @@
  * from it (which happens if the extension is '.h').
  */
 
-#include "putty-rc.h"
-
-IDI_MAINICON ICON "putty.ico"
-
-IDI_CFGICON ICON "puttycfg.ico"
-
 /* Accelerators used: clw */
 IDD_ABOUTBOX DIALOG DISCARDABLE 140, 40, 270, 136
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
diff --git a/windows/putty.rc b/windows/putty.rc
index 887342c3..a7d07711 100644
--- a/windows/putty.rc
+++ b/windows/putty.rc
@@ -1,8 +1,12 @@
 #include "rcstuff.h"
+#include "putty-rc.h"
 
 #define APPNAME "PuTTY"
 #define APPDESC "SSH, Telnet, Rlogin, and SUPDUP client"
 
+IDI_MAINICON ICON "putty.ico"
+IDI_CFGICON ICON "puttycfg.ico"
+
 #include "help.rc2"
 #include "putty-common.rc2"
 
diff --git a/windows/puttytel.rc b/windows/puttytel.rc
index 6f2bfaab..41767a10 100644
--- a/windows/puttytel.rc
+++ b/windows/puttytel.rc
@@ -1,8 +1,12 @@
 #include "rcstuff.h"
+#include "putty-rc.h"
 
 #define APPNAME "PuTTYtel"
 #define APPDESC "Telnet and Rlogin client"
 
+IDI_MAINICON ICON "putty.ico"
+IDI_CFGICON ICON "puttycfg.ico"
+
 #include "help.rc2"
 #include "putty-common.rc2"