From 6ce0ccf59331fa1b0301195544046819972ef819 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 24 Aug 2013 14:33:16 +0000 Subject: [PATCH] Fix DLL targets names in manually maintained VC10 project files. This takes care of annoying warning about "target name does not match linker output file name" when building the DLLs. Closes #15435. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74702 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- build/msw/wx_vc10_adv.vcxproj | 5 +++-- build/msw/wx_vc10_aui.vcxproj | 5 +++-- build/msw/wx_vc10_base.vcxproj | 5 +++-- build/msw/wx_vc10_core.vcxproj | 5 +++-- build/msw/wx_vc10_gl.vcxproj | 5 +++-- build/msw/wx_vc10_html.vcxproj | 5 +++-- build/msw/wx_vc10_media.vcxproj | 5 +++-- build/msw/wx_vc10_net.vcxproj | 5 +++-- build/msw/wx_vc10_propgrid.vcxproj | 5 +++-- build/msw/wx_vc10_qa.vcxproj | 5 +++-- build/msw/wx_vc10_ribbon.vcxproj | 5 +++-- build/msw/wx_vc10_richtext.vcxproj | 5 +++-- build/msw/wx_vc10_stc.vcxproj | 3 ++- build/msw/wx_vc10_webview.vcxproj | 3 ++- build/msw/wx_vc10_xml.vcxproj | 3 ++- build/msw/wx_vc10_xrc.vcxproj | 3 ++- 16 files changed, 44 insertions(+), 28 deletions(-) diff --git a/build/msw/wx_vc10_adv.vcxproj b/build/msw/wx_vc10_adv.vcxproj index 754ef5dda6..ff17afcb47 100644 --- a/build/msw/wx_vc10_adv.vcxproj +++ b/build/msw/wx_vc10_adv.vcxproj @@ -74,7 +74,8 @@ false true wxmsw29ud_adv - $(ProjectName)d + wxmsw295ud_$(ProjectName)_vc_custom + wxmsw295u_$(ProjectName)_vc_custom @@ -401,4 +402,4 @@ - + \ No newline at end of file diff --git a/build/msw/wx_vc10_aui.vcxproj b/build/msw/wx_vc10_aui.vcxproj index 58ce40ed60..b422f043c7 100644 --- a/build/msw/wx_vc10_aui.vcxproj +++ b/build/msw/wx_vc10_aui.vcxproj @@ -74,7 +74,8 @@ false true wxmsw29ud_aui - $(ProjectName)d + wxmsw295ud_$(ProjectName)_vc_custom + wxmsw295u_$(ProjectName)_vc_custom @@ -306,4 +307,4 @@ - + \ No newline at end of file diff --git a/build/msw/wx_vc10_base.vcxproj b/build/msw/wx_vc10_base.vcxproj index 4fff5b2241..0eddd24d82 100644 --- a/build/msw/wx_vc10_base.vcxproj +++ b/build/msw/wx_vc10_base.vcxproj @@ -74,8 +74,9 @@ false true wxbase29ud - $(ProjectName)d + wx$(ProjectName)295ud_vc_custom wxbase29u + wx$(ProjectName)295u_vc_custom @@ -594,4 +595,4 @@ - + \ No newline at end of file diff --git a/build/msw/wx_vc10_core.vcxproj b/build/msw/wx_vc10_core.vcxproj index 604affb46f..c4c5c75d45 100644 --- a/build/msw/wx_vc10_core.vcxproj +++ b/build/msw/wx_vc10_core.vcxproj @@ -74,8 +74,9 @@ false true wxmsw29ud_core - $(ProjectName)d + wxmsw295ud_$(ProjectName)_vc_custom wxmsw29u_core + wxmsw295u_$(ProjectName)_vc_custom @@ -1308,4 +1309,4 @@ - + \ No newline at end of file diff --git a/build/msw/wx_vc10_gl.vcxproj b/build/msw/wx_vc10_gl.vcxproj index b45c844f0b..b07e35b5c0 100644 --- a/build/msw/wx_vc10_gl.vcxproj +++ b/build/msw/wx_vc10_gl.vcxproj @@ -74,7 +74,8 @@ false true wxmsw29ud_gl - $(ProjectName)d + wxmsw295ud_$(ProjectName)_vc_custom + wxmsw295u_$(ProjectName)_vc_custom @@ -295,4 +296,4 @@ - + \ No newline at end of file diff --git a/build/msw/wx_vc10_html.vcxproj b/build/msw/wx_vc10_html.vcxproj index c79b45aeca..f3228713e0 100644 --- a/build/msw/wx_vc10_html.vcxproj +++ b/build/msw/wx_vc10_html.vcxproj @@ -74,7 +74,8 @@ false true wxmsw29ud_html - $(ProjectName)d + wxmsw295ud_$(ProjectName)_vc_custom + wxmsw295u_$(ProjectName)_vc_custom @@ -336,4 +337,4 @@ - + \ No newline at end of file diff --git a/build/msw/wx_vc10_media.vcxproj b/build/msw/wx_vc10_media.vcxproj index 44798a8c43..746a9270fc 100644 --- a/build/msw/wx_vc10_media.vcxproj +++ b/build/msw/wx_vc10_media.vcxproj @@ -74,7 +74,8 @@ false true wxmsw29ud_media - $(ProjectName)d + wxmsw295ud_$(ProjectName)_vc_custom + wxmsw295u_$(ProjectName)_vc_custom @@ -296,4 +297,4 @@ - + \ No newline at end of file diff --git a/build/msw/wx_vc10_net.vcxproj b/build/msw/wx_vc10_net.vcxproj index 898dee47f9..e428d1c82f 100644 --- a/build/msw/wx_vc10_net.vcxproj +++ b/build/msw/wx_vc10_net.vcxproj @@ -74,7 +74,8 @@ false true wxbase29ud_net - $(ProjectName)d + wxbase295ud_$(ProjectName)_vc_custom + wxbase295u_$(ProjectName)_vc_custom @@ -314,4 +315,4 @@ - + \ No newline at end of file diff --git a/build/msw/wx_vc10_propgrid.vcxproj b/build/msw/wx_vc10_propgrid.vcxproj index 17c7952c97..65987c2db5 100644 --- a/build/msw/wx_vc10_propgrid.vcxproj +++ b/build/msw/wx_vc10_propgrid.vcxproj @@ -74,7 +74,8 @@ false true wxmsw29ud_propgrid - $(ProjectName)d + wxmsw295ud_$(ProjectName)_vc_custom + wxmsw295u_$(ProjectName)_vc_custom @@ -308,4 +309,4 @@ - + \ No newline at end of file diff --git a/build/msw/wx_vc10_qa.vcxproj b/build/msw/wx_vc10_qa.vcxproj index 71a4bacd41..b4f753f10d 100644 --- a/build/msw/wx_vc10_qa.vcxproj +++ b/build/msw/wx_vc10_qa.vcxproj @@ -74,7 +74,8 @@ false true wxmsw29ud_qa - $(ProjectName)d + wxmsw295ud_$(ProjectName)_vc_custom + wxmsw295u_$(ProjectName)_vc_custom @@ -294,4 +295,4 @@ - + \ No newline at end of file diff --git a/build/msw/wx_vc10_ribbon.vcxproj b/build/msw/wx_vc10_ribbon.vcxproj index 4b300d9cac..c2b372f2a0 100644 --- a/build/msw/wx_vc10_ribbon.vcxproj +++ b/build/msw/wx_vc10_ribbon.vcxproj @@ -74,7 +74,8 @@ false true wxmsw29ud_ribbon - $(ProjectName)d + wxmsw295ud_$(ProjectName)_vc_custom + wxmsw295u_$(ProjectName)_vc_custom @@ -310,4 +311,4 @@ - + \ No newline at end of file diff --git a/build/msw/wx_vc10_richtext.vcxproj b/build/msw/wx_vc10_richtext.vcxproj index e4ecb44f07..a0e86e6073 100644 --- a/build/msw/wx_vc10_richtext.vcxproj +++ b/build/msw/wx_vc10_richtext.vcxproj @@ -74,7 +74,8 @@ false true wxmsw29ud_richtext - $(ProjectName)d + wxmsw295ud_$(ProjectName)_vc_custom + wxmsw295u_$(ProjectName)_vc_custom @@ -322,4 +323,4 @@ - + \ No newline at end of file diff --git a/build/msw/wx_vc10_stc.vcxproj b/build/msw/wx_vc10_stc.vcxproj index 9ba99ac9c5..0ef7cb600b 100644 --- a/build/msw/wx_vc10_stc.vcxproj +++ b/build/msw/wx_vc10_stc.vcxproj @@ -74,7 +74,8 @@ false true wxmsw29ud_stc - $(ProjectName)d + wxmsw295ud_$(ProjectName)_vc_custom + wxmsw295u_$(ProjectName)_vc_custom diff --git a/build/msw/wx_vc10_webview.vcxproj b/build/msw/wx_vc10_webview.vcxproj index d7ae8f1ae5..5388dd0815 100644 --- a/build/msw/wx_vc10_webview.vcxproj +++ b/build/msw/wx_vc10_webview.vcxproj @@ -74,7 +74,8 @@ false true wxmsw29ud_webview - $(ProjectName)d + wxmsw295ud_$(ProjectName)_vc_custom + wxmsw295u_$(ProjectName)_vc_custom diff --git a/build/msw/wx_vc10_xml.vcxproj b/build/msw/wx_vc10_xml.vcxproj index eed69570fd..ca58e784f3 100644 --- a/build/msw/wx_vc10_xml.vcxproj +++ b/build/msw/wx_vc10_xml.vcxproj @@ -74,7 +74,8 @@ false true wxbase29ud_xml - $(ProjectName)d + wxbase295ud_$(ProjectName)_vc_custom + wxbase295u_$(ProjectName)_vc_custom diff --git a/build/msw/wx_vc10_xrc.vcxproj b/build/msw/wx_vc10_xrc.vcxproj index 1b79c1019a..d9cad37958 100644 --- a/build/msw/wx_vc10_xrc.vcxproj +++ b/build/msw/wx_vc10_xrc.vcxproj @@ -74,7 +74,8 @@ false true wxmsw29ud_xrc - $(ProjectName)d + wxmsw295ud_$(ProjectName)_vc_custom + wxmsw295u_$(ProjectName)_vc_custom -- 2.45.2