diff --git a/build/msw/wx_setup.props b/build/msw/wx_setup.props
index 87562af548..67b3d0546f 100644
--- a/build/msw/wx_setup.props
+++ b/build/msw/wx_setup.props
@@ -38,17 +38,15 @@
     <wxSuffixDebug>
     </wxSuffixDebug>
   </PropertyGroup>
-  <PropertyGroup Label="UserMacros" Condition="'$(Configuration)'=='DLL Debug'">
-    <wxOutDir>..\..\lib\$(wxCompilerPrefix)$(wxArchSuffix)_dll$(wxCfg)\</wxOutDir>
+  <PropertyGroup Label="UserMacros" Condition="'$(Configuration)'=='DLL Debug' or '$(Configuration)'=='DLL Release'">
+    <wxLibTypeSuffix>dll</wxLibTypeSuffix>
   </PropertyGroup>
-  <PropertyGroup Label="UserMacros" Condition="'$(Configuration)'=='DLL Release'">
-    <wxOutDir>..\..\lib\$(wxCompilerPrefix)$(wxArchSuffix)_dll$(wxCfg)\</wxOutDir>
+  <PropertyGroup Label="UserMacros" Condition="'$(Configuration)'!='DLL Debug' and '$(Configuration)'!='DLL Release'">
+    <wxLibTypeSuffix>lib</wxLibTypeSuffix>
   </PropertyGroup>
-  <PropertyGroup Label="UserMacros" Condition="'$(Configuration)'=='Debug'">
-    <wxOutDir>..\..\lib\$(wxCompilerPrefix)$(wxArchSuffix)_lib$(wxCfg)\</wxOutDir>
-  </PropertyGroup>
-  <PropertyGroup Label="UserMacros" Condition="'$(Configuration)'=='Release'">
-    <wxOutDir>..\..\lib\$(wxCompilerPrefix)$(wxArchSuffix)_lib$(wxCfg)\</wxOutDir>
+  <PropertyGroup Label="UserMacros">
+    <wxOutDirName>$(wxCompilerPrefix)$(wxArchSuffix)_$(wxLibTypeSuffix)$(wxCfg)</wxOutDirName>
+    <wxOutDir>..\..\lib\$(wxOutDirName)\</wxOutDir>
   </PropertyGroup>
   <PropertyGroup Label="UserMacros" Condition="'$(Configuration)'=='DLL Debug'">
     <wxIntRootDir>$(wxCompilerPrefix)$(wxArchSuffix)_$(wxToolkitPrefix)$(wxSuffix)dll\</wxIntRootDir>
@@ -96,6 +94,9 @@
     <BuildMacro Include="wxOutDir">
       <Value>$(wxOutDir)</Value>
     </BuildMacro>
+    <BuildMacro Include="wxOutDirName">
+      <Value>$(wxOutDirName)</Value>
+    </BuildMacro>
     <BuildMacro Include="wxIntRootDir">
       <Value>$(wxIntRootDir)</Value>
     </BuildMacro>