From a3649d3ede80e6af542dda9dd0c46cbab8850a9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=B6bke=20Geenen?=
 <röbke.geenen@prodrive-technologies.com>
Date: Mon, 17 Feb 2020 16:04:48 +0100
Subject: [PATCH] PORT: Windows: Do not include manifest when building with
 MSVC, since it causes a duplicate resource error.  Also uses a textual
 manifest for the MinGW compilation rather than a binary blob.

---
 .gitignore         |  1 +
 src/swipl.manifest | 10 ++++++++++
 src/swipl.rc       | 35 ++++++-----------------------------
 3 files changed, 17 insertions(+), 29 deletions(-)
 create mode 100644 src/swipl.manifest

diff --git a/.gitignore b/.gitignore
index 6819911511..834e58bf1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -146,6 +146,7 @@ doc-version
 .doc-action
 pl-doc-*.tar.gz
 *.manifest
+!src/swipl.manifest
 config.dat
 call_vcvars.cmd
 src/reqs64.cab
diff --git a/src/swipl.manifest b/src/swipl.manifest
new file mode 100644
index 0000000000..ecea6f7f56
--- /dev/null
+++ b/src/swipl.manifest
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level='asInvoker' uiAccess='false' />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+</assembly>
diff --git a/src/swipl.rc b/src/swipl.rc
index 20bec0fd1e..469c6fa609 100644
--- a/src/swipl.rc
+++ b/src/swipl.rc
@@ -2,32 +2,9 @@
 
 SWI_Icon  ICON swipl.ico
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// RT_MANIFEST to prevent Windows Vista from asking to execute
-//
-
-1 RT_MANIFEST
-BEGIN
-    0x613c, 0x7373, 0x6d65, 0x6c62, 0x2079, 0x6d78, 0x6e6c, 0x3d73, 0x7522,
-    0x6e72, 0x733a, 0x6863, 0x6d65, 0x7361, 0x6d2d, 0x6369, 0x6f72, 0x6f73,
-    0x7466, 0x632d, 0x6d6f, 0x613a, 0x6d73, 0x762e, 0x2231, 0x6d20, 0x6e61,
-    0x6669, 0x7365, 0x5674, 0x7265, 0x6973, 0x6e6f, 0x223d, 0x2e31, 0x2230,
-    0x0d3e, 0x200a, 0x3c20, 0x7274, 0x7375, 0x4974, 0x666e, 0x206f, 0x6d78,
-    0x6e6c, 0x3d73, 0x7522, 0x6e72, 0x733a, 0x6863, 0x6d65, 0x7361, 0x6d2d,
-    0x6369, 0x6f72, 0x6f73, 0x7466, 0x632d, 0x6d6f, 0x613a, 0x6d73, 0x762e,
-    0x2233, 0x0d3e, 0x200a, 0x2020, 0x3c20, 0x6573, 0x7563, 0x6972, 0x7974,
-    0x0d3e, 0x200a, 0x2020, 0x2020, 0x3c20, 0x6572, 0x7571, 0x7365, 0x6574,
-    0x5064, 0x6972, 0x6976, 0x656c, 0x6567, 0x3e73, 0x0a0d, 0x2020, 0x2020,
-    0x2020, 0x2020, 0x723c, 0x7165, 0x6575, 0x7473, 0x6465, 0x7845, 0x6365,
-    0x7475, 0x6f69, 0x4c6e, 0x7665, 0x6c65, 0x6c20, 0x7665, 0x6c65, 0x223d,
-    0x7361, 0x6e49, 0x6f76, 0x656b, 0x2272, 0x7520, 0x4169, 0x6363, 0x7365,
-    0x3d73, 0x6622, 0x6c61, 0x6573, 0x3e22, 0x2f3c, 0x6572, 0x7571, 0x7365,
-    0x6574, 0x4564, 0x6578, 0x7563, 0x6974, 0x6e6f, 0x654c, 0x6576, 0x3e6c,
-    0x0a0d, 0x2020, 0x2020, 0x2020, 0x2f3c, 0x6572, 0x7571, 0x7365, 0x6574,
-    0x5064, 0x6972, 0x6976, 0x656c, 0x6567, 0x3e73, 0x0a0d, 0x2020, 0x2020,
-    0x2f3c, 0x6573, 0x7563, 0x6972, 0x7974, 0x0d3e, 0x200a, 0x3c20, 0x742f,
-    0x7572, 0x7473, 0x6e49, 0x6f66, 0x0d3e, 0x3c0a, 0x612f, 0x7373, 0x6d65,
-    0x6c62, 0x3e79
-END
-
+// RT_MANIFEST to prevent Windows Vista and up from asking to execute (UAC).
+// Only include the manifest when building under MinGW, since MSVC generates its
+// own manifest. Including a manifest here leads to a duplicate resource error.
+#ifdef __MINGW32__
+1 RT_MANIFEST "swipl.manifest"
+#endif  // __MINGW32__