Rebake after changes

sunny868 · Mar 27, 2020 · 343bd89 · 343bd89
1 parent 3978733
commit 343bd89
Show file tree

Hide file tree

Showing 545 changed files with 22,479 additions and 4,507 deletions.
diff --git a/build/msw/config.vc b/build/msw/config.vc
@@ -56,6 +56,12 @@ BUILD = debug
 # (AMD64 accepted as synonym for X64 but should not be used any more). 
 TARGET_CPU = $(CPU)
 
+# Visual Studio version set by the VS command prompt. 
+VISUALSTUDIOVERSION = $(VISUALSTUDIOVERSION)
+
+# Platform architecture set by the VS command prompt. 
+VISUALSTUDIOPLATFORM = $(PLATFORM)
+
 # Should debugging info be included in the executables? The default value
 # "default" means that debug info will be included if BUILD=debug
 # and not included if BUILD=release. [0,1,default]

diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
diff --git a/build/msw/wx_vc7_adv.vcproj b/build/msw/wx_vc7_adv.vcproj
@@ -165,7 +165,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
+				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   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 wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
 				OutputFile="..\..\lib\vc_dll\wxmsw314ud_adv_vc_custom.dll"
 				LinkIncremental="2"
@@ -230,7 +230,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
+				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   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 wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
 				OutputFile="..\..\lib\vc_dll\wxmsw314u_adv_vc_custom.dll"
 				LinkIncremental="1"

diff --git a/build/msw/wx_vc7_aui.vcproj b/build/msw/wx_vc7_aui.vcproj
@@ -165,7 +165,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
+				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   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 wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
 				OutputFile="..\..\lib\vc_dll\wxmsw314ud_aui_vc_custom.dll"
 				LinkIncremental="2"
@@ -230,7 +230,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
+				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   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 wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
 				OutputFile="..\..\lib\vc_dll\wxmsw314u_aui_vc_custom.dll"
 				LinkIncremental="1"

diff --git a/build/msw/wx_vc7_base.vcproj b/build/msw/wx_vc7_base.vcproj
@@ -165,7 +165,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
+				AdditionalOptions=""
 				AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib   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 wsock32.lib wininet.lib"
 				OutputFile="..\..\lib\vc_dll\wxbase314ud_vc_custom.dll"
 				LinkIncremental="2"
@@ -230,7 +230,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
+				AdditionalOptions=""
 				AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib   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 wsock32.lib wininet.lib"
 				OutputFile="..\..\lib\vc_dll\wxbase314u_vc_custom.dll"
 				LinkIncremental="1"

diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj
@@ -165,7 +165,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
+				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   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 wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31ud.lib"
 				OutputFile="..\..\lib\vc_dll\wxmsw314ud_core_vc_custom.dll"
 				LinkIncremental="2"
@@ -230,7 +230,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
+				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   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 wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31u.lib"
 				OutputFile="..\..\lib\vc_dll\wxmsw314u_core_vc_custom.dll"
 				LinkIncremental="1"

diff --git a/build/msw/wx_vc7_gl.vcproj b/build/msw/wx_vc7_gl.vcproj
@@ -165,7 +165,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
+				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   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 wsock32.lib wininet.lib wxmsw31ud_core.lib wxbase31ud.lib  opengl32.lib glu32.lib"
 				OutputFile="..\..\lib\vc_dll\wxmsw314ud_gl_vc_custom.dll"
 				LinkIncremental="2"
@@ -230,7 +230,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
+				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   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 wsock32.lib wininet.lib wxmsw31u_core.lib wxbase31u.lib  opengl32.lib glu32.lib"
 				OutputFile="..\..\lib\vc_dll\wxmsw314u_gl_vc_custom.dll"
 				LinkIncremental="1"

diff --git a/build/msw/wx_vc7_html.vcproj b/build/msw/wx_vc7_html.vcproj
@@ -165,7 +165,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
+				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   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 wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
 				OutputFile="..\..\lib\vc_dll\wxmsw314ud_html_vc_custom.dll"
 				LinkIncremental="2"
@@ -230,7 +230,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
+				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   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 wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
 				OutputFile="..\..\lib\vc_dll\wxmsw314u_html_vc_custom.dll"
 				LinkIncremental="1"

diff --git a/build/msw/wx_vc7_media.vcproj b/build/msw/wx_vc7_media.vcproj
@@ -165,7 +165,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
+				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   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 wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
 				OutputFile="..\..\lib\vc_dll\wxmsw314ud_media_vc_custom.dll"
 				LinkIncremental="2"
@@ -230,7 +230,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
+				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   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 wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
 				OutputFile="..\..\lib\vc_dll\wxmsw314u_media_vc_custom.dll"
 				LinkIncremental="1"

diff --git a/build/msw/wx_vc7_net.vcproj b/build/msw/wx_vc7_net.vcproj
@@ -165,7 +165,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
+				AdditionalOptions=""
 				AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib   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 wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31ud.lib"
 				OutputFile="..\..\lib\vc_dll\wxbase314ud_net_vc_custom.dll"
 				LinkIncremental="2"
@@ -230,7 +230,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
+				AdditionalOptions=""
 				AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib   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 wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31u.lib"
 				OutputFile="..\..\lib\vc_dll\wxbase314u_net_vc_custom.dll"
 				LinkIncremental="1"

diff --git a/build/msw/wx_vc7_propgrid.vcproj b/build/msw/wx_vc7_propgrid.vcproj
@@ -165,7 +165,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
+				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   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 wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
 				OutputFile="..\..\lib\vc_dll\wxmsw314ud_propgrid_vc_custom.dll"
 				LinkIncremental="2"
@@ -230,7 +230,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
+				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   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 wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
 				OutputFile="..\..\lib\vc_dll\wxmsw314u_propgrid_vc_custom.dll"
 				LinkIncremental="1"

diff --git a/build/msw/wx_vc7_qa.vcproj b/build/msw/wx_vc7_qa.vcproj
@@ -165,7 +165,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
+				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   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 wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib"
 				OutputFile="..\..\lib\vc_dll\wxmsw314ud_qa_vc_custom.dll"
 				LinkIncremental="2"
@@ -230,7 +230,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
+				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   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 wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib ..\..\lib\vc_dll\wxbase31u_xml.lib"
 				OutputFile="..\..\lib\vc_dll\wxmsw314u_qa_vc_custom.dll"
 				LinkIncremental="1"

diff --git a/build/msw/wx_vc7_ribbon.vcproj b/build/msw/wx_vc7_ribbon.vcproj
@@ -165,7 +165,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
+				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   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 wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
 				OutputFile="..\..\lib\vc_dll\wxmsw314ud_ribbon_vc_custom.dll"
 				LinkIncremental="2"
@@ -230,7 +230,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
+				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   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 wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
 				OutputFile="..\..\lib\vc_dll\wxmsw314u_ribbon_vc_custom.dll"
 				LinkIncremental="1"

diff --git a/build/msw/wx_vc7_richtext.vcproj b/build/msw/wx_vc7_richtext.vcproj
@@ -165,7 +165,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
+				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   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 wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_html.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
 				OutputFile="..\..\lib\vc_dll\wxmsw314ud_richtext_vc_custom.dll"
 				LinkIncremental="2"
@@ -230,7 +230,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
+				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   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 wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_html.lib ..\..\lib\vc_dll\wxbase31u_xml.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
 				OutputFile="..\..\lib\vc_dll\wxmsw314u_richtext_vc_custom.dll"
 				LinkIncremental="1"

diff --git a/build/msw/wx_vc7_stc.vcproj b/build/msw/wx_vc7_stc.vcproj
@@ -165,7 +165,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
+				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   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 wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
 				OutputFile="..\..\lib\vc_dll\wxmsw314ud_stc_vc_custom.dll"
 				LinkIncremental="2"
@@ -230,7 +230,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
+				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   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 wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
 				OutputFile="..\..\lib\vc_dll\wxmsw314u_stc_vc_custom.dll"
 				LinkIncremental="1"

diff --git a/build/msw/wx_vc7_webview.vcproj b/build/msw/wx_vc7_webview.vcproj
@@ -165,7 +165,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
+				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   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 wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
 				OutputFile="..\..\lib\vc_dll\wxmsw314ud_webview_vc_custom.dll"
 				LinkIncremental="2"
@@ -230,7 +230,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
+				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   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 wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
 				OutputFile="..\..\lib\vc_dll\wxmsw314u_webview_vc_custom.dll"
 				LinkIncremental="1"