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 e0549a4be1b47f8a136c29c425dd35b12c592560..c66cda217a25c8bee9c0bbf1b5357238021b2a08 100644 (file)
--- 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
 //
 
 // Manifest file for Windows XP
 //
 

-#if !defined(__WIN64__)

 #if !defined(wxUSE_NO_MANIFEST) || (wxUSE_NO_MANIFEST == 0)
 #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
 1 24 "wx/msw/wx.manifest"
 #endif

-#endif

 
 

+#endif // !defined(wxUSE_NO_MANIFEST) || (wxUSE_NO_MANIFEST == 0)