bpo-45220: Ensure RT_MANIFEST is defined when compiling Windows resource files (GH...

diff --git a/PC/pylauncher.rc b/PC/pylauncher.rc
index d21f9b6e9d2aba9902b1496fdeb3ae19fc364daa..ff7e71e0fdb4e1d52e3892dff1dfc802e85eedc0 100644 (file)
--- a/PC/pylauncher.rc
+++ b/PC/pylauncher.rc
@@ -2,6 +2,11 @@
 
 #include "python_ver_rc.h"
 
+#ifndef RT_MANIFEST
+// bpo-45220: Cannot reliably #include RT_MANIFEST from
+// anywhere, so we hardcode it
+#define RT_MANIFEST 24
+#endif
 // Include the manifest file that indicates we support all
 // current versions of Windows.
 1 RT_MANIFEST "python.manifest"

diff --git a/PC/pyshellext.rc b/PC/pyshellext.rc
index fc607e97840fb0d62e8d7964cfe3d39448f82099..af797ce95d5077e36a79f09dc6f1510ebdec6ab7 100644 (file)
--- a/PC/pyshellext.rc
+++ b/PC/pyshellext.rc
@@ -2,6 +2,12 @@
 
 #include "python_ver_rc.h"
 
+#ifndef RT_MANIFEST
+// bpo-45220: Cannot reliably #include RT_MANIFEST from
+// anywhere, so we hardcode it
+#define RT_MANIFEST 24
+#endif
+
 // Include the manifest file that indicates we support all
 // current versions of Windows.
 1 RT_MANIFEST "python.manifest"

diff --git a/PC/python_exe.rc b/PC/python_exe.rc
index 5eba89962b475b04903a29255058e26baccb71cb..c3d3bff019895e90ef64b289342720b63799f2e6 100644 (file)
--- a/PC/python_exe.rc
+++ b/PC/python_exe.rc
@@ -2,6 +2,12 @@
 
 #include "python_ver_rc.h"
 
+#ifndef RT_MANIFEST
+// bpo-45220: Cannot reliably #include RT_MANIFEST from
+// anywhere, so we hardcode it
+#define RT_MANIFEST 24
+#endif
+
 // Include the manifest file that indicates we support all
 // current versions of Windows.
 1 RT_MANIFEST "python.manifest"

diff --git a/PC/python_nt.rc b/PC/python_nt.rc
index 6fd872c1a03cc27d6d4926b9547f62f8144046e2..ae64fbd217af740254c79528f4a55ecab79c9b2e 100644 (file)
--- a/PC/python_nt.rc
+++ b/PC/python_nt.rc
@@ -2,6 +2,12 @@
 
 #include "python_ver_rc.h"
 
+#ifndef RT_MANIFEST
+// bpo-45220: Cannot reliably #include RT_MANIFEST from
+// anywhere, so we hardcode it
+#define RT_MANIFEST 24
+#endif
+
 // Include the manifest file that indicates we support all
 // current versions of Windows.
 2 RT_MANIFEST "python.manifest"

diff --git a/PC/pythonw_exe.rc b/PC/pythonw_exe.rc
index 562652be184719a4b0a6a9629066ef12154253d5..38570b74fa3e0204cbee99df4e702556d4f5dde0 100644 (file)
--- a/PC/pythonw_exe.rc
+++ b/PC/pythonw_exe.rc
@@ -2,6 +2,12 @@
 
 #include "python_ver_rc.h"
 
+#ifndef RT_MANIFEST
+// bpo-45220: Cannot reliably #include RT_MANIFEST from
+// anywhere, so we hardcode it
+#define RT_MANIFEST 24
+#endif
+
 // Include the manifest file that indicates we support all
 // current versions of Windows.
 1 RT_MANIFEST "python.manifest"

diff --git a/PC/sqlite3.rc b/PC/sqlite3.rc
index d2c18f8add8b26e239580c6c38f4597bc763b7e6..9ae2aa0f6f2f2cc1a0d3331d979fd8feb6c51d52 100644 (file)
--- a/PC/sqlite3.rc
+++ b/PC/sqlite3.rc
@@ -2,6 +2,12 @@
 
 #include <winver.h>
 
+#ifndef RT_MANIFEST
+// bpo-45220: Cannot reliably #include RT_MANIFEST from
+// anywhere, so we hardcode it
+#define RT_MANIFEST 24
+#endif
+
 // Include the manifest file that indicates we support all
 // current versions of Windows.
 2 RT_MANIFEST "python.manifest"