From: Michael Wetherell <mike.wetherell@ntlworld.com>
Date: Sun, 16 Oct 2005 20:28:24 +0000 (+0000)
Subject: Use a different manifest for each of x86, amd64 and ia64
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/e396018defb4bb0c5726c5cd533c22f15755845b

Use a different manifest for each of x86, amd64 and ia64


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35909 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc
index e0549a4be1..c66cda217a 100644
--- a/include/wx/msw/wx.rc
+++ b/include/wx/msw/wx.rc
@@ -91,9 +91,14 @@ wxBITMAP_STD_COLOURS    BITMAP "wx/msw/colours.bmp"
 // Manifest file for Windows XP
 //
 
-#if !defined(__WIN64__)
 #if !defined(wxUSE_NO_MANIFEST) || (wxUSE_NO_MANIFEST == 0)
+
+#if WX_CPU_AMD64
+1 24 "wx/msw/amd64.manifest"
+#elif WX_CPU_IA64
+1 24 "wx/msw/ia64.manifest"
+#elif !defined(__WIN64__)
 1 24 "wx/msw/wx.manifest"
 #endif
-#endif
 
+#endif // !defined(wxUSE_NO_MANIFEST) || (wxUSE_NO_MANIFEST == 0)