X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/06ad6296a6d4b5b4ea045fd5557bc0b2e71b3a77..ca77701441e39245dcbfce903049e76f166979e5:/include/wx/msw/wx.rc?ds=sidebyside diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc index 2e720ea222..d9aff3b171 100644 --- a/include/wx/msw/wx.rc +++ b/include/wx/msw/wx.rc @@ -10,11 +10,7 @@ // Licence: wxWindows Licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__MWERKS__) -#include -#else #include -#endif #if defined(_WIN32_WCE) #include "wx/msw/wince/wince.rc" @@ -98,6 +94,9 @@ wxBITMAP_STD_COLOURS BITMAP "wx/msw/colours.bmp" // #if !defined(wxUSE_NO_MANIFEST) || (wxUSE_NO_MANIFEST == 0) + +// Visual Studio 2005 generates the manifest automatically and so we +// shouldn't include it in the resources manually: #if !defined(WX_MSC_FULL_VER) || WX_MSC_FULL_VER < 140040130 // see "about isolated applications" topic in MSDN @@ -116,4 +115,5 @@ wxMANIFEST_ID 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)