From 854ac6eb29369fe6d459420224f87e134b02b4d7 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 3 Jan 2024 20:50:04 +0000
Subject: [PATCH] Better: generate tktest.res from a separate tktest.rc

---
 win/makefile.vc  |  3 +-
 win/rc/tktest.rc | 86 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 87 insertions(+), 2 deletions(-)
 create mode 100644 win/rc/tktest.rc

diff --git a/win/makefile.vc b/win/makefile.vc
index 3630ac302..660da9626 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -649,8 +649,7 @@ $<
 
 $(TMP_DIR)\tk.res: $(TMP_DIR)\wish.exe.manifest
 $(TMP_DIR)\wish.res: $(TMP_DIR)\wish.exe.manifest
-$(TMP_DIR)\tktest.res: $(TMP_DIR)\tktest.exe.manifest $(RCDIR)\wish.rc
-	$(RESCMD) $(RCDIR)\wish.rc
+$(TMP_DIR)\tktest.res: $(TMP_DIR)\tktest.exe.manifest
 
 .SUFFIXES:
 .SUFFIXES:.c .rc
diff --git a/win/rc/tktest.rc b/win/rc/tktest.rc
new file mode 100644
index 000000000..e97dfbeea
--- /dev/null
+++ b/win/rc/tktest.rc
@@ -0,0 +1,86 @@
+//
+// Version Resource Script
+//
+
+#include <windows.h>
+#include <tk.h>
+
+//
+// build-up the name suffix that defines the type of build this is.
+//
+#if TCL_THREADS
+#define SUFFIX_THREADS	    "t"
+#else
+#define SUFFIX_THREADS	    ""
+#endif
+
+#if STATIC_BUILD
+#define SUFFIX_STATIC	    "s"
+#else
+#define SUFFIX_STATIC	    ""
+#endif
+
+#if DEBUG && !UNCHECKED
+#define SUFFIX_DEBUG	    "g"
+#else
+#define SUFFIX_DEBUG	    ""
+#endif
+
+#define SUFFIX		    SUFFIX_THREADS SUFFIX_STATIC SUFFIX_DEBUG
+
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION    TK_MAJOR_VERSION,TK_MINOR_VERSION,TK_RELEASE_LEVEL,TK_RELEASE_SERIAL
+ PRODUCTVERSION TK_MAJOR_VERSION,TK_MINOR_VERSION,TK_RELEASE_LEVEL,TK_RELEASE_SERIAL
+ FILEFLAGSMASK	0x3fL
+#ifdef DEBUG
+ FILEFLAGS	VS_FF_DEBUG
+#else
+ FILEFLAGS	0x0L
+#endif
+ FILEOS		VOS__WINDOWS32
+ FILETYPE	VFT_APP
+ FILESUBTYPE	0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "FileDescription", "Tktest Application\0"
+            VALUE "OriginalFilename", "tktest.exe\0"
+            VALUE "FileVersion", TK_PATCH_LEVEL
+            VALUE "LegalCopyright", "Copyright \251 1987-2022 Regents of the University of California and other parties\0"
+            VALUE "ProductName", "Tk " TK_VERSION " for Windows\0"
+            VALUE "ProductVersion", TK_PATCH_LEVEL
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+//
+// Icon
+//
+//   The icon whose name or resource ID is lexigraphically first, is used
+//   as the application's icon.
+//
+
+app                      ICON    DISCARDABLE     "wish.ico"
+
+#if STATIC_BUILD
+#include "tk_base.rc"
+#endif
+
+//
+// This enables themed scrollbars in XP by trying to use comctl32 v6.
+//
+
+#ifndef RT_MANIFEST
+#define RT_MANIFEST     24
+#endif
+#ifndef CREATEPROCESS_MANIFEST_RESOURCE_ID
+#define CREATEPROCESS_MANIFEST_RESOURCE_ID 1
+#endif
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "tktest.exe.manifest"