diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 8708269484..60b725d4fd 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -332,31 +332,31 @@
- /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/wx-dpi-aware.manifest
+ /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/wx_dpi_aware.manifest
- /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64-dpi-aware.manifest
+ /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware.manifest
- /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/wx-dpi-aware-pmv2.manifest
+ /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/wx_dpi_aware_pmv2.manifest
- /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64-dpi-aware-pmv2.manifest
+ /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware_pmv2.manifest
- /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/wx-dpi-aware.manifest
+ /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/wx_dpi_aware.manifest
- /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64-dpi-aware.manifest
- /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64-dpi-aware.manifest
- /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64-dpi-aware.manifest
- /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64-dpi-aware.manifest
+ /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware.manifest
+ /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware.manifest
+ /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware.manifest
+ /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware.manifest
- /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/wx-dpi-aware-pmv2.manifest
+ /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/wx_dpi_aware_pmv2.manifest
- /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64-dpi-aware-pmv2.manifest
- /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64-dpi-aware-pmv2.manifest
- /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64-dpi-aware-pmv2.manifest
- /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64-dpi-aware-pmv2.manifest
+ /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware_pmv2.manifest
+ /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware_pmv2.manifest
+ /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware_pmv2.manifest
+ /MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware_pmv2.manifest
diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake
index fa412910e0..d25937dfca 100644
--- a/build/cmake/functions.cmake
+++ b/build/cmake/functions.cmake
@@ -671,10 +671,10 @@ function(wx_add_sample name)
set(wxUSE_DPI_AWARE_MANIFEST_VALUE 0)
if (${wxUSE_DPI_AWARE_MANIFEST} MATCHES "system")
set(wxUSE_DPI_AWARE_MANIFEST_VALUE 1)
- list(APPEND src_files "${wxSOURCE_DIR}/include/wx/msw/${wxDPI_MANIFEST_PRFIX}-dpi-aware.manifest")
+ list(APPEND src_files "${wxSOURCE_DIR}/include/wx/msw/${wxDPI_MANIFEST_PRFIX}_dpi_aware.manifest")
elseif(${wxUSE_DPI_AWARE_MANIFEST} MATCHES "per-monitor")
set(wxUSE_DPI_AWARE_MANIFEST_VALUE 2)
- list(APPEND src_files "${wxSOURCE_DIR}/include/wx/msw/${wxDPI_MANIFEST_PRFIX}-dpi-aware-pmv2.manifest")
+ list(APPEND src_files "${wxSOURCE_DIR}/include/wx/msw/${wxDPI_MANIFEST_PRFIX}_dpi_aware_pmv2.manifest")
endif()
endif()
diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index 24ee01904b..d5bb450255 100644
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -1879,43 +1879,43 @@ LINK_TARGET_CPU = /MACHINE:X64
!endif
!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1"
WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
- /MANIFESTINPUT:../../include/wx/msw/wx-dpi-aware.manifest
+ /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware.manifest
!endif
!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1"
WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
- /MANIFESTINPUT:../../include/wx/msw/amd64-dpi-aware.manifest
+ /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware.manifest
!endif
!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1"
WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
- /MANIFESTINPUT:../../include/wx/msw/amd64-dpi-aware.manifest
+ /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware.manifest
!endif
!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1"
WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
- /MANIFESTINPUT:../../include/wx/msw/amd64-dpi-aware.manifest
+ /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware.manifest
!endif
!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1"
WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
- /MANIFESTINPUT:../../include/wx/msw/amd64-dpi-aware.manifest
+ /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware.manifest
!endif
!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2"
WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
- /MANIFESTINPUT:../../include/wx/msw/wx-dpi-aware-pmv2.manifest
+ /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest
!endif
!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2"
WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
- /MANIFESTINPUT:../../include/wx/msw/amd64-dpi-aware-pmv2.manifest
+ /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
!endif
!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2"
WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
- /MANIFESTINPUT:../../include/wx/msw/amd64-dpi-aware-pmv2.manifest
+ /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
!endif
!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2"
WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
- /MANIFESTINPUT:../../include/wx/msw/amd64-dpi-aware-pmv2.manifest
+ /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
!endif
!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2"
WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
- /MANIFESTINPUT:../../include/wx/msw/amd64-dpi-aware-pmv2.manifest
+ /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest
!endif
!if "$(RUNTIME_LIBS)" == "dynamic"
__RUNTIME_LIBS_10 = D
diff --git a/build/msw/wx_vc7_adv.vcproj b/build/msw/wx_vc7_adv.vcproj
index 4e896243e7..ceaeb1d96e 100644
--- a/build/msw/wx_vc7_adv.vcproj
+++ b/build/msw/wx_vc7_adv.vcproj
@@ -165,7 +165,7 @@
Name="VCCustomBuildTool"/>
true
- ./../../include/wx/msw/wx-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)
+ ./../../include/wx/msw/wx_dpi_aware_pmv2.manifest %(AdditionalManifestFiles)
@@ -200,7 +200,7 @@
true
- ./../../include/wx/msw/wx-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)
+ ./../../include/wx/msw/wx_dpi_aware_pmv2.manifest %(AdditionalManifestFiles)
@@ -239,7 +239,7 @@
true
- ./../../include/wx/msw/wx-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)
+ ./../../include/wx/msw/wx_dpi_aware_pmv2.manifest %(AdditionalManifestFiles)
@@ -278,7 +278,7 @@
true
- ./../../include/wx/msw/wx-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)
+ ./../../include/wx/msw/wx_dpi_aware_pmv2.manifest %(AdditionalManifestFiles)
@@ -317,7 +317,7 @@
true
- ./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)
+ ./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest %(AdditionalManifestFiles)
@@ -356,7 +356,7 @@
true
- ./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)
+ ./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest %(AdditionalManifestFiles)
@@ -395,7 +395,7 @@
true
- ./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)
+ ./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest %(AdditionalManifestFiles)
@@ -434,7 +434,7 @@
true
- ./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)
+ ./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest %(AdditionalManifestFiles)
@@ -446,4 +446,4 @@
-
\ No newline at end of file
+
diff --git a/samples/minimal/minimal_vc7.vcproj b/samples/minimal/minimal_vc7.vcproj
index 0e0ec96321..abdf41c6c3 100644
--- a/samples/minimal/minimal_vc7.vcproj
+++ b/samples/minimal/minimal_vc7.vcproj
@@ -45,7 +45,7 @@
Name="VCCustomBuildTool"/>
true
- ./../include/wx/msw/wx-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)
+ ./../include/wx/msw/wx_dpi_aware_pmv2.manifest %(AdditionalManifestFiles)
@@ -209,7 +209,7 @@
true
- ./../include/wx/msw/wx-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)
+ ./../include/wx/msw/wx_dpi_aware_pmv2.manifest %(AdditionalManifestFiles)
@@ -252,7 +252,7 @@
true
- ./../include/wx/msw/wx-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)
+ ./../include/wx/msw/wx_dpi_aware_pmv2.manifest %(AdditionalManifestFiles)
@@ -295,7 +295,7 @@
true
- ./../include/wx/msw/wx-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)
+ ./../include/wx/msw/wx_dpi_aware_pmv2.manifest %(AdditionalManifestFiles)
@@ -338,7 +338,7 @@
true
- ./../include/wx/msw/amd64-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)
+ ./../include/wx/msw/amd64_dpi_aware_pmv2.manifest %(AdditionalManifestFiles)
@@ -381,7 +381,7 @@
true
- ./../include/wx/msw/amd64-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)
+ ./../include/wx/msw/amd64_dpi_aware_pmv2.manifest %(AdditionalManifestFiles)
@@ -424,7 +424,7 @@
true
- ./../include/wx/msw/amd64-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)
+ ./../include/wx/msw/amd64_dpi_aware_pmv2.manifest %(AdditionalManifestFiles)
@@ -467,7 +467,7 @@
true
- ./../include/wx/msw/amd64-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)
+ ./../include/wx/msw/amd64_dpi_aware_pmv2.manifest %(AdditionalManifestFiles)
@@ -570,4 +570,4 @@
-
\ No newline at end of file
+
diff --git a/tests/test_gui.vcxproj b/tests/test_gui.vcxproj
index 32e455cf88..754fdb8d44 100644
--- a/tests/test_gui.vcxproj
+++ b/tests/test_gui.vcxproj
@@ -165,7 +165,7 @@
true
- ./../include/wx/msw/wx-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)
+ ./../include/wx/msw/wx_dpi_aware_pmv2.manifest %(AdditionalManifestFiles)
@@ -208,7 +208,7 @@
true
- ./../include/wx/msw/wx-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)
+ ./../include/wx/msw/wx_dpi_aware_pmv2.manifest %(AdditionalManifestFiles)
@@ -251,7 +251,7 @@
true
- ./../include/wx/msw/wx-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)
+ ./../include/wx/msw/wx_dpi_aware_pmv2.manifest %(AdditionalManifestFiles)
@@ -294,7 +294,7 @@
true
- ./../include/wx/msw/wx-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)
+ ./../include/wx/msw/wx_dpi_aware_pmv2.manifest %(AdditionalManifestFiles)
@@ -337,7 +337,7 @@
true
- ./../include/wx/msw/amd64-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)
+ ./../include/wx/msw/amd64_dpi_aware_pmv2.manifest %(AdditionalManifestFiles)
@@ -380,7 +380,7 @@
true
- ./../include/wx/msw/amd64-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)
+ ./../include/wx/msw/amd64_dpi_aware_pmv2.manifest %(AdditionalManifestFiles)
@@ -423,7 +423,7 @@
true
- ./../include/wx/msw/amd64-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)
+ ./../include/wx/msw/amd64_dpi_aware_pmv2.manifest %(AdditionalManifestFiles)
@@ -466,7 +466,7 @@
true
- ./../include/wx/msw/amd64-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)
+ ./../include/wx/msw/amd64_dpi_aware_pmv2.manifest %(AdditionalManifestFiles)
diff --git a/tests/test_vc7_test.vcproj b/tests/test_vc7_test.vcproj
index 5b59b312fb..b41cf68d57 100644
--- a/tests/test_vc7_test.vcproj
+++ b/tests/test_vc7_test.vcproj
@@ -48,7 +48,7 @@
Name="VCCustomBuildTool"/>
true
- ./../../include/wx/msw/wx-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)
+ ./../../include/wx/msw/wx_dpi_aware_pmv2.manifest %(AdditionalManifestFiles)
@@ -200,7 +200,7 @@
true
- ./../../include/wx/msw/wx-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)
+ ./../../include/wx/msw/wx_dpi_aware_pmv2.manifest %(AdditionalManifestFiles)
@@ -239,7 +239,7 @@
true
- ./../../include/wx/msw/wx-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)
+ ./../../include/wx/msw/wx_dpi_aware_pmv2.manifest %(AdditionalManifestFiles)
@@ -278,7 +278,7 @@
true
- ./../../include/wx/msw/wx-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)
+ ./../../include/wx/msw/wx_dpi_aware_pmv2.manifest %(AdditionalManifestFiles)
@@ -317,7 +317,7 @@
true
- ./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)
+ ./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest %(AdditionalManifestFiles)
@@ -356,7 +356,7 @@
true
- ./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)
+ ./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest %(AdditionalManifestFiles)
@@ -395,7 +395,7 @@
true
- ./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)
+ ./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest %(AdditionalManifestFiles)
@@ -434,7 +434,7 @@
true
- ./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)
+ ./../../include/wx/msw/amd64_dpi_aware_pmv2.manifest %(AdditionalManifestFiles)
@@ -443,4 +443,4 @@
-
\ No newline at end of file
+
diff --git a/utils/wxrc/wxrc_vc7.vcproj b/utils/wxrc/wxrc_vc7.vcproj
index 4f55f4c89f..9b75a702c7 100644
--- a/utils/wxrc/wxrc_vc7.vcproj
+++ b/utils/wxrc/wxrc_vc7.vcproj
@@ -45,7 +45,7 @@
Name="VCCustomBuildTool"/>