From 083f4b3c32a0c0bacc713e7837a99a6b479cba75 Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Fri, 13 Dec 2019 21:44:26 +0100 Subject: [PATCH 1/2] Rename manifests to use underscores --- build/bakefiles/common.bkl | 28 +++++++++---------- build/cmake/functions.cmake | 4 +-- build/msw/makefile.vc | 20 ++++++------- build/msw/wx_vc7_adv.vcproj | 4 +-- build/msw/wx_vc7_aui.vcproj | 4 +-- build/msw/wx_vc7_base.vcproj | 4 +-- build/msw/wx_vc7_core.vcproj | 4 +-- build/msw/wx_vc7_gl.vcproj | 4 +-- build/msw/wx_vc7_html.vcproj | 4 +-- build/msw/wx_vc7_media.vcproj | 4 +-- build/msw/wx_vc7_net.vcproj | 4 +-- build/msw/wx_vc7_propgrid.vcproj | 4 +-- build/msw/wx_vc7_qa.vcproj | 4 +-- build/msw/wx_vc7_ribbon.vcproj | 4 +-- build/msw/wx_vc7_richtext.vcproj | 4 +-- build/msw/wx_vc7_stc.vcproj | 4 +-- build/msw/wx_vc7_webview.vcproj | 4 +-- build/msw/wx_vc7_xml.vcproj | 4 +-- build/msw/wx_vc7_xrc.vcproj | 4 +-- build/msw/wx_vc8_adv.vcproj | 8 +++--- build/msw/wx_vc8_aui.vcproj | 8 +++--- build/msw/wx_vc8_base.vcproj | 8 +++--- build/msw/wx_vc8_core.vcproj | 8 +++--- build/msw/wx_vc8_gl.vcproj | 8 +++--- build/msw/wx_vc8_html.vcproj | 8 +++--- build/msw/wx_vc8_media.vcproj | 8 +++--- build/msw/wx_vc8_net.vcproj | 8 +++--- build/msw/wx_vc8_propgrid.vcproj | 8 +++--- build/msw/wx_vc8_qa.vcproj | 8 +++--- build/msw/wx_vc8_ribbon.vcproj | 8 +++--- build/msw/wx_vc8_richtext.vcproj | 8 +++--- build/msw/wx_vc8_stc.vcproj | 8 +++--- build/msw/wx_vc8_webview.vcproj | 8 +++--- build/msw/wx_vc8_xml.vcproj | 8 +++--- build/msw/wx_vc8_xrc.vcproj | 8 +++--- build/msw/wx_vc9_adv.vcproj | 8 +++--- build/msw/wx_vc9_aui.vcproj | 8 +++--- build/msw/wx_vc9_base.vcproj | 8 +++--- build/msw/wx_vc9_core.vcproj | 8 +++--- build/msw/wx_vc9_gl.vcproj | 8 +++--- build/msw/wx_vc9_html.vcproj | 8 +++--- build/msw/wx_vc9_media.vcproj | 8 +++--- build/msw/wx_vc9_net.vcproj | 8 +++--- build/msw/wx_vc9_propgrid.vcproj | 8 +++--- build/msw/wx_vc9_qa.vcproj | 8 +++--- build/msw/wx_vc9_ribbon.vcproj | 8 +++--- build/msw/wx_vc9_richtext.vcproj | 8 +++--- build/msw/wx_vc9_stc.vcproj | 8 +++--- build/msw/wx_vc9_webview.vcproj | 8 +++--- build/msw/wx_vc9_xml.vcproj | 8 +++--- build/msw/wx_vc9_xrc.vcproj | 8 +++--- demos/bombs/bombs_vc7.vcproj | 8 +++--- demos/bombs/bombs_vc8.vcproj | 16 +++++------ demos/bombs/bombs_vc9.vcproj | 16 +++++------ demos/bombs/makefile.vc | 20 ++++++------- demos/forty/forty_vc7.vcproj | 8 +++--- demos/forty/forty_vc8.vcproj | 16 +++++------ demos/forty/forty_vc9.vcproj | 16 +++++------ demos/forty/makefile.vc | 20 ++++++------- demos/fractal/fractal_vc7.vcproj | 8 +++--- demos/fractal/fractal_vc8.vcproj | 16 +++++------ demos/fractal/fractal_vc9.vcproj | 16 +++++------ demos/fractal/makefile.vc | 20 ++++++------- demos/life/life_vc7.vcproj | 8 +++--- demos/life/life_vc8.vcproj | 16 +++++------ demos/life/life_vc9.vcproj | 16 +++++------ demos/life/makefile.vc | 20 ++++++------- demos/poem/makefile.vc | 20 ++++++------- demos/poem/poem_vc7.vcproj | 8 +++--- demos/poem/poem_vc8.vcproj | 16 +++++------ demos/poem/poem_vc9.vcproj | 16 +++++------ ...ware.manifest => amd64_dpi_aware.manifest} | 0 ...manifest => amd64_dpi_aware_pmv2.manifest} | 0 include/wx/msw/wx.rc | 4 +-- ...i-aware.manifest => wx_dpi_aware.manifest} | 0 ...v2.manifest => wx_dpi_aware_pmv2.manifest} | 0 samples/access/access_vc7.vcproj | 8 +++--- samples/access/access_vc8.vcproj | 16 +++++------ samples/access/access_vc9.vcproj | 16 +++++------ samples/access/makefile.vc | 20 ++++++------- samples/animate/anitest_vc7.vcproj | 8 +++--- samples/animate/anitest_vc8.vcproj | 16 +++++------ samples/animate/anitest_vc9.vcproj | 16 +++++------ samples/animate/makefile.vc | 20 ++++++------- samples/archive/archive_vc7.vcproj | 8 +++--- samples/archive/archive_vc8.vcproj | 16 +++++------ samples/archive/archive_vc9.vcproj | 16 +++++------ samples/archive/makefile.vc | 20 ++++++------- samples/artprov/artprov_vc7.vcproj | 8 +++--- samples/artprov/artprov_vc8.vcproj | 16 +++++------ samples/artprov/artprov_vc9.vcproj | 16 +++++------ samples/artprov/makefile.vc | 20 ++++++------- samples/aui/auidemo_vc7.vcproj | 8 +++--- samples/aui/auidemo_vc8.vcproj | 16 +++++------ samples/aui/auidemo_vc9.vcproj | 16 +++++------ samples/aui/makefile.vc | 20 ++++++------- samples/calendar/calendar_vc7.vcproj | 8 +++--- samples/calendar/calendar_vc8.vcproj | 16 +++++------ samples/calendar/calendar_vc9.vcproj | 16 +++++------ samples/calendar/makefile.vc | 20 ++++++------- samples/caret/caret_vc7.vcproj | 8 +++--- samples/caret/caret_vc8.vcproj | 16 +++++------ samples/caret/caret_vc9.vcproj | 16 +++++------ samples/caret/makefile.vc | 20 ++++++------- samples/clipboard/clipboard_vc7.vcproj | 8 +++--- samples/clipboard/clipboard_vc8.vcproj | 16 +++++------ samples/clipboard/clipboard_vc9.vcproj | 16 +++++------ samples/clipboard/makefile.vc | 20 ++++++------- samples/collpane/collpane_vc7.vcproj | 8 +++--- samples/collpane/collpane_vc8.vcproj | 16 +++++------ samples/collpane/collpane_vc9.vcproj | 16 +++++------ samples/collpane/makefile.vc | 20 ++++++------- samples/combo/combo_vc7.vcproj | 8 +++--- samples/combo/combo_vc8.vcproj | 16 +++++------ samples/combo/combo_vc9.vcproj | 16 +++++------ samples/combo/makefile.vc | 20 ++++++------- samples/config/config_vc7.vcproj | 8 +++--- samples/config/config_vc8.vcproj | 16 +++++------ samples/config/config_vc9.vcproj | 16 +++++------ samples/config/makefile.vc | 20 ++++++------- samples/console/console_vc7.vcproj | 8 +++--- samples/console/console_vc8.vcproj | 16 +++++------ samples/console/console_vc9.vcproj | 16 +++++------ samples/console/makefile.vc | 20 ++++++------- samples/dataview/dataview_vc7.vcproj | 8 +++--- samples/dataview/dataview_vc8.vcproj | 16 +++++------ samples/dataview/dataview_vc9.vcproj | 16 +++++------ samples/dataview/makefile.vc | 20 ++++++------- samples/debugrpt/debugrpt_vc7.vcproj | 8 +++--- samples/debugrpt/debugrpt_vc8.vcproj | 16 +++++------ samples/debugrpt/debugrpt_vc9.vcproj | 16 +++++------ samples/debugrpt/makefile.vc | 20 ++++++------- samples/dialogs/dialogs_vc7.vcproj | 8 +++--- samples/dialogs/dialogs_vc8.vcproj | 16 +++++------ samples/dialogs/dialogs_vc9.vcproj | 16 +++++------ samples/dialogs/makefile.vc | 20 ++++++------- samples/dialup/dialup_vc7.vcproj | 8 +++--- samples/dialup/dialup_vc8.vcproj | 16 +++++------ samples/dialup/dialup_vc9.vcproj | 16 +++++------ samples/dialup/makefile.vc | 20 ++++++------- samples/display/display_vc7.vcproj | 8 +++--- samples/display/display_vc8.vcproj | 16 +++++------ samples/display/display_vc9.vcproj | 16 +++++------ samples/display/makefile.vc | 20 ++++++------- samples/dll/dll_vc7_my_dll.vcproj | 8 +++--- samples/dll/dll_vc7_sdk_exe.vcproj | 8 +++--- samples/dll/dll_vc7_wx_exe.vcproj | 4 +-- samples/dll/dll_vc8_my_dll.vcproj | 16 +++++------ samples/dll/dll_vc8_sdk_exe.vcproj | 16 +++++------ samples/dll/dll_vc8_wx_exe.vcproj | 8 +++--- samples/dll/dll_vc9_my_dll.vcproj | 16 +++++------ samples/dll/dll_vc9_sdk_exe.vcproj | 16 +++++------ samples/dll/dll_vc9_wx_exe.vcproj | 8 +++--- samples/dll/makefile.vc | 20 ++++++------- samples/dnd/dnd_vc7.vcproj | 8 +++--- samples/dnd/dnd_vc8.vcproj | 16 +++++------ samples/dnd/dnd_vc9.vcproj | 16 +++++------ samples/dnd/makefile.vc | 20 ++++++------- samples/docview/docview_vc7.vcproj | 8 +++--- samples/docview/docview_vc8.vcproj | 16 +++++------ samples/docview/docview_vc9.vcproj | 16 +++++------ samples/docview/makefile.vc | 20 ++++++------- samples/dragimag/dragimag_vc7.vcproj | 8 +++--- samples/dragimag/dragimag_vc8.vcproj | 16 +++++------ samples/dragimag/dragimag_vc9.vcproj | 16 +++++------ samples/dragimag/makefile.vc | 20 ++++++------- samples/drawing/drawing_vc7.vcproj | 8 +++--- samples/drawing/drawing_vc8.vcproj | 16 +++++------ samples/drawing/drawing_vc9.vcproj | 16 +++++------ samples/drawing/makefile.vc | 20 ++++++------- samples/erase/erase_vc7.vcproj | 8 +++--- samples/erase/erase_vc8.vcproj | 16 +++++------ samples/erase/erase_vc9.vcproj | 16 +++++------ samples/erase/makefile.vc | 20 ++++++------- samples/event/event_vc7.vcproj | 8 +++--- samples/event/event_vc8.vcproj | 16 +++++------ samples/event/event_vc9.vcproj | 16 +++++------ samples/event/makefile.vc | 20 ++++++------- samples/except/except_vc7.vcproj | 8 +++--- samples/except/except_vc8.vcproj | 16 +++++------ samples/except/except_vc9.vcproj | 16 +++++------ samples/except/makefile.vc | 20 ++++++------- samples/exec/exec_vc7.vcproj | 8 +++--- samples/exec/exec_vc8.vcproj | 16 +++++------ samples/exec/exec_vc9.vcproj | 16 +++++------ samples/exec/makefile.vc | 20 ++++++------- samples/font/font_vc7.vcproj | 8 +++--- samples/font/font_vc8.vcproj | 16 +++++------ samples/font/font_vc9.vcproj | 16 +++++------ samples/font/makefile.vc | 20 ++++++------- samples/fswatcher/fswatcher_vc7.vcproj | 8 +++--- samples/fswatcher/fswatcher_vc8.vcproj | 16 +++++------ samples/fswatcher/fswatcher_vc9.vcproj | 16 +++++------ samples/fswatcher/makefile.vc | 20 ++++++------- samples/grid/grid_vc7.vcproj | 8 +++--- samples/grid/grid_vc8.vcproj | 16 +++++------ samples/grid/grid_vc9.vcproj | 16 +++++------ samples/grid/makefile.vc | 20 ++++++------- samples/help/help_vc7.vcproj | 8 +++--- samples/help/help_vc8.vcproj | 16 +++++------ samples/help/help_vc9.vcproj | 16 +++++------ samples/help/makefile.vc | 20 ++++++------- samples/htlbox/htlbox_vc7.vcproj | 8 +++--- samples/htlbox/htlbox_vc8.vcproj | 16 +++++------ samples/htlbox/htlbox_vc9.vcproj | 16 +++++------ samples/htlbox/makefile.vc | 20 ++++++------- samples/html/about/about_vc7.vcproj | 8 +++--- samples/html/about/about_vc8.vcproj | 16 +++++------ samples/html/about/about_vc9.vcproj | 16 +++++------ samples/html/about/makefile.vc | 20 ++++++------- samples/html/help/help_vc7.vcproj | 8 +++--- samples/html/help/help_vc8.vcproj | 16 +++++------ samples/html/help/help_vc9.vcproj | 16 +++++------ samples/html/help/makefile.vc | 20 ++++++------- samples/html/helpview/helpview_vc7.vcproj | 8 +++--- samples/html/helpview/helpview_vc8.vcproj | 16 +++++------ samples/html/helpview/helpview_vc9.vcproj | 16 +++++------ samples/html/helpview/makefile.vc | 20 ++++++------- samples/html/printing/makefile.vc | 20 ++++++------- samples/html/printing/printing_vc7.vcproj | 8 +++--- samples/html/printing/printing_vc8.vcproj | 16 +++++------ samples/html/printing/printing_vc9.vcproj | 16 +++++------ samples/html/test/makefile.vc | 20 ++++++------- samples/html/test/test_vc7.vcproj | 8 +++--- samples/html/test/test_vc8.vcproj | 16 +++++------ samples/html/test/test_vc9.vcproj | 16 +++++------ samples/html/virtual/makefile.vc | 20 ++++++------- samples/html/virtual/virtual_vc7.vcproj | 8 +++--- samples/html/virtual/virtual_vc8.vcproj | 16 +++++------ samples/html/virtual/virtual_vc9.vcproj | 16 +++++------ samples/html/widget/makefile.vc | 20 ++++++------- samples/html/widget/widget_vc7.vcproj | 8 +++--- samples/html/widget/widget_vc8.vcproj | 16 +++++------ samples/html/widget/widget_vc9.vcproj | 16 +++++------ samples/html/zip/makefile.vc | 20 ++++++------- samples/html/zip/zip_vc7.vcproj | 8 +++--- samples/html/zip/zip_vc8.vcproj | 16 +++++------ samples/html/zip/zip_vc9.vcproj | 16 +++++------ samples/image/image_vc7.vcproj | 8 +++--- samples/image/image_vc8.vcproj | 16 +++++------ samples/image/image_vc9.vcproj | 16 +++++------ samples/image/makefile.vc | 20 ++++++------- samples/internat/internat_vc7.vcproj | 8 +++--- samples/internat/internat_vc8.vcproj | 16 +++++------ samples/internat/internat_vc9.vcproj | 16 +++++------ samples/internat/makefile.vc | 20 ++++++------- samples/ipc/ipc_vc7_baseipcclient.vcproj | 8 +++--- samples/ipc/ipc_vc7_baseipcserver.vcproj | 8 +++--- samples/ipc/ipc_vc7_ipcclient.vcproj | 8 +++--- samples/ipc/ipc_vc7_ipcserver.vcproj | 8 +++--- samples/ipc/ipc_vc8_baseipcclient.vcproj | 16 +++++------ samples/ipc/ipc_vc8_baseipcserver.vcproj | 16 +++++------ samples/ipc/ipc_vc8_ipcclient.vcproj | 16 +++++------ samples/ipc/ipc_vc8_ipcserver.vcproj | 16 +++++------ samples/ipc/ipc_vc9_baseipcclient.vcproj | 16 +++++------ samples/ipc/ipc_vc9_baseipcserver.vcproj | 16 +++++------ samples/ipc/ipc_vc9_ipcclient.vcproj | 16 +++++------ samples/ipc/ipc_vc9_ipcserver.vcproj | 16 +++++------ samples/ipc/makefile.vc | 20 ++++++------- samples/joytest/joytest_vc7.vcproj | 8 +++--- samples/joytest/joytest_vc8.vcproj | 16 +++++------ samples/joytest/joytest_vc9.vcproj | 16 +++++------ samples/joytest/makefile.vc | 20 ++++++------- samples/keyboard/keyboard_vc7.vcproj | 8 +++--- samples/keyboard/keyboard_vc8.vcproj | 16 +++++------ samples/keyboard/keyboard_vc9.vcproj | 16 +++++------ samples/keyboard/makefile.vc | 20 ++++++------- samples/layout/layout_vc7.vcproj | 8 +++--- samples/layout/layout_vc8.vcproj | 16 +++++------ samples/layout/layout_vc9.vcproj | 16 +++++------ samples/layout/makefile.vc | 20 ++++++------- samples/listctrl/listctrl_vc7.vcproj | 8 +++--- samples/listctrl/listctrl_vc8.vcproj | 16 +++++------ samples/listctrl/listctrl_vc9.vcproj | 16 +++++------ samples/listctrl/makefile.vc | 20 ++++++------- samples/mdi/makefile.vc | 20 ++++++------- samples/mdi/mdi_vc7.vcproj | 8 +++--- samples/mdi/mdi_vc8.vcproj | 16 +++++------ samples/mdi/mdi_vc9.vcproj | 16 +++++------ samples/mediaplayer/makefile.vc | 20 ++++++------- samples/mediaplayer/mediaplayer_vc7.vcproj | 8 +++--- samples/mediaplayer/mediaplayer_vc8.vcproj | 16 +++++------ samples/mediaplayer/mediaplayer_vc9.vcproj | 16 +++++------ samples/memcheck/makefile.vc | 20 ++++++------- samples/memcheck/memcheck_vc7.vcproj | 8 +++--- samples/memcheck/memcheck_vc8.vcproj | 16 +++++------ samples/memcheck/memcheck_vc9.vcproj | 16 +++++------ samples/menu/makefile.vc | 20 ++++++------- samples/menu/menu_vc7.vcproj | 8 +++--- samples/menu/menu_vc8.vcproj | 16 +++++------ samples/menu/menu_vc9.vcproj | 16 +++++------ samples/mfc/makefile.vc | 20 ++++++------- samples/mfc/mfc_vc7.vcproj | 8 +++--- samples/mfc/mfc_vc8.vcproj | 16 +++++------ samples/mfc/mfc_vc9.vcproj | 16 +++++------ samples/minimal/makefile.vc | 20 ++++++------- samples/minimal/minimal.vcxproj | 18 ++++++------ samples/minimal/minimal_vc7.vcproj | 8 +++--- samples/minimal/minimal_vc8.vcproj | 16 +++++------ samples/minimal/minimal_vc9.vcproj | 16 +++++------ samples/nativdlg/makefile.vc | 20 ++++++------- samples/nativdlg/nativdlg_vc7.vcproj | 8 +++--- samples/nativdlg/nativdlg_vc8.vcproj | 16 +++++------ samples/nativdlg/nativdlg_vc9.vcproj | 16 +++++------ samples/notebook/makefile.vc | 20 ++++++------- samples/notebook/notebook_vc7.vcproj | 8 +++--- samples/notebook/notebook_vc8.vcproj | 16 +++++------ samples/notebook/notebook_vc9.vcproj | 16 +++++------ samples/oleauto/makefile.vc | 20 ++++++------- samples/oleauto/oleauto_vc7.vcproj | 8 +++--- samples/oleauto/oleauto_vc8.vcproj | 16 +++++------ samples/oleauto/oleauto_vc9.vcproj | 16 +++++------ samples/opengl/cube/cube_vc7.vcproj | 8 +++--- samples/opengl/cube/cube_vc8.vcproj | 16 +++++------ samples/opengl/cube/cube_vc9.vcproj | 16 +++++------ samples/opengl/cube/makefile.vc | 20 ++++++------- samples/opengl/isosurf/isosurf_vc7.vcproj | 8 +++--- samples/opengl/isosurf/isosurf_vc8.vcproj | 16 +++++------ samples/opengl/isosurf/isosurf_vc9.vcproj | 16 +++++------ samples/opengl/isosurf/makefile.vc | 20 ++++++------- samples/opengl/penguin/makefile.vc | 20 ++++++------- samples/opengl/penguin/penguin_vc7.vcproj | 8 +++--- samples/opengl/penguin/penguin_vc8.vcproj | 16 +++++------ samples/opengl/penguin/penguin_vc9.vcproj | 16 +++++------ samples/opengl/pyramid/makefile.vc | 20 ++++++------- samples/opengl/pyramid/pyramid_vc7.vcproj | 8 +++--- samples/opengl/pyramid/pyramid_vc8.vcproj | 16 +++++------ samples/opengl/pyramid/pyramid_vc9.vcproj | 16 +++++------ samples/ownerdrw/makefile.vc | 20 ++++++------- samples/ownerdrw/ownerdrw_vc7.vcproj | 8 +++--- samples/ownerdrw/ownerdrw_vc8.vcproj | 16 +++++------ samples/ownerdrw/ownerdrw_vc9.vcproj | 16 +++++------ samples/popup/makefile.vc | 20 ++++++------- samples/popup/popup_vc7.vcproj | 8 +++--- samples/popup/popup_vc8.vcproj | 16 +++++------ samples/popup/popup_vc9.vcproj | 16 +++++------ samples/power/makefile.vc | 20 ++++++------- samples/power/power_vc7.vcproj | 8 +++--- samples/power/power_vc8.vcproj | 16 +++++------ samples/power/power_vc9.vcproj | 16 +++++------ samples/preferences/makefile.vc | 20 ++++++------- samples/preferences/preferences_vc7.vcproj | 8 +++--- samples/preferences/preferences_vc8.vcproj | 16 +++++------ samples/preferences/preferences_vc9.vcproj | 16 +++++------ samples/printing/makefile.vc | 20 ++++++------- samples/printing/printing_vc7.vcproj | 8 +++--- samples/printing/printing_vc8.vcproj | 16 +++++------ samples/printing/printing_vc9.vcproj | 16 +++++------ samples/propgrid/makefile.vc | 20 ++++++------- samples/propgrid/propgrid_vc7.vcproj | 8 +++--- samples/propgrid/propgrid_vc8.vcproj | 16 +++++------ samples/propgrid/propgrid_vc9.vcproj | 16 +++++------ samples/regtest/makefile.vc | 20 ++++++------- samples/regtest/regtest_vc7.vcproj | 8 +++--- samples/regtest/regtest_vc8.vcproj | 16 +++++------ samples/regtest/regtest_vc9.vcproj | 16 +++++------ samples/render/makefile.vc | 20 ++++++------- samples/render/render_vc7_renddll.vcproj | 4 +-- samples/render/render_vc7_render.vcproj | 8 +++--- samples/render/render_vc8_renddll.vcproj | 8 +++--- samples/render/render_vc8_render.vcproj | 16 +++++------ samples/render/render_vc9_renddll.vcproj | 8 +++--- samples/render/render_vc9_render.vcproj | 16 +++++------ samples/ribbon/makefile.vc | 20 ++++++------- samples/ribbon/ribbon_vc7.vcproj | 8 +++--- samples/ribbon/ribbon_vc8.vcproj | 16 +++++------ samples/ribbon/ribbon_vc9.vcproj | 16 +++++------ samples/richtext/makefile.vc | 20 ++++++------- samples/richtext/richtext_vc7.vcproj | 8 +++--- samples/richtext/richtext_vc8.vcproj | 16 +++++------ samples/richtext/richtext_vc9.vcproj | 16 +++++------ samples/sashtest/makefile.vc | 20 ++++++------- samples/sashtest/sashtest_vc7.vcproj | 8 +++--- samples/sashtest/sashtest_vc8.vcproj | 16 +++++------ samples/sashtest/sashtest_vc9.vcproj | 16 +++++------ samples/scroll/makefile.vc | 20 ++++++------- samples/scroll/scroll_vc7.vcproj | 8 +++--- samples/scroll/scroll_vc8.vcproj | 16 +++++------ samples/scroll/scroll_vc9.vcproj | 16 +++++------ samples/secretstore/makefile.vc | 20 ++++++------- samples/secretstore/secretstore_vc7.vcproj | 8 +++--- samples/secretstore/secretstore_vc8.vcproj | 16 +++++------ samples/secretstore/secretstore_vc9.vcproj | 16 +++++------ samples/shaped/makefile.vc | 20 ++++++------- samples/shaped/shaped_vc7.vcproj | 8 +++--- samples/shaped/shaped_vc8.vcproj | 16 +++++------ samples/shaped/shaped_vc9.vcproj | 16 +++++------ samples/sockets/makefile.vc | 20 ++++++------- samples/sockets/sockets_vc7_baseclient.vcproj | 8 +++--- samples/sockets/sockets_vc7_baseserver.vcproj | 8 +++--- samples/sockets/sockets_vc7_client.vcproj | 8 +++--- samples/sockets/sockets_vc7_server.vcproj | 8 +++--- samples/sockets/sockets_vc8_baseclient.vcproj | 16 +++++------ samples/sockets/sockets_vc8_baseserver.vcproj | 16 +++++------ samples/sockets/sockets_vc8_client.vcproj | 16 +++++------ samples/sockets/sockets_vc8_server.vcproj | 16 +++++------ samples/sockets/sockets_vc9_baseclient.vcproj | 16 +++++------ samples/sockets/sockets_vc9_baseserver.vcproj | 16 +++++------ samples/sockets/sockets_vc9_client.vcproj | 16 +++++------ samples/sockets/sockets_vc9_server.vcproj | 16 +++++------ samples/sound/makefile.vc | 20 ++++++------- samples/sound/sound_vc7.vcproj | 8 +++--- samples/sound/sound_vc8.vcproj | 16 +++++------ samples/sound/sound_vc9.vcproj | 16 +++++------ samples/splash/makefile.vc | 20 ++++++------- samples/splash/splash_vc7.vcproj | 8 +++--- samples/splash/splash_vc8.vcproj | 16 +++++------ samples/splash/splash_vc9.vcproj | 16 +++++------ samples/splitter/makefile.vc | 20 ++++++------- samples/splitter/splitter_vc7.vcproj | 8 +++--- samples/splitter/splitter_vc8.vcproj | 16 +++++------ samples/splitter/splitter_vc9.vcproj | 16 +++++------ samples/statbar/makefile.vc | 20 ++++++------- samples/statbar/statbar_vc7.vcproj | 8 +++--- samples/statbar/statbar_vc8.vcproj | 16 +++++------ samples/statbar/statbar_vc9.vcproj | 16 +++++------ samples/stc/makefile.vc | 20 ++++++------- samples/stc/stctest_vc7.vcproj | 8 +++--- samples/stc/stctest_vc8.vcproj | 16 +++++------ samples/stc/stctest_vc9.vcproj | 16 +++++------ samples/svg/makefile.vc | 20 ++++++------- samples/svg/svgtest_vc7.vcproj | 8 +++--- samples/svg/svgtest_vc8.vcproj | 16 +++++------ samples/svg/svgtest_vc9.vcproj | 16 +++++------ samples/taborder/makefile.vc | 20 ++++++------- samples/taborder/taborder_vc7.vcproj | 8 +++--- samples/taborder/taborder_vc8.vcproj | 16 +++++------ samples/taborder/taborder_vc9.vcproj | 16 +++++------ samples/taskbar/makefile.vc | 20 ++++++------- samples/taskbar/taskbar_vc7.vcproj | 8 +++--- samples/taskbar/taskbar_vc8.vcproj | 16 +++++------ samples/taskbar/taskbar_vc9.vcproj | 16 +++++------ samples/taskbarbutton/makefile.vc | 20 ++++++------- .../taskbarbutton/taskbarbutton_vc7.vcproj | 8 +++--- .../taskbarbutton/taskbarbutton_vc8.vcproj | 16 +++++------ .../taskbarbutton/taskbarbutton_vc9.vcproj | 16 +++++------ samples/text/makefile.vc | 20 ++++++------- samples/text/text_vc7.vcproj | 8 +++--- samples/text/text_vc8.vcproj | 16 +++++------ samples/text/text_vc9.vcproj | 16 +++++------ samples/thread/makefile.vc | 20 ++++++------- samples/thread/thread_vc7.vcproj | 8 +++--- samples/thread/thread_vc8.vcproj | 16 +++++------ samples/thread/thread_vc9.vcproj | 16 +++++------ samples/toolbar/makefile.vc | 20 ++++++------- samples/toolbar/toolbar_vc7.vcproj | 8 +++--- samples/toolbar/toolbar_vc8.vcproj | 16 +++++------ samples/toolbar/toolbar_vc9.vcproj | 16 +++++------ samples/treectrl/makefile.vc | 20 ++++++------- samples/treectrl/treectrl_vc7.vcproj | 8 +++--- samples/treectrl/treectrl_vc8.vcproj | 16 +++++------ samples/treectrl/treectrl_vc9.vcproj | 16 +++++------ samples/treelist/makefile.vc | 20 ++++++------- samples/treelist/treelist_vc7.vcproj | 8 +++--- samples/treelist/treelist_vc8.vcproj | 16 +++++------ samples/treelist/treelist_vc9.vcproj | 16 +++++------ samples/typetest/makefile.vc | 20 ++++++------- samples/typetest/typetest_vc7.vcproj | 8 +++--- samples/typetest/typetest_vc8.vcproj | 16 +++++------ samples/typetest/typetest_vc9.vcproj | 16 +++++------ samples/uiaction/makefile.vc | 20 ++++++------- samples/uiaction/uiaction_vc7.vcproj | 8 +++--- samples/uiaction/uiaction_vc8.vcproj | 16 +++++------ samples/uiaction/uiaction_vc9.vcproj | 16 +++++------ samples/validate/makefile.vc | 20 ++++++------- samples/validate/validate_vc7.vcproj | 8 +++--- samples/validate/validate_vc8.vcproj | 16 +++++------ samples/validate/validate_vc9.vcproj | 16 +++++------ samples/vscroll/makefile.vc | 20 ++++++------- samples/vscroll/vscroll_vc7.vcproj | 8 +++--- samples/vscroll/vscroll_vc8.vcproj | 16 +++++------ samples/vscroll/vscroll_vc9.vcproj | 16 +++++------ samples/webview/makefile.vc | 20 ++++++------- samples/webview/webview_vc7.vcproj | 8 +++--- samples/webview/webview_vc8.vcproj | 16 +++++------ samples/webview/webview_vc9.vcproj | 16 +++++------ samples/widgets/makefile.vc | 20 ++++++------- samples/widgets/widgets_vc7.vcproj | 8 +++--- samples/widgets/widgets_vc8.vcproj | 16 +++++------ samples/widgets/widgets_vc9.vcproj | 16 +++++------ samples/wizard/makefile.vc | 20 ++++++------- samples/wizard/wizard_vc7.vcproj | 8 +++--- samples/wizard/wizard_vc8.vcproj | 16 +++++------ samples/wizard/wizard_vc9.vcproj | 16 +++++------ samples/wrapsizer/makefile.vc | 20 ++++++------- samples/wrapsizer/wrapsizer_vc7.vcproj | 8 +++--- samples/wrapsizer/wrapsizer_vc8.vcproj | 16 +++++------ samples/wrapsizer/wrapsizer_vc9.vcproj | 16 +++++------ samples/xrc/makefile.vc | 20 ++++++------- samples/xrc/xrcdemo_vc7.vcproj | 8 +++--- samples/xrc/xrcdemo_vc8.vcproj | 16 +++++------ samples/xrc/xrcdemo_vc9.vcproj | 16 +++++------ samples/xti/makefile.vc | 20 ++++++------- samples/xti/xti_vc7.vcproj | 8 +++--- samples/xti/xti_vc8.vcproj | 16 +++++------ samples/xti/xti_vc9.vcproj | 16 +++++------ tests/benchmarks/bench_vc7_bench.vcproj | 8 +++--- .../bench_vc7_bench_graphics.vcproj | 8 +++--- tests/benchmarks/bench_vc7_bench_gui.vcproj | 8 +++--- tests/benchmarks/bench_vc8_bench.vcproj | 16 +++++------ .../bench_vc8_bench_graphics.vcproj | 16 +++++------ tests/benchmarks/bench_vc8_bench_gui.vcproj | 16 +++++------ tests/benchmarks/bench_vc9_bench.vcproj | 16 +++++------ .../bench_vc9_bench_graphics.vcproj | 16 +++++------ tests/benchmarks/bench_vc9_bench_gui.vcproj | 16 +++++------ tests/benchmarks/makefile.vc | 20 ++++++------- tests/makefile.vc | 20 ++++++------- tests/test.vcxproj | 18 ++++++------ tests/test_gui.vcxproj | 16 +++++------ tests/test_vc7_test.vcproj | 8 +++--- tests/test_vc7_test_drawing.vcproj | 8 +++--- tests/test_vc7_test_drawingplugin.vcproj | 4 +-- tests/test_vc7_test_gui.vcproj | 8 +++--- tests/test_vc8_test.vcproj | 16 +++++------ tests/test_vc8_test_drawing.vcproj | 16 +++++------ tests/test_vc8_test_drawingplugin.vcproj | 8 +++--- tests/test_vc8_test_gui.vcproj | 16 +++++------ tests/test_vc9_test.vcproj | 16 +++++------ tests/test_vc9_test_drawing.vcproj | 16 +++++------ tests/test_vc9_test_drawingplugin.vcproj | 8 +++--- tests/test_vc9_test_gui.vcproj | 16 +++++------ utils/emulator/src/emulator_vc7.vcproj | 8 +++--- utils/emulator/src/emulator_vc8.vcproj | 16 +++++------ utils/emulator/src/emulator_vc9.vcproj | 16 +++++------ utils/emulator/src/makefile.vc | 20 ++++++------- utils/execmon/execmon_vc7.vcproj | 8 +++--- utils/execmon/execmon_vc8.vcproj | 16 +++++------ utils/execmon/execmon_vc9.vcproj | 16 +++++------ utils/execmon/makefile.vc | 20 ++++++------- utils/helpview/src/helpview_vc7.vcproj | 8 +++--- utils/helpview/src/helpview_vc8.vcproj | 16 +++++------ utils/helpview/src/helpview_vc9.vcproj | 16 +++++------ utils/helpview/src/makefile.vc | 20 ++++++------- utils/hhp2cached/hhp2cached_vc7.vcproj | 8 +++--- utils/hhp2cached/hhp2cached_vc8.vcproj | 16 +++++------ utils/hhp2cached/hhp2cached_vc9.vcproj | 16 +++++------ utils/hhp2cached/makefile.vc | 20 ++++++------- utils/ifacecheck/src/ifacecheck_vc7.vcproj | 8 +++--- utils/ifacecheck/src/ifacecheck_vc8.vcproj | 16 +++++------ utils/ifacecheck/src/ifacecheck_vc9.vcproj | 16 +++++------ utils/ifacecheck/src/makefile.vc | 20 ++++++------- utils/screenshotgen/src/makefile.vc | 20 ++++++------- .../src/screenshotgen_vc7.vcproj | 8 +++--- .../src/screenshotgen_vc8.vcproj | 16 +++++------ .../src/screenshotgen_vc9.vcproj | 16 +++++------ utils/wxrc/makefile.vc | 20 ++++++------- utils/wxrc/wxrc.vcxproj | 18 ++++++------ utils/wxrc/wxrc_vc7.vcproj | 8 +++--- utils/wxrc/wxrc_vc8.vcproj | 16 +++++------ utils/wxrc/wxrc_vc9.vcproj | 16 +++++------ 550 files changed, 3833 insertions(+), 3833 deletions(-) rename include/wx/msw/{amd64-dpi-aware.manifest => amd64_dpi_aware.manifest} (100%) rename include/wx/msw/{amd64-dpi-aware-pmv2.manifest => amd64_dpi_aware_pmv2.manifest} (100%) rename include/wx/msw/{wx-dpi-aware.manifest => wx_dpi_aware.manifest} (100%) rename include/wx/msw/{wx-dpi-aware-pmv2.manifest => wx_dpi_aware_pmv2.manifest} (100%) diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl index 8708269484..60b725d4fd 100644 --- a/build/bakefiles/common.bkl +++ b/build/bakefiles/common.bkl @@ -332,31 +332,31 @@ - /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/wx-dpi-aware.manifest + /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/wx_dpi_aware.manifest - /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64-dpi-aware.manifest + /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware.manifest - /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/wx-dpi-aware-pmv2.manifest + /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/wx_dpi_aware_pmv2.manifest - /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64-dpi-aware-pmv2.manifest + /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware_pmv2.manifest - /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/wx-dpi-aware.manifest + /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/wx_dpi_aware.manifest - /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64-dpi-aware.manifest - /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64-dpi-aware.manifest - /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64-dpi-aware.manifest - /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64-dpi-aware.manifest + /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware.manifest + /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware.manifest + /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware.manifest + /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware.manifest - /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/wx-dpi-aware-pmv2.manifest + /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/wx_dpi_aware_pmv2.manifest - /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64-dpi-aware-pmv2.manifest - /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64-dpi-aware-pmv2.manifest - /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64-dpi-aware-pmv2.manifest - /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64-dpi-aware-pmv2.manifest + /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware_pmv2.manifest + /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware_pmv2.manifest + /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware_pmv2.manifest + /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware_pmv2.manifest diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake index fa412910e0..d25937dfca 100644 --- a/build/cmake/functions.cmake +++ b/build/cmake/functions.cmake @@ -671,10 +671,10 @@ function(wx_add_sample name) set(wxUSE_DPI_AWARE_MANIFEST_VALUE 0) if (${wxUSE_DPI_AWARE_MANIFEST} MATCHES "system") set(wxUSE_DPI_AWARE_MANIFEST_VALUE 1) - list(APPEND src_files "${wxSOURCE_DIR}/include/wx/msw/${wxDPI_MANIFEST_PRFIX}-dpi-aware.manifest") + list(APPEND src_files "${wxSOURCE_DIR}/include/wx/msw/${wxDPI_MANIFEST_PRFIX}_dpi_aware.manifest") elseif(${wxUSE_DPI_AWARE_MANIFEST} MATCHES "per-monitor") set(wxUSE_DPI_AWARE_MANIFEST_VALUE 2) - list(APPEND src_files "${wxSOURCE_DIR}/include/wx/msw/${wxDPI_MANIFEST_PRFIX}-dpi-aware-pmv2.manifest") + list(APPEND src_files "${wxSOURCE_DIR}/include/wx/msw/${wxDPI_MANIFEST_PRFIX}_dpi_aware_pmv2.manifest") endif() endif() diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index 24ee01904b..d5bb450255 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -1879,43 +1879,43 @@ LINK_TARGET_CPU = /MACHINE:X64 !endif !if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ - /MANIFESTINPUT:../../include/wx/msw/wx-dpi-aware.manifest + /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware.manifest !endif !if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ - /MANIFESTINPUT:../../include/wx/msw/amd64-dpi-aware.manifest + /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware.manifest !endif !if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ - /MANIFESTINPUT:../../include/wx/msw/amd64-dpi-aware.manifest + /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware.manifest !endif !if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ - /MANIFESTINPUT:../../include/wx/msw/amd64-dpi-aware.manifest + /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware.manifest !endif !if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ - /MANIFESTINPUT:../../include/wx/msw/amd64-dpi-aware.manifest + /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware.manifest !endif !if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ - /MANIFESTINPUT:../../include/wx/msw/wx-dpi-aware-pmv2.manifest + /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif !if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ - /MANIFESTINPUT:../../include/wx/msw/amd64-dpi-aware-pmv2.manifest + /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest !endif !if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ - /MANIFESTINPUT:../../include/wx/msw/amd64-dpi-aware-pmv2.manifest + /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest !endif !if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ - /MANIFESTINPUT:../../include/wx/msw/amd64-dpi-aware-pmv2.manifest + /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest !endif !if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ - /MANIFESTINPUT:../../include/wx/msw/amd64-dpi-aware-pmv2.manifest + /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest !endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_10 = D diff --git a/build/msw/wx_vc7_adv.vcproj b/build/msw/wx_vc7_adv.vcproj index 4e896243e7..ceaeb1d96e 100644 --- a/build/msw/wx_vc7_adv.vcproj +++ b/build/msw/wx_vc7_adv.vcproj @@ -165,7 +165,7 @@ Name="VCCustomBuildTool"/> true - ./../../include/wx/msw/wx-dpi-aware-pmv2.manifest %(AdditionalManifestFiles) + ./../../include/wx/msw/wx_dpi_aware_pmv2.manifest %(AdditionalManifestFiles) @@ -200,7 +200,7 @@ true - ./../../include/wx/msw/wx-dpi-aware-pmv2.manifest %(AdditionalManifestFiles) + ./../../include/wx/msw/wx_dpi_aware_pmv2.manifest %(AdditionalManifestFiles) @@ -239,7 +239,7 @@ true - ./../../include/wx/msw/wx-dpi-aware-pmv2.manifest %(AdditionalManifestFiles) + ./../../include/wx/msw/wx_dpi_aware_pmv2.manifest %(AdditionalManifestFiles) @@ -278,7 +278,7 @@ true - ./../../include/wx/msw/wx-dpi-aware-pmv2.manifest %(AdditionalManifestFiles) + ./../../include/wx/msw/wx_dpi_aware_pmv2.manifest %(AdditionalManifestFiles) @@ -317,7 +317,7 @@ true - ./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest %(AdditionalManifestFiles) + ./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest %(AdditionalManifestFiles) @@ -356,7 +356,7 @@ true - ./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest %(AdditionalManifestFiles) + ./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest %(AdditionalManifestFiles) @@ -395,7 +395,7 @@ true - ./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest %(AdditionalManifestFiles) + ./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest %(AdditionalManifestFiles) @@ -434,7 +434,7 @@ true - ./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest %(AdditionalManifestFiles) + ./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest %(AdditionalManifestFiles) @@ -446,4 +446,4 @@ - \ No newline at end of file + diff --git a/samples/minimal/minimal_vc7.vcproj b/samples/minimal/minimal_vc7.vcproj index 0e0ec96321..abdf41c6c3 100644 --- a/samples/minimal/minimal_vc7.vcproj +++ b/samples/minimal/minimal_vc7.vcproj @@ -45,7 +45,7 @@ Name="VCCustomBuildTool"/> true - ./../include/wx/msw/wx-dpi-aware-pmv2.manifest %(AdditionalManifestFiles) + ./../include/wx/msw/wx_dpi_aware_pmv2.manifest %(AdditionalManifestFiles) @@ -209,7 +209,7 @@ true - ./../include/wx/msw/wx-dpi-aware-pmv2.manifest %(AdditionalManifestFiles) + ./../include/wx/msw/wx_dpi_aware_pmv2.manifest %(AdditionalManifestFiles) @@ -252,7 +252,7 @@ true - ./../include/wx/msw/wx-dpi-aware-pmv2.manifest %(AdditionalManifestFiles) + ./../include/wx/msw/wx_dpi_aware_pmv2.manifest %(AdditionalManifestFiles) @@ -295,7 +295,7 @@ true - ./../include/wx/msw/wx-dpi-aware-pmv2.manifest %(AdditionalManifestFiles) + ./../include/wx/msw/wx_dpi_aware_pmv2.manifest %(AdditionalManifestFiles) @@ -338,7 +338,7 @@ true - ./../include/wx/msw/amd64-dpi-aware-pmv2.manifest %(AdditionalManifestFiles) + ./../include/wx/msw/amd64_dpi_aware_pmv2.manifest %(AdditionalManifestFiles) @@ -381,7 +381,7 @@ true - ./../include/wx/msw/amd64-dpi-aware-pmv2.manifest %(AdditionalManifestFiles) + ./../include/wx/msw/amd64_dpi_aware_pmv2.manifest %(AdditionalManifestFiles) @@ -424,7 +424,7 @@ true - ./../include/wx/msw/amd64-dpi-aware-pmv2.manifest %(AdditionalManifestFiles) + ./../include/wx/msw/amd64_dpi_aware_pmv2.manifest %(AdditionalManifestFiles) @@ -467,7 +467,7 @@ true - ./../include/wx/msw/amd64-dpi-aware-pmv2.manifest %(AdditionalManifestFiles) + ./../include/wx/msw/amd64_dpi_aware_pmv2.manifest %(AdditionalManifestFiles) @@ -570,4 +570,4 @@ - \ No newline at end of file + diff --git a/tests/test_gui.vcxproj b/tests/test_gui.vcxproj index 32e455cf88..754fdb8d44 100644 --- a/tests/test_gui.vcxproj +++ b/tests/test_gui.vcxproj @@ -165,7 +165,7 @@ true - ./../include/wx/msw/wx-dpi-aware-pmv2.manifest %(AdditionalManifestFiles) + ./../include/wx/msw/wx_dpi_aware_pmv2.manifest %(AdditionalManifestFiles) @@ -208,7 +208,7 @@ true - ./../include/wx/msw/wx-dpi-aware-pmv2.manifest %(AdditionalManifestFiles) + ./../include/wx/msw/wx_dpi_aware_pmv2.manifest %(AdditionalManifestFiles) @@ -251,7 +251,7 @@ true - ./../include/wx/msw/wx-dpi-aware-pmv2.manifest %(AdditionalManifestFiles) + ./../include/wx/msw/wx_dpi_aware_pmv2.manifest %(AdditionalManifestFiles) @@ -294,7 +294,7 @@ true - ./../include/wx/msw/wx-dpi-aware-pmv2.manifest %(AdditionalManifestFiles) + ./../include/wx/msw/wx_dpi_aware_pmv2.manifest %(AdditionalManifestFiles) @@ -337,7 +337,7 @@ true - ./../include/wx/msw/amd64-dpi-aware-pmv2.manifest %(AdditionalManifestFiles) + ./../include/wx/msw/amd64_dpi_aware_pmv2.manifest %(AdditionalManifestFiles) @@ -380,7 +380,7 @@ true - ./../include/wx/msw/amd64-dpi-aware-pmv2.manifest %(AdditionalManifestFiles) + ./../include/wx/msw/amd64_dpi_aware_pmv2.manifest %(AdditionalManifestFiles) @@ -423,7 +423,7 @@ true - ./../include/wx/msw/amd64-dpi-aware-pmv2.manifest %(AdditionalManifestFiles) + ./../include/wx/msw/amd64_dpi_aware_pmv2.manifest %(AdditionalManifestFiles) @@ -466,7 +466,7 @@ true - ./../include/wx/msw/amd64-dpi-aware-pmv2.manifest %(AdditionalManifestFiles) + ./../include/wx/msw/amd64_dpi_aware_pmv2.manifest %(AdditionalManifestFiles) diff --git a/tests/test_vc7_test.vcproj b/tests/test_vc7_test.vcproj index 5b59b312fb..b41cf68d57 100644 --- a/tests/test_vc7_test.vcproj +++ b/tests/test_vc7_test.vcproj @@ -48,7 +48,7 @@ Name="VCCustomBuildTool"/> true - ./../../include/wx/msw/wx-dpi-aware-pmv2.manifest %(AdditionalManifestFiles) + ./../../include/wx/msw/wx_dpi_aware_pmv2.manifest %(AdditionalManifestFiles) @@ -200,7 +200,7 @@ true - ./../../include/wx/msw/wx-dpi-aware-pmv2.manifest %(AdditionalManifestFiles) + ./../../include/wx/msw/wx_dpi_aware_pmv2.manifest %(AdditionalManifestFiles) @@ -239,7 +239,7 @@ true - ./../../include/wx/msw/wx-dpi-aware-pmv2.manifest %(AdditionalManifestFiles) + ./../../include/wx/msw/wx_dpi_aware_pmv2.manifest %(AdditionalManifestFiles) @@ -278,7 +278,7 @@ true - ./../../include/wx/msw/wx-dpi-aware-pmv2.manifest %(AdditionalManifestFiles) + ./../../include/wx/msw/wx_dpi_aware_pmv2.manifest %(AdditionalManifestFiles) @@ -317,7 +317,7 @@ true - ./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest %(AdditionalManifestFiles) + ./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest %(AdditionalManifestFiles) @@ -356,7 +356,7 @@ true - ./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest %(AdditionalManifestFiles) + ./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest %(AdditionalManifestFiles) @@ -395,7 +395,7 @@ true - ./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest %(AdditionalManifestFiles) + ./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest %(AdditionalManifestFiles) @@ -434,7 +434,7 @@ true - ./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest %(AdditionalManifestFiles) + ./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest %(AdditionalManifestFiles) @@ -443,4 +443,4 @@ - \ No newline at end of file + diff --git a/utils/wxrc/wxrc_vc7.vcproj b/utils/wxrc/wxrc_vc7.vcproj index 4f55f4c89f..9b75a702c7 100644 --- a/utils/wxrc/wxrc_vc7.vcproj +++ b/utils/wxrc/wxrc_vc7.vcproj @@ -45,7 +45,7 @@ Name="VCCustomBuildTool"/> Date: Fri, 13 Dec 2019 22:16:44 +0100 Subject: [PATCH 2/2] Fix concatenating manifest name in resource file --- include/wx/msw/wx.rc | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc index a07e88652c..44a33c0886 100644 --- a/include/wx/msw/wx.rc +++ b/include/wx/msw/wx.rc @@ -106,15 +106,15 @@ wxBITMAP_STD_COLOURS BITMAP "wx/msw/colours.bmp" #endif #if defined(WX_CPU_AMD64) - #define wxMANIFEST_CPU "amd64" + #define wxMANIFEST_CPU amd64 #elif defined(WX_CPU_IA64) - #define wxMANIFEST_CPU "ia64" + #define wxMANIFEST_CPU ia64 #elif defined(WX_CPU_X86) - #define wxMANIFEST_CPU "wx" + #define wxMANIFEST_CPU wx #elif defined(WX_CPU_ARM) - #define wxMANIFEST_CPU "arm" + #define wxMANIFEST_CPU arm #elif defined(WX_CPU_ARM64) - #define wxMANIFEST_CPU "arm64" + #define wxMANIFEST_CPU arm64 #else // Notice that if the manifest is included, WX_CPU_XXX constant corresponding // to the architecture we're compiling for must be defined. This can be done @@ -126,14 +126,23 @@ wxBITMAP_STD_COLOURS BITMAP "wx/msw/colours.bmp" #endif #if !defined(wxUSE_DPI_AWARE_MANIFEST) || wxUSE_DPI_AWARE_MANIFEST == 0 - #define wxMANIFEST_DPI "" + #define wxMANIFEST_DPI .manifest #elif wxUSE_DPI_AWARE_MANIFEST == 1 - #define wxMANIFEST_DPI "_dpi_aware" + #define wxMANIFEST_DPI _dpi_aware.manifest #elif wxUSE_DPI_AWARE_MANIFEST == 2 - #define wxMANIFEST_DPI "_dpi_aware_pmv2" + #define wxMANIFEST_DPI _dpi_aware_pmv2.manifest #endif -#define wxMANIFEST_FILE "wx/msw/" wxMANIFEST_CPU wxMANIFEST_DPI ".manifest" +#define wxRC_STR(text) wxRC_STR2(text) +#define wxRC_STR2(text) #text +#define wxRC_CONCAT(a, b, c) wxRC_CONCAT2(a, b, c) +#define wxRC_CONCAT2(a, b, c) a ## b ## c + +#ifdef __GNUC__ + #define wxMANIFEST_FILE "wx/msw/" wxRC_STR(wxMANIFEST_CPU) wxRC_STR(wxMANIFEST_DPI) +#else + #define wxMANIFEST_FILE wxRC_CONCAT(wx/msw/, wxMANIFEST_CPU, wxMANIFEST_DPI) +#endif wxMANIFEST_ID RT_MANIFEST wxMANIFEST_FILE #endif // wxUSE_RC_MANIFEST