Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert changes to the code generating the manifest name in wx.rc

Browse Source 
This undoes the part of 77d8926126 (Simplify Windows application
manifests, 2021-12-17) which removed special handling of MSVC from
wx.rc, as it's still needed.
This commit is contained in:
PB
2021-12-18 00:25:02 +01:00
committed by Vadim Zeitlin
parent 10d2354125
commit 419f899b3d
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/msw/wx.rc
View File

@@ -115,9 +115,14 @@ wxBITMAP_STD_COLOURS BITMAP "wx/msw/colours.bmp"
#define wxRC_STR(text) wxRC_STR2(text)
#define wxRC_STR2(text) #text
#define wxRC_CONCAT(a, b) wxRC_CONCAT2(a, b)
#define wxRC_CONCAT2(a, b) a ## b
#define wxMANIFEST_FILE "wx/msw/wx" wxRC_STR(wxMANIFEST_DPI)
#ifdef __GNUC__
#define wxMANIFEST_FILE "wx/msw/wx" wxRC_STR(wxMANIFEST_DPI)
#else
#define wxMANIFEST_FILE wxRC_CONCAT(wx/msw/wx, wxMANIFEST_DPI)
#endif
wxMANIFEST_ID RT_MANIFEST wxMANIFEST_FILE
#endif // wxUSE_RC_MANIFEST