commit cebd43fbfd25a80404728f73edc301f9558d9410
author Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Tue Jun 23 12:27:30 2020 -0700
committer GitHub <noreply@github.com> Tue Jun 23 12:27:30 2020 -0700
tree de4b8d7f977bfcd30ef97682d7a60c0f1c204ffc
parent 92f8b480bab408be09bc1631cf2e0e5a4641b731

bpo-41054: Simplify resource compilation on Windows (GH-21004)


Remove auto-generated resource header. Pass definitions required
by resource files (ORIGINAL_FILENAME and FIELD3) directly to resource
compiler.

Remove unused MS_DLL_ID resource string and related dead code.
(cherry picked from commit 4efc3360c9a83d5891f27ed67b4f0ab7275d2ab4)

Co-authored-by: Nikita Nemkin <nikita@nemkin.ru>

PC/python_nt.rc

diff --git a/PC/python_nt.rc b/PC/python_nt.rc
index fac6105..b5fb58f 100644
--- a/PC/python_nt.rc
+++ b/PC/python_nt.rc
@@ -7,12 +7,6 @@
 #include <winuser.h>
 2 RT_MANIFEST "python.manifest"
 
-// String Tables
-STRINGTABLE DISCARDABLE
-BEGIN
-    1000,   MS_DLL_ID
-END
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // Version
@@ -40,7 +34,7 @@
             VALUE "FileVersion", PYTHON_VERSION
             VALUE "InternalName", "Python DLL\0"
             VALUE "LegalCopyright", PYTHON_COPYRIGHT "\0"
-            VALUE "OriginalFilename", PYTHON_DLL_NAME "\0"
+            VALUE "OriginalFilename", ORIGINAL_FILENAME "\0"
             VALUE "ProductName", "Python\0"
             VALUE "ProductVersion", PYTHON_VERSION
         END