From 8b4fe781d4a5267c3c689a43508bac657df34357 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Thu, 31 Oct 2013 02:34:20 +0000
Subject: Fix setup tool Windows resource file to include the application
 manifest correctly. This was previously fixed on trunk but not merged. Also
 update the manifest to add GUIDs for Windows 8.

Subversion-branch: /branches/v2-branch
Subversion-revision: 2734
---
 src/setup-res.rc.in             | 2 +-
 src/setup/setup-manifest.xml.in | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/setup-res.rc.in b/src/setup-res.rc.in
index 6a351354..ce647983 100644
--- a/src/setup-res.rc.in
+++ b/src/setup-res.rc.in
@@ -1,6 +1,6 @@
 1 ICON "../data/setup.ico"
 
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "setup/setup-manifest.xml"
+1 24 MOVEABLE PURE "setup/setup-manifest.xml"
 
 1 VERSIONINFO
 PRODUCTVERSION @WINDOWS_RC_VERSION@
diff --git a/src/setup/setup-manifest.xml.in b/src/setup/setup-manifest.xml.in
index 5a07e485..7db56e8b 100644
--- a/src/setup/setup-manifest.xml.in
+++ b/src/setup/setup-manifest.xml.in
@@ -30,6 +30,8 @@
     <application>
       <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/> <!-- 7 -->
       <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/> <!-- Vista -->
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/> <!-- 8 -->
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/> <!-- 8.1 -->
     </application>
   </compatibility>
 
-- 
cgit v1.2.3