From 559ea66e55940431e36bea6181e5b5c41e9aab85 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 18 Dec 2021 13:22:59 +0100 Subject: [PATCH] Use DPI aware manifests for MSVS 2022 too --- build/bakefiles/common.bkl | 2 ++ demos/bombs/makefile.vc | 8 ++++++++ demos/forty/makefile.vc | 8 ++++++++ demos/fractal/makefile.vc | 8 ++++++++ demos/life/makefile.vc | 8 ++++++++ demos/poem/makefile.vc | 8 ++++++++ samples/access/makefile.vc | 8 ++++++++ samples/animate/makefile.vc | 8 ++++++++ samples/artprov/makefile.vc | 8 ++++++++ samples/aui/makefile.vc | 8 ++++++++ samples/calendar/makefile.vc | 8 ++++++++ samples/caret/makefile.vc | 8 ++++++++ samples/clipboard/makefile.vc | 8 ++++++++ samples/collpane/makefile.vc | 8 ++++++++ samples/combo/makefile.vc | 8 ++++++++ samples/config/makefile.vc | 8 ++++++++ samples/dataview/makefile.vc | 8 ++++++++ samples/debugrpt/makefile.vc | 8 ++++++++ samples/dialogs/makefile.vc | 8 ++++++++ samples/dialup/makefile.vc | 8 ++++++++ samples/display/makefile.vc | 8 ++++++++ samples/dll/makefile.vc | 8 ++++++++ samples/dnd/makefile.vc | 8 ++++++++ samples/docview/makefile.vc | 8 ++++++++ samples/dragimag/makefile.vc | 8 ++++++++ samples/drawing/makefile.vc | 8 ++++++++ samples/erase/makefile.vc | 8 ++++++++ samples/event/makefile.vc | 8 ++++++++ samples/except/makefile.vc | 8 ++++++++ samples/exec/makefile.vc | 8 ++++++++ samples/font/makefile.vc | 8 ++++++++ samples/fswatcher/makefile.vc | 8 ++++++++ samples/grid/makefile.vc | 8 ++++++++ samples/help/makefile.vc | 8 ++++++++ samples/htlbox/makefile.vc | 8 ++++++++ samples/html/about/makefile.vc | 8 ++++++++ samples/html/help/makefile.vc | 8 ++++++++ samples/html/helpview/makefile.vc | 8 ++++++++ samples/html/printing/makefile.vc | 8 ++++++++ samples/html/test/makefile.vc | 8 ++++++++ samples/html/virtual/makefile.vc | 8 ++++++++ samples/html/widget/makefile.vc | 8 ++++++++ samples/html/zip/makefile.vc | 8 ++++++++ samples/image/makefile.vc | 8 ++++++++ samples/internat/makefile.vc | 8 ++++++++ samples/ipc/makefile.vc | 8 ++++++++ samples/joytest/makefile.vc | 8 ++++++++ samples/keyboard/makefile.vc | 8 ++++++++ samples/layout/makefile.vc | 8 ++++++++ samples/listctrl/makefile.vc | 8 ++++++++ samples/mdi/makefile.vc | 8 ++++++++ samples/mediaplayer/makefile.vc | 8 ++++++++ samples/memcheck/makefile.vc | 8 ++++++++ samples/menu/makefile.vc | 8 ++++++++ samples/mfc/makefile.vc | 8 ++++++++ samples/minimal/makefile.vc | 8 ++++++++ samples/nativdlg/makefile.vc | 8 ++++++++ samples/notebook/makefile.vc | 8 ++++++++ samples/oleauto/makefile.vc | 8 ++++++++ samples/opengl/cube/makefile.vc | 8 ++++++++ samples/opengl/isosurf/makefile.vc | 8 ++++++++ samples/opengl/penguin/makefile.vc | 8 ++++++++ samples/opengl/pyramid/makefile.vc | 8 ++++++++ samples/ownerdrw/makefile.vc | 8 ++++++++ samples/popup/makefile.vc | 8 ++++++++ samples/power/makefile.vc | 8 ++++++++ samples/preferences/makefile.vc | 8 ++++++++ samples/printing/makefile.vc | 8 ++++++++ samples/propgrid/makefile.vc | 8 ++++++++ samples/regtest/makefile.vc | 8 ++++++++ samples/render/makefile.vc | 8 ++++++++ samples/ribbon/makefile.vc | 8 ++++++++ samples/richtext/makefile.vc | 8 ++++++++ samples/sashtest/makefile.vc | 8 ++++++++ samples/scroll/makefile.vc | 8 ++++++++ samples/shaped/makefile.vc | 8 ++++++++ samples/sockets/makefile.vc | 8 ++++++++ samples/sound/makefile.vc | 8 ++++++++ samples/splash/makefile.vc | 8 ++++++++ samples/splitter/makefile.vc | 8 ++++++++ samples/statbar/makefile.vc | 8 ++++++++ samples/stc/makefile.vc | 8 ++++++++ samples/svg/makefile.vc | 8 ++++++++ samples/taborder/makefile.vc | 8 ++++++++ samples/taskbar/makefile.vc | 8 ++++++++ samples/taskbarbutton/makefile.vc | 8 ++++++++ samples/text/makefile.vc | 8 ++++++++ samples/thread/makefile.vc | 8 ++++++++ samples/toolbar/makefile.vc | 8 ++++++++ samples/treectrl/makefile.vc | 8 ++++++++ samples/treelist/makefile.vc | 8 ++++++++ samples/typetest/makefile.vc | 8 ++++++++ samples/uiaction/makefile.vc | 8 ++++++++ samples/validate/makefile.vc | 8 ++++++++ samples/vscroll/makefile.vc | 8 ++++++++ samples/webrequest/makefile.vc | 8 ++++++++ samples/webview/makefile.vc | 8 ++++++++ samples/widgets/makefile.vc | 8 ++++++++ samples/wizard/makefile.vc | 8 ++++++++ samples/wrapsizer/makefile.vc | 8 ++++++++ samples/xrc/makefile.vc | 8 ++++++++ samples/xti/makefile.vc | 8 ++++++++ tests/benchmarks/makefile.vc | 8 ++++++++ tests/makefile.vc | 8 ++++++++ utils/emulator/src/makefile.vc | 8 ++++++++ utils/helpview/src/makefile.vc | 8 ++++++++ utils/hhp2cached/makefile.vc | 8 ++++++++ utils/screenshotgen/src/makefile.vc | 8 ++++++++ 108 files changed, 858 insertions(+) diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl index 153d70ef4a..7be0faa5c9 100644 --- a/build/bakefiles/common.bkl +++ b/build/bakefiles/common.bkl @@ -347,10 +347,12 @@ /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/wx_dpi_aware.manifest + /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/wx_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/wx_dpi_aware_pmv2.manifest + /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/wx_dpi_aware_pmv2.manifest diff --git a/demos/bombs/makefile.vc b/demos/bombs/makefile.vc index 87d2fb983c..d212cb333a 100644 --- a/demos/bombs/makefile.vc +++ b/demos/bombs/makefile.vc @@ -142,6 +142,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -154,6 +158,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/demos/forty/makefile.vc b/demos/forty/makefile.vc index 9e87b05647..9e8c3e587e 100644 --- a/demos/forty/makefile.vc +++ b/demos/forty/makefile.vc @@ -147,6 +147,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -159,6 +163,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/demos/fractal/makefile.vc b/demos/fractal/makefile.vc index 2b84699e4c..c9a1b777d9 100644 --- a/demos/fractal/makefile.vc +++ b/demos/fractal/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/demos/life/makefile.vc b/demos/life/makefile.vc index 74d2b52d11..40917cb20c 100644 --- a/demos/life/makefile.vc +++ b/demos/life/makefile.vc @@ -143,6 +143,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -155,6 +159,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/demos/poem/makefile.vc b/demos/poem/makefile.vc index 65f275e400..2564a0b0c3 100644 --- a/demos/poem/makefile.vc +++ b/demos/poem/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/access/makefile.vc b/samples/access/makefile.vc index e4ce910042..da0e7ac456 100644 --- a/samples/access/makefile.vc +++ b/samples/access/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/animate/makefile.vc b/samples/animate/makefile.vc index c023284105..c22f5cf6af 100644 --- a/samples/animate/makefile.vc +++ b/samples/animate/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/artprov/makefile.vc b/samples/artprov/makefile.vc index 144cec5d77..6822b814c0 100644 --- a/samples/artprov/makefile.vc +++ b/samples/artprov/makefile.vc @@ -141,6 +141,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -153,6 +157,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/aui/makefile.vc b/samples/aui/makefile.vc index 7102e05caa..9a62a5fd90 100644 --- a/samples/aui/makefile.vc +++ b/samples/aui/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/calendar/makefile.vc b/samples/calendar/makefile.vc index fddf8bf66f..c698cf5d39 100644 --- a/samples/calendar/makefile.vc +++ b/samples/calendar/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/caret/makefile.vc b/samples/caret/makefile.vc index eeba958e93..738af68945 100644 --- a/samples/caret/makefile.vc +++ b/samples/caret/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/clipboard/makefile.vc b/samples/clipboard/makefile.vc index 62c028d6f0..3741c248bf 100644 --- a/samples/clipboard/makefile.vc +++ b/samples/clipboard/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/collpane/makefile.vc b/samples/collpane/makefile.vc index b3ffae846d..7395d92f8e 100644 --- a/samples/collpane/makefile.vc +++ b/samples/collpane/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/combo/makefile.vc b/samples/combo/makefile.vc index e7c9fb86ef..f17d5dd505 100644 --- a/samples/combo/makefile.vc +++ b/samples/combo/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/config/makefile.vc b/samples/config/makefile.vc index 994cab9f3d..17925ee17d 100644 --- a/samples/config/makefile.vc +++ b/samples/config/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/dataview/makefile.vc b/samples/dataview/makefile.vc index 76d6e9dd1c..e3d03ede16 100644 --- a/samples/dataview/makefile.vc +++ b/samples/dataview/makefile.vc @@ -141,6 +141,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -153,6 +157,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/debugrpt/makefile.vc b/samples/debugrpt/makefile.vc index add8f92c6b..eddce7baec 100644 --- a/samples/debugrpt/makefile.vc +++ b/samples/debugrpt/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/dialogs/makefile.vc b/samples/dialogs/makefile.vc index b256ff7a8d..81a1dc3df5 100644 --- a/samples/dialogs/makefile.vc +++ b/samples/dialogs/makefile.vc @@ -141,6 +141,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -153,6 +157,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/dialup/makefile.vc b/samples/dialup/makefile.vc index a94d6c7356..d89c1e6d27 100644 --- a/samples/dialup/makefile.vc +++ b/samples/dialup/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/display/makefile.vc b/samples/display/makefile.vc index 338d15b7e1..3c5c647de0 100644 --- a/samples/display/makefile.vc +++ b/samples/display/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/dll/makefile.vc b/samples/dll/makefile.vc index ac4c23cf44..7b2e0e447f 100644 --- a/samples/dll/makefile.vc +++ b/samples/dll/makefile.vc @@ -160,6 +160,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -172,6 +176,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/dnd/makefile.vc b/samples/dnd/makefile.vc index 00e9445575..532203ca01 100644 --- a/samples/dnd/makefile.vc +++ b/samples/dnd/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/docview/makefile.vc b/samples/docview/makefile.vc index 6b09fe5e9e..9db948cba9 100644 --- a/samples/docview/makefile.vc +++ b/samples/docview/makefile.vc @@ -142,6 +142,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -154,6 +158,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/dragimag/makefile.vc b/samples/dragimag/makefile.vc index 3e905ed43c..3d9d03ab53 100644 --- a/samples/dragimag/makefile.vc +++ b/samples/dragimag/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/drawing/makefile.vc b/samples/drawing/makefile.vc index 09cd690024..2dc6364102 100644 --- a/samples/drawing/makefile.vc +++ b/samples/drawing/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/erase/makefile.vc b/samples/erase/makefile.vc index b51e2e44b4..f6d7a7b64c 100644 --- a/samples/erase/makefile.vc +++ b/samples/erase/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/event/makefile.vc b/samples/event/makefile.vc index 8fe01fb79c..4be00a1de9 100644 --- a/samples/event/makefile.vc +++ b/samples/event/makefile.vc @@ -142,6 +142,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -154,6 +158,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/except/makefile.vc b/samples/except/makefile.vc index 9c468ec978..9b6b49e65c 100644 --- a/samples/except/makefile.vc +++ b/samples/except/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/exec/makefile.vc b/samples/exec/makefile.vc index 9c0edbd904..a156fc2dc4 100644 --- a/samples/exec/makefile.vc +++ b/samples/exec/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/font/makefile.vc b/samples/font/makefile.vc index 9da0a73083..1823ea77a8 100644 --- a/samples/font/makefile.vc +++ b/samples/font/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/fswatcher/makefile.vc b/samples/fswatcher/makefile.vc index d0094be2e6..3a8f1c19d6 100644 --- a/samples/fswatcher/makefile.vc +++ b/samples/fswatcher/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/grid/makefile.vc b/samples/grid/makefile.vc index 0ab7348aa7..32de04aa6c 100644 --- a/samples/grid/makefile.vc +++ b/samples/grid/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/help/makefile.vc b/samples/help/makefile.vc index 3893f38039..962f9c2d07 100644 --- a/samples/help/makefile.vc +++ b/samples/help/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/htlbox/makefile.vc b/samples/htlbox/makefile.vc index 06b4b21823..96f360a509 100644 --- a/samples/htlbox/makefile.vc +++ b/samples/htlbox/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/html/about/makefile.vc b/samples/html/about/makefile.vc index e424ded057..d651152eff 100644 --- a/samples/html/about/makefile.vc +++ b/samples/html/about/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/html/help/makefile.vc b/samples/html/help/makefile.vc index 8ad59d3370..980a2d4a4d 100644 --- a/samples/html/help/makefile.vc +++ b/samples/html/help/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/html/helpview/makefile.vc b/samples/html/helpview/makefile.vc index ad5f265453..a6b870e57f 100644 --- a/samples/html/helpview/makefile.vc +++ b/samples/html/helpview/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/html/printing/makefile.vc b/samples/html/printing/makefile.vc index 6262026238..c94ae2a708 100644 --- a/samples/html/printing/makefile.vc +++ b/samples/html/printing/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/html/test/makefile.vc b/samples/html/test/makefile.vc index 5b37917881..224dca48ea 100644 --- a/samples/html/test/makefile.vc +++ b/samples/html/test/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/html/virtual/makefile.vc b/samples/html/virtual/makefile.vc index acc4a5d7b2..154619c30a 100644 --- a/samples/html/virtual/makefile.vc +++ b/samples/html/virtual/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/html/widget/makefile.vc b/samples/html/widget/makefile.vc index a1db70b237..d48a232f22 100644 --- a/samples/html/widget/makefile.vc +++ b/samples/html/widget/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/html/zip/makefile.vc b/samples/html/zip/makefile.vc index a110d9ceec..ec11064479 100644 --- a/samples/html/zip/makefile.vc +++ b/samples/html/zip/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/image/makefile.vc b/samples/image/makefile.vc index 21431741af..ceac4dbb13 100644 --- a/samples/image/makefile.vc +++ b/samples/image/makefile.vc @@ -141,6 +141,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -153,6 +157,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/internat/makefile.vc b/samples/internat/makefile.vc index 5b2d806d25..307bbacacf 100644 --- a/samples/internat/makefile.vc +++ b/samples/internat/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/ipc/makefile.vc b/samples/ipc/makefile.vc index 48987c8641..b276bd634d 100644 --- a/samples/ipc/makefile.vc +++ b/samples/ipc/makefile.vc @@ -179,6 +179,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -191,6 +195,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/joytest/makefile.vc b/samples/joytest/makefile.vc index 7c5bfa95a2..912c85901a 100644 --- a/samples/joytest/makefile.vc +++ b/samples/joytest/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/keyboard/makefile.vc b/samples/keyboard/makefile.vc index a55bcd877f..7ce05a4565 100644 --- a/samples/keyboard/makefile.vc +++ b/samples/keyboard/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/layout/makefile.vc b/samples/layout/makefile.vc index 934d86b88e..96ab2b95f7 100644 --- a/samples/layout/makefile.vc +++ b/samples/layout/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/listctrl/makefile.vc b/samples/listctrl/makefile.vc index 323eaaa313..ea41921dbe 100644 --- a/samples/listctrl/makefile.vc +++ b/samples/listctrl/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/mdi/makefile.vc b/samples/mdi/makefile.vc index a633069e23..c2c04d03f0 100644 --- a/samples/mdi/makefile.vc +++ b/samples/mdi/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/mediaplayer/makefile.vc b/samples/mediaplayer/makefile.vc index 4521ac6901..54bd0cf29a 100644 --- a/samples/mediaplayer/makefile.vc +++ b/samples/mediaplayer/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/memcheck/makefile.vc b/samples/memcheck/makefile.vc index 6d1515c964..e6ae2f1edf 100644 --- a/samples/memcheck/makefile.vc +++ b/samples/memcheck/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/menu/makefile.vc b/samples/menu/makefile.vc index 84bc999a8b..01e51d5905 100644 --- a/samples/menu/makefile.vc +++ b/samples/menu/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/mfc/makefile.vc b/samples/mfc/makefile.vc index 312c42b8ff..ca2659b876 100644 --- a/samples/mfc/makefile.vc +++ b/samples/mfc/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/minimal/makefile.vc b/samples/minimal/makefile.vc index 04e6023ce6..8795224e6f 100644 --- a/samples/minimal/makefile.vc +++ b/samples/minimal/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/nativdlg/makefile.vc b/samples/nativdlg/makefile.vc index 40d96e9555..67e5e71580 100644 --- a/samples/nativdlg/makefile.vc +++ b/samples/nativdlg/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/notebook/makefile.vc b/samples/notebook/makefile.vc index d7513250db..4cc5d1adc3 100644 --- a/samples/notebook/makefile.vc +++ b/samples/notebook/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/oleauto/makefile.vc b/samples/oleauto/makefile.vc index 6293765e64..5ac0bdbd3f 100644 --- a/samples/oleauto/makefile.vc +++ b/samples/oleauto/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/opengl/cube/makefile.vc b/samples/opengl/cube/makefile.vc index 19e42067d1..f1abaf4274 100644 --- a/samples/opengl/cube/makefile.vc +++ b/samples/opengl/cube/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/opengl/isosurf/makefile.vc b/samples/opengl/isosurf/makefile.vc index 2f02f68dab..456f524fb2 100644 --- a/samples/opengl/isosurf/makefile.vc +++ b/samples/opengl/isosurf/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/opengl/penguin/makefile.vc b/samples/opengl/penguin/makefile.vc index e125752cc0..a2c64a066f 100644 --- a/samples/opengl/penguin/makefile.vc +++ b/samples/opengl/penguin/makefile.vc @@ -152,6 +152,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -164,6 +168,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/opengl/pyramid/makefile.vc b/samples/opengl/pyramid/makefile.vc index 6ffe2df4da..8fca941869 100644 --- a/samples/opengl/pyramid/makefile.vc +++ b/samples/opengl/pyramid/makefile.vc @@ -143,6 +143,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -155,6 +159,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/ownerdrw/makefile.vc b/samples/ownerdrw/makefile.vc index 96bf312754..fad3d34425 100644 --- a/samples/ownerdrw/makefile.vc +++ b/samples/ownerdrw/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/popup/makefile.vc b/samples/popup/makefile.vc index 114811dd50..23e2c45397 100644 --- a/samples/popup/makefile.vc +++ b/samples/popup/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/power/makefile.vc b/samples/power/makefile.vc index 8a2b31ebf8..0536054545 100644 --- a/samples/power/makefile.vc +++ b/samples/power/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/preferences/makefile.vc b/samples/preferences/makefile.vc index 00d7466d89..ef6d204693 100644 --- a/samples/preferences/makefile.vc +++ b/samples/preferences/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/printing/makefile.vc b/samples/printing/makefile.vc index c6d4f486b3..b2b1bf4e3d 100644 --- a/samples/printing/makefile.vc +++ b/samples/printing/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/propgrid/makefile.vc b/samples/propgrid/makefile.vc index 61da53cb2d..3b337b62d3 100644 --- a/samples/propgrid/makefile.vc +++ b/samples/propgrid/makefile.vc @@ -143,6 +143,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -155,6 +159,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/regtest/makefile.vc b/samples/regtest/makefile.vc index 07e170ce4f..3adb8f26e6 100644 --- a/samples/regtest/makefile.vc +++ b/samples/regtest/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/render/makefile.vc b/samples/render/makefile.vc index e6345d0e3e..667514e124 100644 --- a/samples/render/makefile.vc +++ b/samples/render/makefile.vc @@ -159,6 +159,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -171,6 +175,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/ribbon/makefile.vc b/samples/ribbon/makefile.vc index f3c12859df..10fb73a3ee 100644 --- a/samples/ribbon/makefile.vc +++ b/samples/ribbon/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/richtext/makefile.vc b/samples/richtext/makefile.vc index d5a8979014..425cfd9d41 100644 --- a/samples/richtext/makefile.vc +++ b/samples/richtext/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/sashtest/makefile.vc b/samples/sashtest/makefile.vc index e32953e4d2..54d8ee8408 100644 --- a/samples/sashtest/makefile.vc +++ b/samples/sashtest/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/scroll/makefile.vc b/samples/scroll/makefile.vc index 68dff07aae..32a7ca76cc 100644 --- a/samples/scroll/makefile.vc +++ b/samples/scroll/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/shaped/makefile.vc b/samples/shaped/makefile.vc index a271f8a0c8..95617ea89e 100644 --- a/samples/shaped/makefile.vc +++ b/samples/shaped/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/sockets/makefile.vc b/samples/sockets/makefile.vc index 2e36ec8ca2..535317b192 100644 --- a/samples/sockets/makefile.vc +++ b/samples/sockets/makefile.vc @@ -177,6 +177,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -189,6 +193,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/sound/makefile.vc b/samples/sound/makefile.vc index a6e3fe65da..f05c5c26fb 100644 --- a/samples/sound/makefile.vc +++ b/samples/sound/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/splash/makefile.vc b/samples/splash/makefile.vc index e2c91d03f1..32a4de2a08 100644 --- a/samples/splash/makefile.vc +++ b/samples/splash/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/splitter/makefile.vc b/samples/splitter/makefile.vc index 8324191cf7..77bf63a231 100644 --- a/samples/splitter/makefile.vc +++ b/samples/splitter/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/statbar/makefile.vc b/samples/statbar/makefile.vc index 7818080adf..c2b305b13a 100644 --- a/samples/statbar/makefile.vc +++ b/samples/statbar/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/stc/makefile.vc b/samples/stc/makefile.vc index 8c1b0b3db5..1052f3e6fa 100644 --- a/samples/stc/makefile.vc +++ b/samples/stc/makefile.vc @@ -142,6 +142,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -154,6 +158,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/svg/makefile.vc b/samples/svg/makefile.vc index cfff11b6e4..4f3e8a83fe 100644 --- a/samples/svg/makefile.vc +++ b/samples/svg/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/taborder/makefile.vc b/samples/taborder/makefile.vc index 50f52dd5a3..e6e3abe8c5 100644 --- a/samples/taborder/makefile.vc +++ b/samples/taborder/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/taskbar/makefile.vc b/samples/taskbar/makefile.vc index 3bc165da3e..43c198e407 100644 --- a/samples/taskbar/makefile.vc +++ b/samples/taskbar/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/taskbarbutton/makefile.vc b/samples/taskbarbutton/makefile.vc index 21c39244cc..12b0ca93b9 100644 --- a/samples/taskbarbutton/makefile.vc +++ b/samples/taskbarbutton/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/text/makefile.vc b/samples/text/makefile.vc index e6f3ea7387..cf59e03feb 100644 --- a/samples/text/makefile.vc +++ b/samples/text/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/thread/makefile.vc b/samples/thread/makefile.vc index 5083f68892..0d9d6cb64b 100644 --- a/samples/thread/makefile.vc +++ b/samples/thread/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/toolbar/makefile.vc b/samples/toolbar/makefile.vc index c3a28c9f16..05b8244690 100644 --- a/samples/toolbar/makefile.vc +++ b/samples/toolbar/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/treectrl/makefile.vc b/samples/treectrl/makefile.vc index a48ae3baf0..46c4a47c4f 100644 --- a/samples/treectrl/makefile.vc +++ b/samples/treectrl/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/treelist/makefile.vc b/samples/treelist/makefile.vc index 109bf8ea4e..0d67f8960b 100644 --- a/samples/treelist/makefile.vc +++ b/samples/treelist/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/typetest/makefile.vc b/samples/typetest/makefile.vc index fcc8826087..67a16642a9 100644 --- a/samples/typetest/makefile.vc +++ b/samples/typetest/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/uiaction/makefile.vc b/samples/uiaction/makefile.vc index 4a5615ba0c..ea7c8cd014 100644 --- a/samples/uiaction/makefile.vc +++ b/samples/uiaction/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/validate/makefile.vc b/samples/validate/makefile.vc index d861df318a..8fba975925 100644 --- a/samples/validate/makefile.vc +++ b/samples/validate/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/vscroll/makefile.vc b/samples/vscroll/makefile.vc index 323ff47c92..c2c962cec1 100644 --- a/samples/vscroll/makefile.vc +++ b/samples/vscroll/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/webrequest/makefile.vc b/samples/webrequest/makefile.vc index de8499edf2..4983306337 100644 --- a/samples/webrequest/makefile.vc +++ b/samples/webrequest/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/webview/makefile.vc b/samples/webview/makefile.vc index 5ca8b6006d..dd7b704a0a 100644 --- a/samples/webview/makefile.vc +++ b/samples/webview/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/widgets/makefile.vc b/samples/widgets/makefile.vc index 36a3c9b289..8401d18de5 100644 --- a/samples/widgets/makefile.vc +++ b/samples/widgets/makefile.vc @@ -171,6 +171,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -183,6 +187,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/wizard/makefile.vc b/samples/wizard/makefile.vc index 413659b51d..69b4590772 100644 --- a/samples/wizard/makefile.vc +++ b/samples/wizard/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/wrapsizer/makefile.vc b/samples/wrapsizer/makefile.vc index d74c45f528..f077afcaaf 100644 --- a/samples/wrapsizer/makefile.vc +++ b/samples/wrapsizer/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/xrc/makefile.vc b/samples/xrc/makefile.vc index 7bd624aa79..c6e8b88fa7 100644 --- a/samples/xrc/makefile.vc +++ b/samples/xrc/makefile.vc @@ -144,6 +144,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -156,6 +160,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/samples/xti/makefile.vc b/samples/xti/makefile.vc index 60cf34c967..06003770ca 100644 --- a/samples/xti/makefile.vc +++ b/samples/xti/makefile.vc @@ -142,6 +142,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -154,6 +158,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/tests/benchmarks/makefile.vc b/tests/benchmarks/makefile.vc index f3df9cc9d1..a42fda25de 100644 --- a/tests/benchmarks/makefile.vc +++ b/tests/benchmarks/makefile.vc @@ -176,6 +176,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -188,6 +192,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/tests/makefile.vc b/tests/makefile.vc index d22969911b..e2b2e744a9 100644 --- a/tests/makefile.vc +++ b/tests/makefile.vc @@ -395,6 +395,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -407,6 +411,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/utils/emulator/src/makefile.vc b/utils/emulator/src/makefile.vc index 1dde4e4c9d..49fe218ab4 100644 --- a/utils/emulator/src/makefile.vc +++ b/utils/emulator/src/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/utils/helpview/src/makefile.vc b/utils/helpview/src/makefile.vc index 4ac80d26ac..599de45da9 100644 --- a/utils/helpview/src/makefile.vc +++ b/utils/helpview/src/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/utils/hhp2cached/makefile.vc b/utils/hhp2cached/makefile.vc index cd21cdd73a..849b494ba3 100644 --- a/utils/hhp2cached/makefile.vc +++ b/utils/hhp2cached/makefile.vc @@ -140,6 +140,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -152,6 +156,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif diff --git a/utils/screenshotgen/src/makefile.vc b/utils/screenshotgen/src/makefile.vc index 2ad27ddb64..7f143e54f0 100644 --- a/utils/screenshotgen/src/makefile.vc +++ b/utils/screenshotgen/src/makefile.vc @@ -144,6 +144,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest +!endif !if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest @@ -156,6 +160,10 @@ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest !endif +!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" +WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ + /MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest +!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif