diff -bur kicad-8.0.0-orig/resources/msw/kiwin32.rc kicad-8.0.0/resources/msw/kiwin32.rc
--- kicad-8.0.0-orig/resources/msw/kiwin32.rc	2024-03-03 10:48:49.488479500 -0700
+++ kicad-8.0.0/resources/msw/kiwin32.rc	2024-03-03 11:04:32.244300400 -0700
@@ -36,24 +36,10 @@
 #endif
 
 #if !defined( KICAD_WIN32_DPI_AWARE ) || KICAD_WIN32_DPI_AWARE == 0
-#define MANIFEST_NAME basic.manifest
-#else
-#define MANIFEST_NAME dpi_aware_pmv2.manifest
-#endif
-
-//MSYS2
-#define RC_STR( text ) RC_STR2( text )
-#define RC_STR2( text ) #text
-//MSVC
-#define RC_CONCAT( a, b, c ) RC_CONCAT2( a, b, c )
-#define RC_CONCAT2( a, b, c ) a##b##c
-
-#ifdef __GNUC__
-#define MANIFEST_FILE "manifests/" RC_STR( MANIFEST_NAME )
-#else
-//Do not try and quote the first part, it won't work, also make sure the IDE doesn't reformat it with spaces between slashes
-#define MANIFEST_FILE RC_CONCAT( manifests/, MANIFEST_NAME )
-#endif
+#   define MANIFEST_FILE "manifests/basic.manifest"
+#else // !defined( KICAD_WIN32_DPI_AWARE ) || KICAD_WIN32_DPI_AWARE == 0
+#   define MANIFEST_FILE "manifests/dpi_aware_pmv2.manifest"
+#endif // !defined( KICAD_WIN32_DPI_AWARE ) || KICAD_WIN32_DPI_AWARE == 0
 
 MANIFEST_ID RT_MANIFEST MANIFEST_FILE
 
