Rebake after parent commit changes

Makefile.in

@@ -3378,8 +3378,8 @@ COND_TOOLKIT_MSW_GUI_HDR =  \
 	wx/msw/ole/automtn.h \
 	wx/msw/ole/uuid.h \
 	wx/msw/wx.manifest \
-	wx/msw/amd64.manifest \
+	wx/msw/wx_dpi_aware.manifest \
-	wx/msw/ia64.manifest \
+	wx/msw/wx_dpi_aware_pmv2.manifest \
 	wx/msw/wx.rc \
 	wx/msw/colours.bmp \
 	wx/msw/csquery.bmp \

demos/bombs/makefile.vc

@@ -130,174 +130,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

demos/forty/makefile.vc

@@ -135,174 +135,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

demos/fractal/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

demos/life/makefile.vc

@@ -131,174 +131,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

demos/poem/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/access/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/animate/Makefile.in

@@ -51,8 +51,8 @@ ANITEST_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
 	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 ANITEST_OBJECTS =  \
-	anitest_anitest.o \
+	$(__anitest___win32rc) \
-	$(__anitest___win32rc)
+	anitest_anitest.o
 
 ### Conditionally set variables: ###
 
@@ -89,6 +89,7 @@ COND_PLATFORM_OS2_1___anitest___os2_emxbindcmd = $(NM) anitest$(EXEEXT) | if \
 @COND_PLATFORM_OS2_1@__anitest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___anitest___os2_emxbindcmd)
 @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__anitest___win32rc = anitest_sample_rc.o
 @COND_PLATFORM_MACOSX_1@__anitest_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@	= anitest.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__anitest_bundle___depname = anitest_bundle
@@ -108,7 +109,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_p = \
 COND_MONOLITHIC_0___WXLIB_BASE_p = \
 	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
-@COND_PLATFORM_WIN32_1@__anitest___win32rc = anitest_sample_rc.o
 COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
@@ -194,12 +194,12 @@ catalog:
 	esac; \
 	done
 
+anitest_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
 anitest_anitest.o: $(srcdir)/anitest.cpp
 	$(CXXC) -c -o $@ $(ANITEST_CXXFLAGS) $(srcdir)/anitest.cpp
 
-anitest_sample_rc.o: $(srcdir)/../sample.rc
-	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
-
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include ./.deps/*.d

samples/animate/anitest_vc8.vcproj

@@ -827,7 +827,7 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 			<File
-				RelativePath="..\sample.rc"
+				RelativePath="..\..\samples\sample.rc"
 				>
 			</File>
 		</Filter>

samples/animate/anitest_vc9.vcproj

@@ -799,7 +799,7 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 			<File
-				RelativePath="..\sample.rc"
+				RelativePath="..\..\samples\sample.rc"
 				>
 			</File>
 		</Filter>

samples/animate/makefile.gcc

@@ -29,8 +29,8 @@ ANITEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
 	-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
 	-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
 ANITEST_OBJECTS =  \
-	$(OBJS)\anitest_anitest.o \
+	$(OBJS)\anitest_sample_rc.o \
-	$(OBJS)\anitest_sample_rc.o
+	$(OBJS)\anitest_anitest.o
 
 ### Conditionally set variables: ###
 
@@ -224,12 +224,12 @@ catalog:
 	if not exist $(OBJS) mkdir $(OBJS)
 	for %%f in (throbber.gif hourglass.ani) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
 
+$(OBJS)\anitest_sample_rc.o: ./../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --define wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST) --include-dir ./../../samples --define NOPCH
+
 $(OBJS)\anitest_anitest.o: ./anitest.cpp
 	$(CXX) -c -o $@ $(ANITEST_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\anitest_sample_rc.o: ./../sample.rc
-	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --define wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST) --include-dir ./../../samples --define NOPCH
-
 .PHONY: all clean catalog
 
 

samples/animate/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif
@@ -569,9 +425,9 @@ catalog:
 	if not exist $(OBJS) mkdir $(OBJS)
 	for %f in (throbber.gif hourglass.ani) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
 
+$(OBJS)\anitest_sample.res: .\..\..\samples\sample.rc
+	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1)  $(__TARGET_CPU_COMPFLAG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1)  /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc
+
 $(OBJS)\anitest_anitest.obj: .\anitest.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ANITEST_CXXFLAGS) .\anitest.cpp
 
-$(OBJS)\anitest_sample.res: .\..\sample.rc
-	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1)  $(__TARGET_CPU_COMPFLAG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1)  /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc
-

samples/artprov/makefile.vc

@@ -129,174 +129,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/aui/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/calendar/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/caret/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/clipboard/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/collpane/Makefile.in

@@ -51,8 +51,8 @@ COLLPANE_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
 	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 COLLPANE_OBJECTS =  \
-	collpane_collpane.o \
+	$(__collpane___win32rc) \
-	$(__collpane___win32rc)
+	collpane_collpane.o
 
 ### Conditionally set variables: ###
 
@@ -89,6 +89,7 @@ COND_PLATFORM_OS2_1___collpane___os2_emxbindcmd = $(NM) collpane$(EXEEXT) | if \
 @COND_PLATFORM_OS2_1@__collpane___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___collpane___os2_emxbindcmd)
 @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__collpane___win32rc = collpane_sample_rc.o
 @COND_PLATFORM_MACOSX_1@__collpane_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@	= collpane.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__collpane_bundle___depname = collpane_bundle
@@ -108,7 +109,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_p = \
 COND_MONOLITHIC_0___WXLIB_BASE_p = \
 	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
-@COND_PLATFORM_WIN32_1@__collpane___win32rc = collpane_sample_rc.o
 COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
@@ -182,12 +182,12 @@ collpane$(EXEEXT): $(COLLPANE_OBJECTS) $(__collpane___win32rc)
 
 @COND_PLATFORM_MACOSX_1@collpane_bundle: $(____collpane_BUNDLE_TGT_REF_DEP)
 
+collpane_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
 collpane_collpane.o: $(srcdir)/collpane.cpp
 	$(CXXC) -c -o $@ $(COLLPANE_CXXFLAGS) $(srcdir)/collpane.cpp
 
-collpane_sample_rc.o: $(srcdir)/../sample.rc
-	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
-
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include ./.deps/*.d

samples/collpane/collpane_vc8.vcproj

@@ -817,7 +817,7 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 			<File
-				RelativePath="..\sample.rc"
+				RelativePath="..\..\samples\sample.rc"
 				>
 			</File>
 		</Filter>

samples/collpane/collpane_vc9.vcproj

@@ -789,7 +789,7 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 			<File
-				RelativePath="..\sample.rc"
+				RelativePath="..\..\samples\sample.rc"
 				>
 			</File>
 		</Filter>

samples/collpane/makefile.gcc

@@ -29,8 +29,8 @@ COLLPANE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
 	-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
 	-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
 COLLPANE_OBJECTS =  \
-	$(OBJS)\collpane_collpane.o \
+	$(OBJS)\collpane_sample_rc.o \
-	$(OBJS)\collpane_sample_rc.o
+	$(OBJS)\collpane_collpane.o
 
 ### Conditionally set variables: ###
 
@@ -220,12 +220,12 @@ $(OBJS)\collpane.exe: $(COLLPANE_OBJECTS) $(OBJS)\collpane_sample_rc.o
 	$(CXX) -o $@ @$@.rsp  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme
 	@-del $@.rsp
 
+$(OBJS)\collpane_sample_rc.o: ./../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --define wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST) --include-dir ./../../samples --define NOPCH
+
 $(OBJS)\collpane_collpane.o: ./collpane.cpp
 	$(CXX) -c -o $@ $(COLLPANE_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\collpane_sample_rc.o: ./../sample.rc
-	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --define wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST) --include-dir ./../../samples --define NOPCH
-
 .PHONY: all clean
 
 

samples/collpane/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif
@@ -565,9 +421,9 @@ $(OBJS)\collpane.exe: $(COLLPANE_OBJECTS) $(OBJS)\collpane_sample.res
 	$(COLLPANE_OBJECTS) $(COLLPANE_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib
 <<
 
+$(OBJS)\collpane_sample.res: .\..\..\samples\sample.rc
+	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1)  $(__TARGET_CPU_COMPFLAG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1)  /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc
+
 $(OBJS)\collpane_collpane.obj: .\collpane.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COLLPANE_CXXFLAGS) .\collpane.cpp
 
-$(OBJS)\collpane_sample.res: .\..\sample.rc
-	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1)  $(__TARGET_CPU_COMPFLAG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1)  /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc
-

samples/combo/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/config/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/dataview/Makefile.in

@@ -51,9 +51,9 @@ DATAVIEW_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
 	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 DATAVIEW_OBJECTS =  \
+	$(__dataview___win32rc) \
 	dataview_dataview.o \
-	dataview_mymodels.o \
+	dataview_mymodels.o
-	$(__dataview___win32rc)
 
 ### Conditionally set variables: ###
 
@@ -90,6 +90,7 @@ COND_PLATFORM_OS2_1___dataview___os2_emxbindcmd = $(NM) dataview$(EXEEXT) | if \
 @COND_PLATFORM_OS2_1@__dataview___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___dataview___os2_emxbindcmd)
 @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__dataview___win32rc = dataview_sample_rc.o
 @COND_PLATFORM_MACOSX_1@__dataview_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@	= dataview.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__dataview_bundle___depname = dataview_bundle
@@ -109,7 +110,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_p = \
 COND_MONOLITHIC_0___WXLIB_BASE_p = \
 	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
-@COND_PLATFORM_WIN32_1@__dataview___win32rc = dataview_sample_rc.o
 COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
@@ -183,15 +183,15 @@ dataview$(EXEEXT): $(DATAVIEW_OBJECTS) $(__dataview___win32rc)
 
 @COND_PLATFORM_MACOSX_1@dataview_bundle: $(____dataview_BUNDLE_TGT_REF_DEP)
 
+dataview_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
 dataview_dataview.o: $(srcdir)/dataview.cpp
 	$(CXXC) -c -o $@ $(DATAVIEW_CXXFLAGS) $(srcdir)/dataview.cpp
 
 dataview_mymodels.o: $(srcdir)/mymodels.cpp
 	$(CXXC) -c -o $@ $(DATAVIEW_CXXFLAGS) $(srcdir)/mymodels.cpp
 
-dataview_sample_rc.o: $(srcdir)/../sample.rc
-	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
-
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include ./.deps/*.d

samples/dataview/dataview_vc8.vcproj

@@ -831,7 +831,7 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 			<File
-				RelativePath="..\sample.rc"
+				RelativePath="..\..\samples\sample.rc"
 				>
 			</File>
 		</Filter>

samples/dataview/dataview_vc9.vcproj

@@ -803,7 +803,7 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 			<File
-				RelativePath="..\sample.rc"
+				RelativePath="..\..\samples\sample.rc"
 				>
 			</File>
 		</Filter>

samples/dataview/makefile.gcc

@@ -29,9 +29,9 @@ DATAVIEW_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
 	-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
 	-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
 DATAVIEW_OBJECTS =  \
+	$(OBJS)\dataview_sample_rc.o \
 	$(OBJS)\dataview_dataview.o \
-	$(OBJS)\dataview_mymodels.o \
+	$(OBJS)\dataview_mymodels.o
-	$(OBJS)\dataview_sample_rc.o
 
 ### Conditionally set variables: ###
 
@@ -221,15 +221,15 @@ $(OBJS)\dataview.exe: $(DATAVIEW_OBJECTS) $(OBJS)\dataview_sample_rc.o
 	$(CXX) -o $@ @$@.rsp  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme
 	@-del $@.rsp
 
+$(OBJS)\dataview_sample_rc.o: ./../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --define wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST) --include-dir ./../../samples --define NOPCH
+
 $(OBJS)\dataview_dataview.o: ./dataview.cpp
 	$(CXX) -c -o $@ $(DATAVIEW_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\dataview_mymodels.o: ./mymodels.cpp
 	$(CXX) -c -o $@ $(DATAVIEW_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\dataview_sample_rc.o: ./../sample.rc
-	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --define wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST) --include-dir ./../../samples --define NOPCH
-
 .PHONY: all clean
 
 

samples/dataview/makefile.vc

@@ -129,174 +129,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif
@@ -566,12 +422,12 @@ $(OBJS)\dataview.exe: $(DATAVIEW_OBJECTS) $(OBJS)\dataview_sample.res
 	$(DATAVIEW_OBJECTS) $(DATAVIEW_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib
 <<
 
+$(OBJS)\dataview_sample.res: .\..\..\samples\sample.rc
+	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1)  $(__TARGET_CPU_COMPFLAG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1)  /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc
+
 $(OBJS)\dataview_dataview.obj: .\dataview.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(DATAVIEW_CXXFLAGS) .\dataview.cpp
 
 $(OBJS)\dataview_mymodels.obj: .\mymodels.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(DATAVIEW_CXXFLAGS) .\mymodels.cpp
 
-$(OBJS)\dataview_sample.res: .\..\sample.rc
-	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1)  $(__TARGET_CPU_COMPFLAG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1)  /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc
-

samples/debugrpt/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/dialogs/makefile.vc

@@ -129,174 +129,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/dialup/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/display/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/dll/makefile.vc

@@ -148,174 +148,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/dnd/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/docview/makefile.vc

@@ -130,174 +130,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/dragimag/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/drawing/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/erase/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/event/makefile.vc

@@ -130,174 +130,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/except/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/exec/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/font/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/fswatcher/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/grid/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/help/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/htlbox/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/html/about/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/html/help/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/html/helpview/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/html/printing/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/html/test/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/html/virtual/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/html/widget/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/html/zip/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/image/makefile.vc

@@ -129,174 +129,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/internat/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/ipc/makefile.vc

@@ -167,174 +167,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/joytest/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/keyboard/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/layout/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/listctrl/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/mdi/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/mediaplayer/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/memcheck/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/menu/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/mfc/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/minimal/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/nativdlg/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/notebook/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/oleauto/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/opengl/cube/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/opengl/isosurf/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/opengl/penguin/makefile.vc

@@ -140,174 +140,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/opengl/pyramid/makefile.vc

@@ -131,174 +131,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/ownerdrw/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/popup/Makefile.in

@@ -51,8 +51,8 @@ POPUP_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
 	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 POPUP_OBJECTS =  \
-	popup_popup.o \
+	$(__popup___win32rc) \
-	$(__popup___win32rc)
+	popup_popup.o
 
 ### Conditionally set variables: ###
 
@@ -89,6 +89,7 @@ COND_PLATFORM_OS2_1___popup___os2_emxbindcmd = $(NM) popup$(EXEEXT) | if grep -q
 @COND_PLATFORM_OS2_1@__popup___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___popup___os2_emxbindcmd)
 @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__popup___win32rc = popup_sample_rc.o
 @COND_PLATFORM_MACOSX_1@__popup_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@	= popup.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__popup_bundle___depname = popup_bundle
@@ -108,7 +109,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_p = \
 COND_MONOLITHIC_0___WXLIB_BASE_p = \
 	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
-@COND_PLATFORM_WIN32_1@__popup___win32rc = popup_sample_rc.o
 COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
@@ -182,12 +182,12 @@ popup$(EXEEXT): $(POPUP_OBJECTS) $(__popup___win32rc)
 
 @COND_PLATFORM_MACOSX_1@popup_bundle: $(____popup_BUNDLE_TGT_REF_DEP)
 
+popup_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
 popup_popup.o: $(srcdir)/popup.cpp
 	$(CXXC) -c -o $@ $(POPUP_CXXFLAGS) $(srcdir)/popup.cpp
 
-popup_sample_rc.o: $(srcdir)/../sample.rc
-	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
-
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include ./.deps/*.d

samples/popup/makefile.gcc

@@ -29,8 +29,8 @@ POPUP_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
 	-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
 	-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
 POPUP_OBJECTS =  \
-	$(OBJS)\popup_popup.o \
+	$(OBJS)\popup_sample_rc.o \
-	$(OBJS)\popup_sample_rc.o
+	$(OBJS)\popup_popup.o
 
 ### Conditionally set variables: ###
 
@@ -220,12 +220,12 @@ $(OBJS)\popup.exe: $(POPUP_OBJECTS) $(OBJS)\popup_sample_rc.o
 	$(CXX) -o $@ @$@.rsp  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme
 	@-del $@.rsp
 
+$(OBJS)\popup_sample_rc.o: ./../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --define wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST) --include-dir ./../../samples --define NOPCH
+
 $(OBJS)\popup_popup.o: ./popup.cpp
 	$(CXX) -c -o $@ $(POPUP_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\popup_sample_rc.o: ./../sample.rc
-	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --define wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST) --include-dir ./../../samples --define NOPCH
-
 .PHONY: all clean
 
 

samples/popup/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif
@@ -565,9 +421,9 @@ $(OBJS)\popup.exe: $(POPUP_OBJECTS) $(OBJS)\popup_sample.res
 	$(POPUP_OBJECTS) $(POPUP_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib
 <<
 
+$(OBJS)\popup_sample.res: .\..\..\samples\sample.rc
+	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1)  $(__TARGET_CPU_COMPFLAG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1)  /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc
+
 $(OBJS)\popup_popup.obj: .\popup.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(POPUP_CXXFLAGS) .\popup.cpp
 
-$(OBJS)\popup_sample.res: .\..\sample.rc
-	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1)  $(__TARGET_CPU_COMPFLAG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1)  /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc
-

samples/popup/popup_vc8.vcproj

@@ -817,7 +817,7 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 			<File
-				RelativePath="..\sample.rc"
+				RelativePath="..\..\samples\sample.rc"
 				>
 			</File>
 		</Filter>

samples/popup/popup_vc9.vcproj

@@ -789,7 +789,7 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 			<File
-				RelativePath="..\sample.rc"
+				RelativePath="..\..\samples\sample.rc"
 				>
 			</File>
 		</Filter>

samples/power/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/preferences/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/printing/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/propgrid/Makefile.in

@@ -51,11 +51,11 @@ PROPGRID_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
 	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 PROPGRID_OBJECTS =  \
+	$(__propgrid___win32rc) \
 	propgrid_propgrid.o \
 	propgrid_propgrid_minimal.o \
 	propgrid_sampleprops.o \
-	propgrid_tests.o \
+	propgrid_tests.o
-	$(__propgrid___win32rc)
 
 ### Conditionally set variables: ###
 
@@ -92,6 +92,7 @@ COND_PLATFORM_OS2_1___propgrid___os2_emxbindcmd = $(NM) propgrid$(EXEEXT) | if \
 @COND_PLATFORM_OS2_1@__propgrid___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___propgrid___os2_emxbindcmd)
 @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__propgrid___win32rc = propgrid_sample_rc.o
 @COND_PLATFORM_MACOSX_1@__propgrid_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@	= propgrid.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__propgrid_bundle___depname = propgrid_bundle
@@ -114,7 +115,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_p = \
 COND_MONOLITHIC_0___WXLIB_BASE_p = \
 	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
-@COND_PLATFORM_WIN32_1@__propgrid___win32rc = propgrid_sample_rc.o
 COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
@@ -188,6 +188,9 @@ propgrid$(EXEEXT): $(PROPGRID_OBJECTS) $(__propgrid___win32rc)
 
 @COND_PLATFORM_MACOSX_1@propgrid_bundle: $(____propgrid_BUNDLE_TGT_REF_DEP)
 
+propgrid_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
 propgrid_propgrid.o: $(srcdir)/propgrid.cpp
 	$(CXXC) -c -o $@ $(PROPGRID_CXXFLAGS) $(srcdir)/propgrid.cpp
 
@@ -200,9 +203,6 @@ propgrid_sampleprops.o: $(srcdir)/sampleprops.cpp
 propgrid_tests.o: $(srcdir)/tests.cpp
 	$(CXXC) -c -o $@ $(PROPGRID_CXXFLAGS) $(srcdir)/tests.cpp
 
-propgrid_sample_rc.o: $(srcdir)/../sample.rc
-	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
-
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include ./.deps/*.d

samples/propgrid/makefile.gcc

@@ -29,11 +29,11 @@ PROPGRID_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
 	-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
 	-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
 PROPGRID_OBJECTS =  \
+	$(OBJS)\propgrid_sample_rc.o \
 	$(OBJS)\propgrid_propgrid.o \
 	$(OBJS)\propgrid_propgrid_minimal.o \
 	$(OBJS)\propgrid_sampleprops.o \
-	$(OBJS)\propgrid_tests.o \
+	$(OBJS)\propgrid_tests.o
-	$(OBJS)\propgrid_sample_rc.o
 
 ### Conditionally set variables: ###
 
@@ -227,6 +227,9 @@ $(OBJS)\propgrid.exe: $(PROPGRID_OBJECTS) $(OBJS)\propgrid_sample_rc.o
 	$(CXX) -o $@ @$@.rsp  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_PROPGRID_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme
 	@-del $@.rsp
 
+$(OBJS)\propgrid_sample_rc.o: ./../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --define wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST) --include-dir ./../../samples --define NOPCH
+
 $(OBJS)\propgrid_propgrid.o: ./propgrid.cpp
 	$(CXX) -c -o $@ $(PROPGRID_CXXFLAGS) $(CPPDEPS) $<
 
@@ -239,9 +242,6 @@ $(OBJS)\propgrid_sampleprops.o: ./sampleprops.cpp
 $(OBJS)\propgrid_tests.o: ./tests.cpp
 	$(CXX) -c -o $@ $(PROPGRID_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\propgrid_sample_rc.o: ./../sample.rc
-	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --define wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST) --include-dir ./../../samples --define NOPCH
-
 .PHONY: all clean
 
 

samples/propgrid/makefile.vc

@@ -131,174 +131,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif
@@ -572,6 +428,9 @@ $(OBJS)\propgrid.exe: $(PROPGRID_OBJECTS) $(OBJS)\propgrid_sample.res
 	$(PROPGRID_OBJECTS) $(PROPGRID_RESOURCES)  $(__WXLIB_PROPGRID_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib
 <<
 
+$(OBJS)\propgrid_sample.res: .\..\..\samples\sample.rc
+	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1)  $(__TARGET_CPU_COMPFLAG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1)  /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc
+
 $(OBJS)\propgrid_propgrid.obj: .\propgrid.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(PROPGRID_CXXFLAGS) .\propgrid.cpp
 
@@ -584,6 +443,3 @@ $(OBJS)\propgrid_sampleprops.obj: .\sampleprops.cpp
 $(OBJS)\propgrid_tests.obj: .\tests.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(PROPGRID_CXXFLAGS) .\tests.cpp
 
-$(OBJS)\propgrid_sample.res: .\..\sample.rc
-	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1)  $(__TARGET_CPU_COMPFLAG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1)  /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc
-

samples/propgrid/propgrid_vc8.vcproj

@@ -843,7 +843,7 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 			<File
-				RelativePath="..\sample.rc"
+				RelativePath="..\..\samples\sample.rc"
 				>
 			</File>
 		</Filter>

samples/propgrid/propgrid_vc9.vcproj

@@ -815,7 +815,7 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 			<File
-				RelativePath="..\sample.rc"
+				RelativePath="..\..\samples\sample.rc"
 				>
 			</File>
 		</Filter>

samples/regtest/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/render/makefile.vc

@@ -147,174 +147,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif

samples/ribbon/Makefile.in

@@ -51,8 +51,8 @@ RIBBON_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
 	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 RIBBON_OBJECTS =  \
-	ribbon_ribbondemo.o \
+	$(__ribbon___win32rc) \
-	$(__ribbon___win32rc)
+	ribbon_ribbondemo.o
 
 ### Conditionally set variables: ###
 
@@ -89,6 +89,7 @@ COND_PLATFORM_OS2_1___ribbon___os2_emxbindcmd = $(NM) ribbon$(EXEEXT) | if grep
 @COND_PLATFORM_OS2_1@__ribbon___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___ribbon___os2_emxbindcmd)
 @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__ribbon___win32rc = ribbon_sample_rc.o
 @COND_PLATFORM_MACOSX_1@__ribbon_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@	= ribbon.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__ribbon_bundle___depname = ribbon_bundle
@@ -111,7 +112,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_p = \
 COND_MONOLITHIC_0___WXLIB_BASE_p = \
 	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
-@COND_PLATFORM_WIN32_1@__ribbon___win32rc = ribbon_sample_rc.o
 COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
@@ -185,12 +185,12 @@ ribbon$(EXEEXT): $(RIBBON_OBJECTS) $(__ribbon___win32rc)
 
 @COND_PLATFORM_MACOSX_1@ribbon_bundle: $(____ribbon_BUNDLE_TGT_REF_DEP)
 
+ribbon_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
 ribbon_ribbondemo.o: $(srcdir)/ribbondemo.cpp
 	$(CXXC) -c -o $@ $(RIBBON_CXXFLAGS) $(srcdir)/ribbondemo.cpp
 
-ribbon_sample_rc.o: $(srcdir)/../sample.rc
-	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
-
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include ./.deps/*.d

samples/ribbon/makefile.gcc

@@ -29,8 +29,8 @@ RIBBON_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
 	-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
 	-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
 RIBBON_OBJECTS =  \
-	$(OBJS)\ribbon_ribbondemo.o \
+	$(OBJS)\ribbon_sample_rc.o \
-	$(OBJS)\ribbon_sample_rc.o
+	$(OBJS)\ribbon_ribbondemo.o
 
 ### Conditionally set variables: ###
 
@@ -224,12 +224,12 @@ $(OBJS)\ribbon.exe: $(RIBBON_OBJECTS) $(OBJS)\ribbon_sample_rc.o
 	$(CXX) -o $@ @$@.rsp  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_RIBBON_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme
 	@-del $@.rsp
 
+$(OBJS)\ribbon_sample_rc.o: ./../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --define wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST) --include-dir ./../../samples --define NOPCH
+
 $(OBJS)\ribbon_ribbondemo.o: ./ribbondemo.cpp
 	$(CXX) -c -o $@ $(RIBBON_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\ribbon_sample_rc.o: ./../sample.rc
-	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --define wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST) --include-dir ./../../samples --define NOPCH
-
 .PHONY: all clean
 
 

samples/ribbon/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif
@@ -569,9 +425,9 @@ $(OBJS)\ribbon.exe: $(RIBBON_OBJECTS) $(OBJS)\ribbon_sample.res
 	$(RIBBON_OBJECTS) $(RIBBON_RESOURCES)  $(__WXLIB_RIBBON_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib
 <<
 
+$(OBJS)\ribbon_sample.res: .\..\..\samples\sample.rc
+	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1)  $(__TARGET_CPU_COMPFLAG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1)  /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc
+
 $(OBJS)\ribbon_ribbondemo.obj: .\ribbondemo.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(RIBBON_CXXFLAGS) .\ribbondemo.cpp
 
-$(OBJS)\ribbon_sample.res: .\..\sample.rc
-	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1)  $(__TARGET_CPU_COMPFLAG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1)  /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc
-

samples/ribbon/ribbon_vc8.vcproj

@@ -817,7 +817,7 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 			<File
-				RelativePath="..\sample.rc"
+				RelativePath="..\..\samples\sample.rc"
 				>
 			</File>
 		</Filter>

samples/ribbon/ribbon_vc9.vcproj

@@ -789,7 +789,7 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 			<File
-				RelativePath="..\sample.rc"
+				RelativePath="..\..\samples\sample.rc"
 				>
 			</File>
 		</Filter>

samples/richtext/Makefile.in

@@ -52,8 +52,8 @@ RICHTEXT_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
 	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 RICHTEXT_OBJECTS =  \
-	richtext_richtext.o \
+	$(__richtext___win32rc) \
-	$(__richtext___win32rc)
+	richtext_richtext.o
 
 ### Conditionally set variables: ###
 
@@ -90,6 +90,7 @@ COND_PLATFORM_OS2_1___richtext___os2_emxbindcmd = $(NM) richtext$(EXEEXT) | if \
 @COND_PLATFORM_OS2_1@__richtext___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___richtext___os2_emxbindcmd)
 @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__richtext___win32rc = richtext_sample_rc.o
 @COND_PLATFORM_MACOSX_1@__richtext_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@	= richtext.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__richtext_bundle___depname = richtext_bundle
@@ -118,7 +119,6 @@ COND_MONOLITHIC_0___WXLIB_XML_p = \
 COND_MONOLITHIC_0___WXLIB_BASE_p = \
 	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
-@COND_PLATFORM_WIN32_1@__richtext___win32rc = richtext_sample_rc.o
 COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
@@ -192,12 +192,12 @@ richtext$(EXEEXT): $(RICHTEXT_OBJECTS) $(__richtext___win32rc)
 
 @COND_PLATFORM_MACOSX_1@richtext_bundle: $(____richtext_BUNDLE_TGT_REF_DEP)
 
+richtext_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
 richtext_richtext.o: $(srcdir)/richtext.cpp
 	$(CXXC) -c -o $@ $(RICHTEXT_CXXFLAGS) $(srcdir)/richtext.cpp
 
-richtext_sample_rc.o: $(srcdir)/../sample.rc
-	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
-
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include ./.deps/*.d

samples/richtext/makefile.gcc

@@ -29,8 +29,8 @@ RICHTEXT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
 	-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
 	-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
 RICHTEXT_OBJECTS =  \
-	$(OBJS)\richtext_richtext.o \
+	$(OBJS)\richtext_sample_rc.o \
-	$(OBJS)\richtext_sample_rc.o
+	$(OBJS)\richtext_richtext.o
 
 ### Conditionally set variables: ###
 
@@ -232,12 +232,12 @@ $(OBJS)\richtext.exe: $(RICHTEXT_OBJECTS) $(OBJS)\richtext_sample_rc.o
 	$(CXX) -o $@ @$@.rsp  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_RICHTEXT_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme
 	@-del $@.rsp
 
+$(OBJS)\richtext_sample_rc.o: ./../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --define wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST) --include-dir ./../../samples --define NOPCH
+
 $(OBJS)\richtext_richtext.o: ./richtext.cpp
 	$(CXX) -c -o $@ $(RICHTEXT_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\richtext_sample_rc.o: ./../sample.rc
-	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --define wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST) --include-dir ./../../samples --define NOPCH
-
 .PHONY: all clean
 
 

samples/richtext/makefile.vc

@@ -128,174 +128,30 @@ LINK_TARGET_CPU = /MACHINE:IA64
 !if "$(TARGET_CPU)" == "x64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
+!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
 WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
 	/MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest
 !endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "x64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "14.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "15.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
-!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOPLATFORM)" == "X64" && "$(VISUALSTUDIOVERSION)" == "16.0"
-WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
-	/MANIFESTINPUT:./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
-!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif
@@ -577,9 +433,9 @@ $(OBJS)\richtext.exe: $(RICHTEXT_OBJECTS) $(OBJS)\richtext_sample.res
 	$(RICHTEXT_OBJECTS) $(RICHTEXT_RESOURCES)  $(__WXLIB_RICHTEXT_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib
 <<
 
+$(OBJS)\richtext_sample.res: .\..\..\samples\sample.rc
+	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1)  $(__TARGET_CPU_COMPFLAG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1)  /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc
+
 $(OBJS)\richtext_richtext.obj: .\richtext.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(RICHTEXT_CXXFLAGS) .\richtext.cpp
 
-$(OBJS)\richtext_sample.res: .\..\sample.rc
-	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1)  $(__TARGET_CPU_COMPFLAG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1)  /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc
-

samples/richtext/richtext_vc8.vcproj

@@ -817,7 +817,7 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 			<File
-				RelativePath="..\sample.rc"
+				RelativePath="..\..\samples\sample.rc"
 				>
 			</File>
 		</Filter>