Applied patch [ 1447732 ] Fix CVS HEAD for VC6

[wxWidgets.git] / include / wx / msw / wx.rc

diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc
index 3931d5cf069e4b3f5a0e57d167535bbbb6580b6f..51d5c5de3f44ba4bc38135586ec5d2b3e8043588 100644 (file)
--- a/include/wx/msw/wx.rc
+++ b/include/wx/msw/wx.rc
@@ -20,6 +20,8 @@
     #include "wx/msw/wince/wince.rc"
 #endif
 
     #include "wx/msw/wince/wince.rc"
 #endif
 

+#include "wx/msw/rcdefs.h"
+

 //////////////////////////////////////////////////////////////////////////////
 //
 // This is the MDI Window menu
 //////////////////////////////////////////////////////////////////////////////
 //
 // This is the MDI Window menu


@@ -92,13 +94,15 @@ wxBITMAP_STD_COLOURS    BITMAP "wx/msw/colours.bmp"
 //
 
 #if !defined(wxUSE_NO_MANIFEST) || (wxUSE_NO_MANIFEST == 0)
 //
 
 #if !defined(wxUSE_NO_MANIFEST) || (wxUSE_NO_MANIFEST == 0)

+#if !defined(WX_MSC_FULL_VER) || WX_MSC_FULL_VER < 140040130

 
 

-#ifdef WX_CPU_AMD64
+#if defined(WX_CPU_AMD64)

 1 24 "wx/msw/amd64.manifest"
 #elif defined(WX_CPU_IA64)
 1 24 "wx/msw/ia64.manifest"
 1 24 "wx/msw/amd64.manifest"
 #elif defined(WX_CPU_IA64)
 1 24 "wx/msw/ia64.manifest"

-#elif !defined(__WIN64__)
+#elif defined(WX_CPU_X86)

 1 24 "wx/msw/wx.manifest"
 #endif
 
 1 24 "wx/msw/wx.manifest"
 #endif
 

+#endif // !defined(WX_MSC_FULL_VER) || WX_MSC_FULL_VER < 140040130

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