diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 7fb95c937c..d0907c6c20 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -211,7 +211,7 @@
         <set var="COMPILER_PREFIX" make_var="1">$(COMPILER)</set>
 
         <set var="OBJS" make_var="1">
-            $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(CFG_NAME_PART)$(ARCH_SUFFIX)
+            $(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(CFG_NAME_PART)
         </set>
 
         <set var="BUILDDIR">$(OBJS)</set>
diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index 42d2c0634e..e8fd66a266 100644
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -34,7 +34,7 @@ WX_RELEASE_NODOT = 31
 WX_VERSION_NODOT = $(WX_RELEASE_NODOT)6
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/build/msw/wx_vc8_adv.vcproj b/build/msw/wx_vc8_adv.vcproj
index 39e4b724a9..03dd4104b9 100644
--- a/build/msw/wx_vc8_adv.vcproj
+++ b/build/msw/wx_vc8_adv.vcproj
@@ -381,7 +381,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswud_x64\adv"
+			IntermediateDirectory="vc_x64_mswud\adv"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -417,8 +417,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswud_x64\wxprec_advlib.pch"
-				ObjectFile="vc_mswud_x64\adv\"
+				PrecompiledHeaderFile="vc_x64_mswud\wxprec_advlib.pch"
+				ObjectFile="vc_x64_mswud\adv\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxmsw31ud_adv.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -466,7 +466,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswu_x64\adv"
+			IntermediateDirectory="vc_x64_mswu\adv"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -499,8 +499,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswu_x64\wxprec_advlib.pch"
-				ObjectFile="vc_mswu_x64\adv\"
+				PrecompiledHeaderFile="vc_x64_mswu\wxprec_advlib.pch"
+				ObjectFile="vc_x64_mswu\adv\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxmsw31u_adv.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -548,7 +548,7 @@
 		<Configuration
 			Name="DLL Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswuddll_x64\adv"
+			IntermediateDirectory="vc_x64_mswuddll\adv"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -584,8 +584,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_advdll.pch"
-				ObjectFile="vc_mswuddll_x64\adv\"
+				PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_advdll.pch"
+				ObjectFile="vc_x64_mswuddll\adv\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_adv_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -642,7 +642,7 @@
 		<Configuration
 			Name="DLL Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswudll_x64\adv"
+			IntermediateDirectory="vc_x64_mswudll\adv"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -675,8 +675,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_advdll.pch"
-				ObjectFile="vc_mswudll_x64\adv\"
+				PrecompiledHeaderFile="vc_x64_mswudll\wxprec_advdll.pch"
+				ObjectFile="vc_x64_mswudll\adv\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316u_adv_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
diff --git a/build/msw/wx_vc8_aui.vcproj b/build/msw/wx_vc8_aui.vcproj
index 90cb60444b..959e1dc16d 100644
--- a/build/msw/wx_vc8_aui.vcproj
+++ b/build/msw/wx_vc8_aui.vcproj
@@ -381,7 +381,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswud_x64\aui"
+			IntermediateDirectory="vc_x64_mswud\aui"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -417,8 +417,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswud_x64\wxprec_auilib.pch"
-				ObjectFile="vc_mswud_x64\aui\"
+				PrecompiledHeaderFile="vc_x64_mswud\wxprec_auilib.pch"
+				ObjectFile="vc_x64_mswud\aui\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxmsw31ud_aui.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -466,7 +466,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswu_x64\aui"
+			IntermediateDirectory="vc_x64_mswu\aui"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -499,8 +499,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswu_x64\wxprec_auilib.pch"
-				ObjectFile="vc_mswu_x64\aui\"
+				PrecompiledHeaderFile="vc_x64_mswu\wxprec_auilib.pch"
+				ObjectFile="vc_x64_mswu\aui\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxmsw31u_aui.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -548,7 +548,7 @@
 		<Configuration
 			Name="DLL Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswuddll_x64\aui"
+			IntermediateDirectory="vc_x64_mswuddll\aui"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -584,8 +584,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_auidll.pch"
-				ObjectFile="vc_mswuddll_x64\aui\"
+				PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_auidll.pch"
+				ObjectFile="vc_x64_mswuddll\aui\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_aui_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -642,7 +642,7 @@
 		<Configuration
 			Name="DLL Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswudll_x64\aui"
+			IntermediateDirectory="vc_x64_mswudll\aui"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -675,8 +675,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_auidll.pch"
-				ObjectFile="vc_mswudll_x64\aui\"
+				PrecompiledHeaderFile="vc_x64_mswudll\wxprec_auidll.pch"
+				ObjectFile="vc_x64_mswudll\aui\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316u_aui_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
diff --git a/build/msw/wx_vc8_base.vcproj b/build/msw/wx_vc8_base.vcproj
index feb02ea5e3..babb6afe45 100644
--- a/build/msw/wx_vc8_base.vcproj
+++ b/build/msw/wx_vc8_base.vcproj
@@ -381,7 +381,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswud_x64\base"
+			IntermediateDirectory="vc_x64_mswud\base"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -417,8 +417,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswud_x64\wxprec_baselib.pch"
-				ObjectFile="vc_mswud_x64\base\"
+				PrecompiledHeaderFile="vc_x64_mswud\wxprec_baselib.pch"
+				ObjectFile="vc_x64_mswud\base\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxbase31ud.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -466,7 +466,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswu_x64\base"
+			IntermediateDirectory="vc_x64_mswu\base"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -499,8 +499,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswu_x64\wxprec_baselib.pch"
-				ObjectFile="vc_mswu_x64\base\"
+				PrecompiledHeaderFile="vc_x64_mswu\wxprec_baselib.pch"
+				ObjectFile="vc_x64_mswu\base\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxbase31u.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -548,7 +548,7 @@
 		<Configuration
 			Name="DLL Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswuddll_x64\base"
+			IntermediateDirectory="vc_x64_mswuddll\base"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -584,8 +584,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_basedll.pch"
-				ObjectFile="vc_mswuddll_x64\base\"
+				PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_basedll.pch"
+				ObjectFile="vc_x64_mswuddll\base\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase316ud_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -642,7 +642,7 @@
 		<Configuration
 			Name="DLL Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswudll_x64\base"
+			IntermediateDirectory="vc_x64_mswudll\base"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -675,8 +675,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_basedll.pch"
-				ObjectFile="vc_mswudll_x64\base\"
+				PrecompiledHeaderFile="vc_x64_mswudll\wxprec_basedll.pch"
+				ObjectFile="vc_x64_mswudll\base\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase316u_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -1137,7 +1137,7 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswud_x64\base\common_secretstore.obj"
+						ObjectFile="vc_x64_mswud\base\common_secretstore.obj"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1145,7 +1145,7 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswu_x64\base\common_secretstore.obj"
+						ObjectFile="vc_x64_mswu\base\common_secretstore.obj"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1153,7 +1153,7 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswuddll_x64\base\common_secretstore.obj"
+						ObjectFile="vc_x64_mswuddll\base\common_secretstore.obj"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1161,7 +1161,7 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswudll_x64\base\common_secretstore.obj"
+						ObjectFile="vc_x64_mswudll\base\common_secretstore.obj"
 					/>
 				</FileConfiguration>
 			</File>
@@ -1289,7 +1289,7 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswud_x64\base\common_uilocale.obj"
+						ObjectFile="vc_x64_mswud\base\common_uilocale.obj"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1297,7 +1297,7 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswu_x64\base\common_uilocale.obj"
+						ObjectFile="vc_x64_mswu\base\common_uilocale.obj"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1305,7 +1305,7 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswuddll_x64\base\common_uilocale.obj"
+						ObjectFile="vc_x64_mswuddll\base\common_uilocale.obj"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1313,7 +1313,7 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswudll_x64\base\common_uilocale.obj"
+						ObjectFile="vc_x64_mswudll\base\common_uilocale.obj"
 					/>
 				</FileConfiguration>
 			</File>
@@ -1466,7 +1466,7 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswud_x64\base\msw_secretstore.obj"
+						ObjectFile="vc_x64_mswud\base\msw_secretstore.obj"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1474,7 +1474,7 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswu_x64\base\msw_secretstore.obj"
+						ObjectFile="vc_x64_mswu\base\msw_secretstore.obj"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1482,7 +1482,7 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswuddll_x64\base\msw_secretstore.obj"
+						ObjectFile="vc_x64_mswuddll\base\msw_secretstore.obj"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1490,7 +1490,7 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswudll_x64\base\msw_secretstore.obj"
+						ObjectFile="vc_x64_mswudll\base\msw_secretstore.obj"
 					/>
 				</FileConfiguration>
 			</File>
@@ -1554,7 +1554,7 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswud_x64\base\msw_uilocale.obj"
+						ObjectFile="vc_x64_mswud\base\msw_uilocale.obj"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1562,7 +1562,7 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswu_x64\base\msw_uilocale.obj"
+						ObjectFile="vc_x64_mswu\base\msw_uilocale.obj"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1570,7 +1570,7 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswuddll_x64\base\msw_uilocale.obj"
+						ObjectFile="vc_x64_mswuddll\base\msw_uilocale.obj"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1578,7 +1578,7 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswudll_x64\base\msw_uilocale.obj"
+						ObjectFile="vc_x64_mswudll\base\msw_uilocale.obj"
 					/>
 				</FileConfiguration>
 			</File>
diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj
index 0b953cfcfa..9e1cc432f5 100644
--- a/build/msw/wx_vc8_core.vcproj
+++ b/build/msw/wx_vc8_core.vcproj
@@ -381,7 +381,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswud_x64\core"
+			IntermediateDirectory="vc_x64_mswud\core"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -417,8 +417,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswud_x64\wxprec_corelib.pch"
-				ObjectFile="vc_mswud_x64\core\"
+				PrecompiledHeaderFile="vc_x64_mswud\wxprec_corelib.pch"
+				ObjectFile="vc_x64_mswud\core\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxmsw31ud_core.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -466,7 +466,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswu_x64\core"
+			IntermediateDirectory="vc_x64_mswu\core"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -499,8 +499,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswu_x64\wxprec_corelib.pch"
-				ObjectFile="vc_mswu_x64\core\"
+				PrecompiledHeaderFile="vc_x64_mswu\wxprec_corelib.pch"
+				ObjectFile="vc_x64_mswu\core\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxmsw31u_core.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -548,7 +548,7 @@
 		<Configuration
 			Name="DLL Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswuddll_x64\core"
+			IntermediateDirectory="vc_x64_mswuddll\core"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -584,8 +584,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_coredll.pch"
-				ObjectFile="vc_mswuddll_x64\core\"
+				PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_coredll.pch"
+				ObjectFile="vc_x64_mswuddll\core\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_core_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -642,7 +642,7 @@
 		<Configuration
 			Name="DLL Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswudll_x64\core"
+			IntermediateDirectory="vc_x64_mswudll\core"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -675,8 +675,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_coredll.pch"
-				ObjectFile="vc_mswudll_x64\core\"
+				PrecompiledHeaderFile="vc_x64_mswudll\wxprec_coredll.pch"
+				ObjectFile="vc_x64_mswudll\core\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316u_core_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
diff --git a/build/msw/wx_vc8_gl.vcproj b/build/msw/wx_vc8_gl.vcproj
index cf6b03004d..2e1aa97630 100644
--- a/build/msw/wx_vc8_gl.vcproj
+++ b/build/msw/wx_vc8_gl.vcproj
@@ -381,7 +381,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswud_x64\gl"
+			IntermediateDirectory="vc_x64_mswud\gl"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -417,8 +417,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswud_x64\wxprec_gllib.pch"
-				ObjectFile="vc_mswud_x64\gl\"
+				PrecompiledHeaderFile="vc_x64_mswud\wxprec_gllib.pch"
+				ObjectFile="vc_x64_mswud\gl\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxmsw31ud_gl.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -466,7 +466,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswu_x64\gl"
+			IntermediateDirectory="vc_x64_mswu\gl"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -499,8 +499,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswu_x64\wxprec_gllib.pch"
-				ObjectFile="vc_mswu_x64\gl\"
+				PrecompiledHeaderFile="vc_x64_mswu\wxprec_gllib.pch"
+				ObjectFile="vc_x64_mswu\gl\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxmsw31u_gl.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -548,7 +548,7 @@
 		<Configuration
 			Name="DLL Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswuddll_x64\gl"
+			IntermediateDirectory="vc_x64_mswuddll\gl"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -584,8 +584,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_gldll.pch"
-				ObjectFile="vc_mswuddll_x64\gl\"
+				PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_gldll.pch"
+				ObjectFile="vc_x64_mswuddll\gl\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_gl_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -642,7 +642,7 @@
 		<Configuration
 			Name="DLL Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswudll_x64\gl"
+			IntermediateDirectory="vc_x64_mswudll\gl"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -675,8 +675,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_gldll.pch"
-				ObjectFile="vc_mswudll_x64\gl\"
+				PrecompiledHeaderFile="vc_x64_mswudll\wxprec_gldll.pch"
+				ObjectFile="vc_x64_mswudll\gl\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316u_gl_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
diff --git a/build/msw/wx_vc8_html.vcproj b/build/msw/wx_vc8_html.vcproj
index b39c0ab691..61e8c5a63e 100644
--- a/build/msw/wx_vc8_html.vcproj
+++ b/build/msw/wx_vc8_html.vcproj
@@ -381,7 +381,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswud_x64\html"
+			IntermediateDirectory="vc_x64_mswud\html"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -417,8 +417,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswud_x64\wxprec_htmllib.pch"
-				ObjectFile="vc_mswud_x64\html\"
+				PrecompiledHeaderFile="vc_x64_mswud\wxprec_htmllib.pch"
+				ObjectFile="vc_x64_mswud\html\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxmsw31ud_html.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -466,7 +466,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswu_x64\html"
+			IntermediateDirectory="vc_x64_mswu\html"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -499,8 +499,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswu_x64\wxprec_htmllib.pch"
-				ObjectFile="vc_mswu_x64\html\"
+				PrecompiledHeaderFile="vc_x64_mswu\wxprec_htmllib.pch"
+				ObjectFile="vc_x64_mswu\html\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxmsw31u_html.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -548,7 +548,7 @@
 		<Configuration
 			Name="DLL Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswuddll_x64\html"
+			IntermediateDirectory="vc_x64_mswuddll\html"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -584,8 +584,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_htmldll.pch"
-				ObjectFile="vc_mswuddll_x64\html\"
+				PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_htmldll.pch"
+				ObjectFile="vc_x64_mswuddll\html\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_html_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -642,7 +642,7 @@
 		<Configuration
 			Name="DLL Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswudll_x64\html"
+			IntermediateDirectory="vc_x64_mswudll\html"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -675,8 +675,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_htmldll.pch"
-				ObjectFile="vc_mswudll_x64\html\"
+				PrecompiledHeaderFile="vc_x64_mswudll\wxprec_htmldll.pch"
+				ObjectFile="vc_x64_mswudll\html\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316u_html_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
diff --git a/build/msw/wx_vc8_media.vcproj b/build/msw/wx_vc8_media.vcproj
index f0023d9ae5..63d71fa33c 100644
--- a/build/msw/wx_vc8_media.vcproj
+++ b/build/msw/wx_vc8_media.vcproj
@@ -381,7 +381,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswud_x64\media"
+			IntermediateDirectory="vc_x64_mswud\media"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -417,8 +417,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswud_x64\wxprec_medialib.pch"
-				ObjectFile="vc_mswud_x64\media\"
+				PrecompiledHeaderFile="vc_x64_mswud\wxprec_medialib.pch"
+				ObjectFile="vc_x64_mswud\media\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxmsw31ud_media.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -466,7 +466,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswu_x64\media"
+			IntermediateDirectory="vc_x64_mswu\media"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -499,8 +499,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswu_x64\wxprec_medialib.pch"
-				ObjectFile="vc_mswu_x64\media\"
+				PrecompiledHeaderFile="vc_x64_mswu\wxprec_medialib.pch"
+				ObjectFile="vc_x64_mswu\media\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxmsw31u_media.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -548,7 +548,7 @@
 		<Configuration
 			Name="DLL Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswuddll_x64\media"
+			IntermediateDirectory="vc_x64_mswuddll\media"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -584,8 +584,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_mediadll.pch"
-				ObjectFile="vc_mswuddll_x64\media\"
+				PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_mediadll.pch"
+				ObjectFile="vc_x64_mswuddll\media\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_media_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -642,7 +642,7 @@
 		<Configuration
 			Name="DLL Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswudll_x64\media"
+			IntermediateDirectory="vc_x64_mswudll\media"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -675,8 +675,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_mediadll.pch"
-				ObjectFile="vc_mswudll_x64\media\"
+				PrecompiledHeaderFile="vc_x64_mswudll\wxprec_mediadll.pch"
+				ObjectFile="vc_x64_mswudll\media\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316u_media_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
diff --git a/build/msw/wx_vc8_net.vcproj b/build/msw/wx_vc8_net.vcproj
index a8967f78fb..24e5d54c5a 100644
--- a/build/msw/wx_vc8_net.vcproj
+++ b/build/msw/wx_vc8_net.vcproj
@@ -381,7 +381,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswud_x64\net"
+			IntermediateDirectory="vc_x64_mswud\net"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -417,8 +417,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswud_x64\wxprec_netlib.pch"
-				ObjectFile="vc_mswud_x64\net\"
+				PrecompiledHeaderFile="vc_x64_mswud\wxprec_netlib.pch"
+				ObjectFile="vc_x64_mswud\net\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxbase31ud_net.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -466,7 +466,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswu_x64\net"
+			IntermediateDirectory="vc_x64_mswu\net"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -499,8 +499,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswu_x64\wxprec_netlib.pch"
-				ObjectFile="vc_mswu_x64\net\"
+				PrecompiledHeaderFile="vc_x64_mswu\wxprec_netlib.pch"
+				ObjectFile="vc_x64_mswu\net\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxbase31u_net.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -548,7 +548,7 @@
 		<Configuration
 			Name="DLL Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswuddll_x64\net"
+			IntermediateDirectory="vc_x64_mswuddll\net"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -584,8 +584,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_netdll.pch"
-				ObjectFile="vc_mswuddll_x64\net\"
+				PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_netdll.pch"
+				ObjectFile="vc_x64_mswuddll\net\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase316ud_net_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -642,7 +642,7 @@
 		<Configuration
 			Name="DLL Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswudll_x64\net"
+			IntermediateDirectory="vc_x64_mswudll\net"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -675,8 +675,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_netdll.pch"
-				ObjectFile="vc_mswudll_x64\net\"
+				PrecompiledHeaderFile="vc_x64_mswudll\wxprec_netdll.pch"
+				ObjectFile="vc_x64_mswudll\net\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase316u_net_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
diff --git a/build/msw/wx_vc8_propgrid.vcproj b/build/msw/wx_vc8_propgrid.vcproj
index 622d550948..9d1261e66f 100644
--- a/build/msw/wx_vc8_propgrid.vcproj
+++ b/build/msw/wx_vc8_propgrid.vcproj
@@ -381,7 +381,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswud_x64\propgrid"
+			IntermediateDirectory="vc_x64_mswud\propgrid"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -417,8 +417,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswud_x64\wxprec_propgridlib.pch"
-				ObjectFile="vc_mswud_x64\propgrid\"
+				PrecompiledHeaderFile="vc_x64_mswud\wxprec_propgridlib.pch"
+				ObjectFile="vc_x64_mswud\propgrid\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxmsw31ud_propgrid.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -466,7 +466,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswu_x64\propgrid"
+			IntermediateDirectory="vc_x64_mswu\propgrid"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -499,8 +499,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswu_x64\wxprec_propgridlib.pch"
-				ObjectFile="vc_mswu_x64\propgrid\"
+				PrecompiledHeaderFile="vc_x64_mswu\wxprec_propgridlib.pch"
+				ObjectFile="vc_x64_mswu\propgrid\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxmsw31u_propgrid.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -548,7 +548,7 @@
 		<Configuration
 			Name="DLL Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswuddll_x64\propgrid"
+			IntermediateDirectory="vc_x64_mswuddll\propgrid"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -584,8 +584,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_propgriddll.pch"
-				ObjectFile="vc_mswuddll_x64\propgrid\"
+				PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_propgriddll.pch"
+				ObjectFile="vc_x64_mswuddll\propgrid\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_propgrid_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -642,7 +642,7 @@
 		<Configuration
 			Name="DLL Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswudll_x64\propgrid"
+			IntermediateDirectory="vc_x64_mswudll\propgrid"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -675,8 +675,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_propgriddll.pch"
-				ObjectFile="vc_mswudll_x64\propgrid\"
+				PrecompiledHeaderFile="vc_x64_mswudll\wxprec_propgriddll.pch"
+				ObjectFile="vc_x64_mswudll\propgrid\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316u_propgrid_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
diff --git a/build/msw/wx_vc8_qa.vcproj b/build/msw/wx_vc8_qa.vcproj
index 2bab320876..b89c8821b1 100644
--- a/build/msw/wx_vc8_qa.vcproj
+++ b/build/msw/wx_vc8_qa.vcproj
@@ -381,7 +381,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswud_x64\qa"
+			IntermediateDirectory="vc_x64_mswud\qa"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -417,8 +417,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswud_x64\wxprec_qalib.pch"
-				ObjectFile="vc_mswud_x64\qa\"
+				PrecompiledHeaderFile="vc_x64_mswud\wxprec_qalib.pch"
+				ObjectFile="vc_x64_mswud\qa\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxmsw31ud_qa.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -466,7 +466,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswu_x64\qa"
+			IntermediateDirectory="vc_x64_mswu\qa"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -499,8 +499,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswu_x64\wxprec_qalib.pch"
-				ObjectFile="vc_mswu_x64\qa\"
+				PrecompiledHeaderFile="vc_x64_mswu\wxprec_qalib.pch"
+				ObjectFile="vc_x64_mswu\qa\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxmsw31u_qa.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -548,7 +548,7 @@
 		<Configuration
 			Name="DLL Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswuddll_x64\qa"
+			IntermediateDirectory="vc_x64_mswuddll\qa"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -584,8 +584,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_qadll.pch"
-				ObjectFile="vc_mswuddll_x64\qa\"
+				PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_qadll.pch"
+				ObjectFile="vc_x64_mswuddll\qa\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_qa_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -642,7 +642,7 @@
 		<Configuration
 			Name="DLL Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswudll_x64\qa"
+			IntermediateDirectory="vc_x64_mswudll\qa"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -675,8 +675,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_qadll.pch"
-				ObjectFile="vc_mswudll_x64\qa\"
+				PrecompiledHeaderFile="vc_x64_mswudll\wxprec_qadll.pch"
+				ObjectFile="vc_x64_mswudll\qa\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316u_qa_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
diff --git a/build/msw/wx_vc8_ribbon.vcproj b/build/msw/wx_vc8_ribbon.vcproj
index 39c9bdea14..304cba1a90 100644
--- a/build/msw/wx_vc8_ribbon.vcproj
+++ b/build/msw/wx_vc8_ribbon.vcproj
@@ -381,7 +381,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswud_x64\ribbon"
+			IntermediateDirectory="vc_x64_mswud\ribbon"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -417,8 +417,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswud_x64\wxprec_ribbonlib.pch"
-				ObjectFile="vc_mswud_x64\ribbon\"
+				PrecompiledHeaderFile="vc_x64_mswud\wxprec_ribbonlib.pch"
+				ObjectFile="vc_x64_mswud\ribbon\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxmsw31ud_ribbon.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -466,7 +466,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswu_x64\ribbon"
+			IntermediateDirectory="vc_x64_mswu\ribbon"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -499,8 +499,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswu_x64\wxprec_ribbonlib.pch"
-				ObjectFile="vc_mswu_x64\ribbon\"
+				PrecompiledHeaderFile="vc_x64_mswu\wxprec_ribbonlib.pch"
+				ObjectFile="vc_x64_mswu\ribbon\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxmsw31u_ribbon.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -548,7 +548,7 @@
 		<Configuration
 			Name="DLL Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswuddll_x64\ribbon"
+			IntermediateDirectory="vc_x64_mswuddll\ribbon"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -584,8 +584,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_ribbondll.pch"
-				ObjectFile="vc_mswuddll_x64\ribbon\"
+				PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_ribbondll.pch"
+				ObjectFile="vc_x64_mswuddll\ribbon\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_ribbon_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -642,7 +642,7 @@
 		<Configuration
 			Name="DLL Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswudll_x64\ribbon"
+			IntermediateDirectory="vc_x64_mswudll\ribbon"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -675,8 +675,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_ribbondll.pch"
-				ObjectFile="vc_mswudll_x64\ribbon\"
+				PrecompiledHeaderFile="vc_x64_mswudll\wxprec_ribbondll.pch"
+				ObjectFile="vc_x64_mswudll\ribbon\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316u_ribbon_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
diff --git a/build/msw/wx_vc8_richtext.vcproj b/build/msw/wx_vc8_richtext.vcproj
index 7f2bf8cac0..b54c52ce4f 100644
--- a/build/msw/wx_vc8_richtext.vcproj
+++ b/build/msw/wx_vc8_richtext.vcproj
@@ -381,7 +381,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswud_x64\richtext"
+			IntermediateDirectory="vc_x64_mswud\richtext"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -417,8 +417,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswud_x64\wxprec_richtextlib.pch"
-				ObjectFile="vc_mswud_x64\richtext\"
+				PrecompiledHeaderFile="vc_x64_mswud\wxprec_richtextlib.pch"
+				ObjectFile="vc_x64_mswud\richtext\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxmsw31ud_richtext.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -466,7 +466,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswu_x64\richtext"
+			IntermediateDirectory="vc_x64_mswu\richtext"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -499,8 +499,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswu_x64\wxprec_richtextlib.pch"
-				ObjectFile="vc_mswu_x64\richtext\"
+				PrecompiledHeaderFile="vc_x64_mswu\wxprec_richtextlib.pch"
+				ObjectFile="vc_x64_mswu\richtext\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxmsw31u_richtext.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -548,7 +548,7 @@
 		<Configuration
 			Name="DLL Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswuddll_x64\richtext"
+			IntermediateDirectory="vc_x64_mswuddll\richtext"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -584,8 +584,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_richtextdll.pch"
-				ObjectFile="vc_mswuddll_x64\richtext\"
+				PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_richtextdll.pch"
+				ObjectFile="vc_x64_mswuddll\richtext\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_richtext_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -642,7 +642,7 @@
 		<Configuration
 			Name="DLL Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswudll_x64\richtext"
+			IntermediateDirectory="vc_x64_mswudll\richtext"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -675,8 +675,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_richtextdll.pch"
-				ObjectFile="vc_mswudll_x64\richtext\"
+				PrecompiledHeaderFile="vc_x64_mswudll\wxprec_richtextdll.pch"
+				ObjectFile="vc_x64_mswudll\richtext\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316u_richtext_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
diff --git a/build/msw/wx_vc8_stc.vcproj b/build/msw/wx_vc8_stc.vcproj
index 5d901acccd..54dd96af1d 100644
--- a/build/msw/wx_vc8_stc.vcproj
+++ b/build/msw/wx_vc8_stc.vcproj
@@ -381,7 +381,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswud_x64\stc"
+			IntermediateDirectory="vc_x64_mswud\stc"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -417,8 +417,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswud_x64\wxprec_stclib.pch"
-				ObjectFile="vc_mswud_x64\stc\"
+				PrecompiledHeaderFile="vc_x64_mswud\wxprec_stclib.pch"
+				ObjectFile="vc_x64_mswud\stc\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxmsw31ud_stc.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -466,7 +466,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswu_x64\stc"
+			IntermediateDirectory="vc_x64_mswu\stc"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -499,8 +499,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswu_x64\wxprec_stclib.pch"
-				ObjectFile="vc_mswu_x64\stc\"
+				PrecompiledHeaderFile="vc_x64_mswu\wxprec_stclib.pch"
+				ObjectFile="vc_x64_mswu\stc\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxmsw31u_stc.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -548,7 +548,7 @@
 		<Configuration
 			Name="DLL Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswuddll_x64\stc"
+			IntermediateDirectory="vc_x64_mswuddll\stc"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -584,8 +584,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_stcdll.pch"
-				ObjectFile="vc_mswuddll_x64\stc\"
+				PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_stcdll.pch"
+				ObjectFile="vc_x64_mswuddll\stc\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_stc_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -642,7 +642,7 @@
 		<Configuration
 			Name="DLL Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswudll_x64\stc"
+			IntermediateDirectory="vc_x64_mswudll\stc"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -675,8 +675,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_stcdll.pch"
-				ObjectFile="vc_mswudll_x64\stc\"
+				PrecompiledHeaderFile="vc_x64_mswudll\wxprec_stcdll.pch"
+				ObjectFile="vc_x64_mswudll\stc\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316u_stc_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
diff --git a/build/msw/wx_vc8_webview.vcproj b/build/msw/wx_vc8_webview.vcproj
index dbfe98096a..5c176fc680 100644
--- a/build/msw/wx_vc8_webview.vcproj
+++ b/build/msw/wx_vc8_webview.vcproj
@@ -381,7 +381,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswud_x64\webview"
+			IntermediateDirectory="vc_x64_mswud\webview"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -417,8 +417,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswud_x64\wxprec_webviewlib.pch"
-				ObjectFile="vc_mswud_x64\webview\"
+				PrecompiledHeaderFile="vc_x64_mswud\wxprec_webviewlib.pch"
+				ObjectFile="vc_x64_mswud\webview\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxmsw31ud_webview.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -466,7 +466,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswu_x64\webview"
+			IntermediateDirectory="vc_x64_mswu\webview"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -499,8 +499,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswu_x64\wxprec_webviewlib.pch"
-				ObjectFile="vc_mswu_x64\webview\"
+				PrecompiledHeaderFile="vc_x64_mswu\wxprec_webviewlib.pch"
+				ObjectFile="vc_x64_mswu\webview\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxmsw31u_webview.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -548,7 +548,7 @@
 		<Configuration
 			Name="DLL Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswuddll_x64\webview"
+			IntermediateDirectory="vc_x64_mswuddll\webview"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -584,8 +584,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_webviewdll.pch"
-				ObjectFile="vc_mswuddll_x64\webview\"
+				PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_webviewdll.pch"
+				ObjectFile="vc_x64_mswuddll\webview\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_webview_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -642,7 +642,7 @@
 		<Configuration
 			Name="DLL Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswudll_x64\webview"
+			IntermediateDirectory="vc_x64_mswudll\webview"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -675,8 +675,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_webviewdll.pch"
-				ObjectFile="vc_mswudll_x64\webview\"
+				PrecompiledHeaderFile="vc_x64_mswudll\wxprec_webviewdll.pch"
+				ObjectFile="vc_x64_mswudll\webview\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316u_webview_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
diff --git a/build/msw/wx_vc8_wxexpat.vcproj b/build/msw/wx_vc8_wxexpat.vcproj
index 2911e18e2a..0147c665b4 100644
--- a/build/msw/wx_vc8_wxexpat.vcproj
+++ b/build/msw/wx_vc8_wxexpat.vcproj
@@ -345,7 +345,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswud_x64\wxexpat"
+			IntermediateDirectory="vc_x64_mswud\wxexpat"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -378,7 +378,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\wxexpat\"
+				ObjectFile="vc_x64_mswud\wxexpat\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxexpatd.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -426,7 +426,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswu_x64\wxexpat"
+			IntermediateDirectory="vc_x64_mswu\wxexpat"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -456,7 +456,7 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\wxexpat\"
+				ObjectFile="vc_x64_mswu\wxexpat\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxexpat.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -504,7 +504,7 @@
 		<Configuration
 			Name="DLL Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswuddll_x64\wxexpat"
+			IntermediateDirectory="vc_x64_mswuddll\wxexpat"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -537,7 +537,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\wxexpat\"
+				ObjectFile="vc_x64_mswuddll\wxexpat\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxexpatd.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -585,7 +585,7 @@
 		<Configuration
 			Name="DLL Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswudll_x64\wxexpat"
+			IntermediateDirectory="vc_x64_mswudll\wxexpat"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -615,7 +615,7 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\wxexpat\"
+				ObjectFile="vc_x64_mswudll\wxexpat\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxexpat.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
diff --git a/build/msw/wx_vc8_wxjpeg.vcproj b/build/msw/wx_vc8_wxjpeg.vcproj
index 68e74608ba..43d561ea5a 100644
--- a/build/msw/wx_vc8_wxjpeg.vcproj
+++ b/build/msw/wx_vc8_wxjpeg.vcproj
@@ -345,7 +345,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswud_x64\wxjpeg"
+			IntermediateDirectory="vc_x64_mswud\wxjpeg"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -378,7 +378,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\wxjpeg\"
+				ObjectFile="vc_x64_mswud\wxjpeg\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxjpegd.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -426,7 +426,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswu_x64\wxjpeg"
+			IntermediateDirectory="vc_x64_mswu\wxjpeg"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -456,7 +456,7 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\wxjpeg\"
+				ObjectFile="vc_x64_mswu\wxjpeg\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxjpeg.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -504,7 +504,7 @@
 		<Configuration
 			Name="DLL Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswuddll_x64\wxjpeg"
+			IntermediateDirectory="vc_x64_mswuddll\wxjpeg"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -537,7 +537,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\wxjpeg\"
+				ObjectFile="vc_x64_mswuddll\wxjpeg\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxjpegd.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -585,7 +585,7 @@
 		<Configuration
 			Name="DLL Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswudll_x64\wxjpeg"
+			IntermediateDirectory="vc_x64_mswudll\wxjpeg"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -615,7 +615,7 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\wxjpeg\"
+				ObjectFile="vc_x64_mswudll\wxjpeg\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxjpeg.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
diff --git a/build/msw/wx_vc8_wxpng.vcproj b/build/msw/wx_vc8_wxpng.vcproj
index 68598b7597..320d3696b5 100644
--- a/build/msw/wx_vc8_wxpng.vcproj
+++ b/build/msw/wx_vc8_wxpng.vcproj
@@ -345,7 +345,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswud_x64\wxpng"
+			IntermediateDirectory="vc_x64_mswud\wxpng"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -378,7 +378,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\wxpng\"
+				ObjectFile="vc_x64_mswud\wxpng\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxpngd.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -426,7 +426,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswu_x64\wxpng"
+			IntermediateDirectory="vc_x64_mswu\wxpng"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -456,7 +456,7 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\wxpng\"
+				ObjectFile="vc_x64_mswu\wxpng\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxpng.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -504,7 +504,7 @@
 		<Configuration
 			Name="DLL Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswuddll_x64\wxpng"
+			IntermediateDirectory="vc_x64_mswuddll\wxpng"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -537,7 +537,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\wxpng\"
+				ObjectFile="vc_x64_mswuddll\wxpng\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxpngd.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -585,7 +585,7 @@
 		<Configuration
 			Name="DLL Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswudll_x64\wxpng"
+			IntermediateDirectory="vc_x64_mswudll\wxpng"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -615,7 +615,7 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\wxpng\"
+				ObjectFile="vc_x64_mswudll\wxpng\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxpng.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
diff --git a/build/msw/wx_vc8_wxregex.vcproj b/build/msw/wx_vc8_wxregex.vcproj
index 87b608a423..41eb150aa1 100644
--- a/build/msw/wx_vc8_wxregex.vcproj
+++ b/build/msw/wx_vc8_wxregex.vcproj
@@ -349,7 +349,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswud_x64\wxregex"
+			IntermediateDirectory="vc_x64_mswud\wxregex"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -383,7 +383,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\wxregex\"
+				ObjectFile="vc_x64_mswud\wxregex\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxregexud.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -431,7 +431,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswu_x64\wxregex"
+			IntermediateDirectory="vc_x64_mswu\wxregex"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -462,7 +462,7 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\wxregex\"
+				ObjectFile="vc_x64_mswu\wxregex\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxregexu.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -510,7 +510,7 @@
 		<Configuration
 			Name="DLL Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswuddll_x64\wxregex"
+			IntermediateDirectory="vc_x64_mswuddll\wxregex"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -544,7 +544,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\wxregex\"
+				ObjectFile="vc_x64_mswuddll\wxregex\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxregexud.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -592,7 +592,7 @@
 		<Configuration
 			Name="DLL Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswudll_x64\wxregex"
+			IntermediateDirectory="vc_x64_mswudll\wxregex"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -623,7 +623,7 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\wxregex\"
+				ObjectFile="vc_x64_mswudll\wxregex\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxregexu.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
diff --git a/build/msw/wx_vc8_wxscintilla.vcproj b/build/msw/wx_vc8_wxscintilla.vcproj
index 6112f02e73..8203d48193 100644
--- a/build/msw/wx_vc8_wxscintilla.vcproj
+++ b/build/msw/wx_vc8_wxscintilla.vcproj
@@ -349,7 +349,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswud_x64\wxscintilla"
+			IntermediateDirectory="vc_x64_mswud\wxscintilla"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -383,7 +383,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\wxscintilla\"
+				ObjectFile="vc_x64_mswud\wxscintilla\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxscintillad.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -431,7 +431,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswu_x64\wxscintilla"
+			IntermediateDirectory="vc_x64_mswu\wxscintilla"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -462,7 +462,7 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\wxscintilla\"
+				ObjectFile="vc_x64_mswu\wxscintilla\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxscintilla.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -510,7 +510,7 @@
 		<Configuration
 			Name="DLL Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswuddll_x64\wxscintilla"
+			IntermediateDirectory="vc_x64_mswuddll\wxscintilla"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -544,7 +544,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\wxscintilla\"
+				ObjectFile="vc_x64_mswuddll\wxscintilla\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxscintillad.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -592,7 +592,7 @@
 		<Configuration
 			Name="DLL Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswudll_x64\wxscintilla"
+			IntermediateDirectory="vc_x64_mswudll\wxscintilla"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -623,7 +623,7 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\wxscintilla\"
+				ObjectFile="vc_x64_mswudll\wxscintilla\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxscintilla.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
diff --git a/build/msw/wx_vc8_wxtiff.vcproj b/build/msw/wx_vc8_wxtiff.vcproj
index 7669a5d4ff..3333aa8452 100644
--- a/build/msw/wx_vc8_wxtiff.vcproj
+++ b/build/msw/wx_vc8_wxtiff.vcproj
@@ -345,7 +345,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswud_x64\wxtiff"
+			IntermediateDirectory="vc_x64_mswud\wxtiff"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -378,7 +378,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\wxtiff\"
+				ObjectFile="vc_x64_mswud\wxtiff\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxtiffd.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -426,7 +426,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswu_x64\wxtiff"
+			IntermediateDirectory="vc_x64_mswu\wxtiff"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -456,7 +456,7 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\wxtiff\"
+				ObjectFile="vc_x64_mswu\wxtiff\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxtiff.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -504,7 +504,7 @@
 		<Configuration
 			Name="DLL Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswuddll_x64\wxtiff"
+			IntermediateDirectory="vc_x64_mswuddll\wxtiff"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -537,7 +537,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\wxtiff\"
+				ObjectFile="vc_x64_mswuddll\wxtiff\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxtiffd.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -585,7 +585,7 @@
 		<Configuration
 			Name="DLL Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswudll_x64\wxtiff"
+			IntermediateDirectory="vc_x64_mswudll\wxtiff"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -615,7 +615,7 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\wxtiff\"
+				ObjectFile="vc_x64_mswudll\wxtiff\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxtiff.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
diff --git a/build/msw/wx_vc8_wxzlib.vcproj b/build/msw/wx_vc8_wxzlib.vcproj
index 004446085b..3a55405ed4 100644
--- a/build/msw/wx_vc8_wxzlib.vcproj
+++ b/build/msw/wx_vc8_wxzlib.vcproj
@@ -345,7 +345,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswud_x64\wxzlib"
+			IntermediateDirectory="vc_x64_mswud\wxzlib"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -378,7 +378,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\wxzlib\"
+				ObjectFile="vc_x64_mswud\wxzlib\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxzlibd.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -426,7 +426,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswu_x64\wxzlib"
+			IntermediateDirectory="vc_x64_mswu\wxzlib"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -456,7 +456,7 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\wxzlib\"
+				ObjectFile="vc_x64_mswu\wxzlib\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxzlib.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -504,7 +504,7 @@
 		<Configuration
 			Name="DLL Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswuddll_x64\wxzlib"
+			IntermediateDirectory="vc_x64_mswuddll\wxzlib"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -537,7 +537,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\wxzlib\"
+				ObjectFile="vc_x64_mswuddll\wxzlib\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxzlibd.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -585,7 +585,7 @@
 		<Configuration
 			Name="DLL Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswudll_x64\wxzlib"
+			IntermediateDirectory="vc_x64_mswudll\wxzlib"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -615,7 +615,7 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\wxzlib\"
+				ObjectFile="vc_x64_mswudll\wxzlib\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxzlib.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
diff --git a/build/msw/wx_vc8_xml.vcproj b/build/msw/wx_vc8_xml.vcproj
index 721e166022..a0b16dde48 100644
--- a/build/msw/wx_vc8_xml.vcproj
+++ b/build/msw/wx_vc8_xml.vcproj
@@ -381,7 +381,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswud_x64\xml"
+			IntermediateDirectory="vc_x64_mswud\xml"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -417,8 +417,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswud_x64\wxprec_xmllib.pch"
-				ObjectFile="vc_mswud_x64\xml\"
+				PrecompiledHeaderFile="vc_x64_mswud\wxprec_xmllib.pch"
+				ObjectFile="vc_x64_mswud\xml\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxbase31ud_xml.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -466,7 +466,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswu_x64\xml"
+			IntermediateDirectory="vc_x64_mswu\xml"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -499,8 +499,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswu_x64\wxprec_xmllib.pch"
-				ObjectFile="vc_mswu_x64\xml\"
+				PrecompiledHeaderFile="vc_x64_mswu\wxprec_xmllib.pch"
+				ObjectFile="vc_x64_mswu\xml\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxbase31u_xml.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -548,7 +548,7 @@
 		<Configuration
 			Name="DLL Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswuddll_x64\xml"
+			IntermediateDirectory="vc_x64_mswuddll\xml"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -584,8 +584,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_xmldll.pch"
-				ObjectFile="vc_mswuddll_x64\xml\"
+				PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_xmldll.pch"
+				ObjectFile="vc_x64_mswuddll\xml\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase316ud_xml_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -642,7 +642,7 @@
 		<Configuration
 			Name="DLL Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswudll_x64\xml"
+			IntermediateDirectory="vc_x64_mswudll\xml"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -675,8 +675,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_xmldll.pch"
-				ObjectFile="vc_mswudll_x64\xml\"
+				PrecompiledHeaderFile="vc_x64_mswudll\wxprec_xmldll.pch"
+				ObjectFile="vc_x64_mswudll\xml\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase316u_xml_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
diff --git a/build/msw/wx_vc8_xrc.vcproj b/build/msw/wx_vc8_xrc.vcproj
index 6e109b58dd..b66e1c4e47 100644
--- a/build/msw/wx_vc8_xrc.vcproj
+++ b/build/msw/wx_vc8_xrc.vcproj
@@ -381,7 +381,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswud_x64\xrc"
+			IntermediateDirectory="vc_x64_mswud\xrc"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -417,8 +417,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswud_x64\wxprec_xrclib.pch"
-				ObjectFile="vc_mswud_x64\xrc\"
+				PrecompiledHeaderFile="vc_x64_mswud\wxprec_xrclib.pch"
+				ObjectFile="vc_x64_mswud\xrc\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxmsw31ud_xrc.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -466,7 +466,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswu_x64\xrc"
+			IntermediateDirectory="vc_x64_mswu\xrc"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -499,8 +499,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswu_x64\wxprec_xrclib.pch"
-				ObjectFile="vc_mswu_x64\xrc\"
+				PrecompiledHeaderFile="vc_x64_mswu\wxprec_xrclib.pch"
+				ObjectFile="vc_x64_mswu\xrc\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxmsw31u_xrc.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -548,7 +548,7 @@
 		<Configuration
 			Name="DLL Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswuddll_x64\xrc"
+			IntermediateDirectory="vc_x64_mswuddll\xrc"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -584,8 +584,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_xrcdll.pch"
-				ObjectFile="vc_mswuddll_x64\xrc\"
+				PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_xrcdll.pch"
+				ObjectFile="vc_x64_mswuddll\xrc\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_xrc_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -642,7 +642,7 @@
 		<Configuration
 			Name="DLL Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswudll_x64\xrc"
+			IntermediateDirectory="vc_x64_mswudll\xrc"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -675,8 +675,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_xrcdll.pch"
-				ObjectFile="vc_mswudll_x64\xrc\"
+				PrecompiledHeaderFile="vc_x64_mswudll\wxprec_xrcdll.pch"
+				ObjectFile="vc_x64_mswudll\xrc\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316u_xrc_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
diff --git a/build/msw/wx_vc9_adv.vcproj b/build/msw/wx_vc9_adv.vcproj
index d733e82dd6..93db269215 100644
--- a/build/msw/wx_vc9_adv.vcproj
+++ b/build/msw/wx_vc9_adv.vcproj
@@ -379,7 +379,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswud_x64\adv"
+			IntermediateDirectory="vc_x64_mswud\adv"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -415,8 +415,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswud_x64\wxprec_advlib.pch"
-				ObjectFile="vc_mswud_x64\adv\"
+				PrecompiledHeaderFile="vc_x64_mswud\wxprec_advlib.pch"
+				ObjectFile="vc_x64_mswud\adv\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxmsw31ud_adv.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -463,7 +463,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswu_x64\adv"
+			IntermediateDirectory="vc_x64_mswu\adv"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -497,8 +497,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswu_x64\wxprec_advlib.pch"
-				ObjectFile="vc_mswu_x64\adv\"
+				PrecompiledHeaderFile="vc_x64_mswu\wxprec_advlib.pch"
+				ObjectFile="vc_x64_mswu\adv\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxmsw31u_adv.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -545,7 +545,7 @@
 		<Configuration
 			Name="DLL Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswuddll_x64\adv"
+			IntermediateDirectory="vc_x64_mswuddll\adv"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -581,8 +581,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_advdll.pch"
-				ObjectFile="vc_mswuddll_x64\adv\"
+				PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_advdll.pch"
+				ObjectFile="vc_x64_mswuddll\adv\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_adv_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -638,7 +638,7 @@
 		<Configuration
 			Name="DLL Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswudll_x64\adv"
+			IntermediateDirectory="vc_x64_mswudll\adv"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -672,8 +672,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_advdll.pch"
-				ObjectFile="vc_mswudll_x64\adv\"
+				PrecompiledHeaderFile="vc_x64_mswudll\wxprec_advdll.pch"
+				ObjectFile="vc_x64_mswudll\adv\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316u_adv_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
diff --git a/build/msw/wx_vc9_aui.vcproj b/build/msw/wx_vc9_aui.vcproj
index 83e5da27d1..d5b947c535 100644
--- a/build/msw/wx_vc9_aui.vcproj
+++ b/build/msw/wx_vc9_aui.vcproj
@@ -379,7 +379,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswud_x64\aui"
+			IntermediateDirectory="vc_x64_mswud\aui"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -415,8 +415,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswud_x64\wxprec_auilib.pch"
-				ObjectFile="vc_mswud_x64\aui\"
+				PrecompiledHeaderFile="vc_x64_mswud\wxprec_auilib.pch"
+				ObjectFile="vc_x64_mswud\aui\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxmsw31ud_aui.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -463,7 +463,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswu_x64\aui"
+			IntermediateDirectory="vc_x64_mswu\aui"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -497,8 +497,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswu_x64\wxprec_auilib.pch"
-				ObjectFile="vc_mswu_x64\aui\"
+				PrecompiledHeaderFile="vc_x64_mswu\wxprec_auilib.pch"
+				ObjectFile="vc_x64_mswu\aui\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxmsw31u_aui.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -545,7 +545,7 @@
 		<Configuration
 			Name="DLL Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswuddll_x64\aui"
+			IntermediateDirectory="vc_x64_mswuddll\aui"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -581,8 +581,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_auidll.pch"
-				ObjectFile="vc_mswuddll_x64\aui\"
+				PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_auidll.pch"
+				ObjectFile="vc_x64_mswuddll\aui\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_aui_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -638,7 +638,7 @@
 		<Configuration
 			Name="DLL Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswudll_x64\aui"
+			IntermediateDirectory="vc_x64_mswudll\aui"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -672,8 +672,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_auidll.pch"
-				ObjectFile="vc_mswudll_x64\aui\"
+				PrecompiledHeaderFile="vc_x64_mswudll\wxprec_auidll.pch"
+				ObjectFile="vc_x64_mswudll\aui\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316u_aui_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
diff --git a/build/msw/wx_vc9_base.vcproj b/build/msw/wx_vc9_base.vcproj
index 33df8ce65f..8525268c93 100644
--- a/build/msw/wx_vc9_base.vcproj
+++ b/build/msw/wx_vc9_base.vcproj
@@ -379,7 +379,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswud_x64\base"
+			IntermediateDirectory="vc_x64_mswud\base"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -415,8 +415,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswud_x64\wxprec_baselib.pch"
-				ObjectFile="vc_mswud_x64\base\"
+				PrecompiledHeaderFile="vc_x64_mswud\wxprec_baselib.pch"
+				ObjectFile="vc_x64_mswud\base\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxbase31ud.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -463,7 +463,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswu_x64\base"
+			IntermediateDirectory="vc_x64_mswu\base"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -497,8 +497,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswu_x64\wxprec_baselib.pch"
-				ObjectFile="vc_mswu_x64\base\"
+				PrecompiledHeaderFile="vc_x64_mswu\wxprec_baselib.pch"
+				ObjectFile="vc_x64_mswu\base\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxbase31u.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -545,7 +545,7 @@
 		<Configuration
 			Name="DLL Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswuddll_x64\base"
+			IntermediateDirectory="vc_x64_mswuddll\base"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -581,8 +581,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_basedll.pch"
-				ObjectFile="vc_mswuddll_x64\base\"
+				PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_basedll.pch"
+				ObjectFile="vc_x64_mswuddll\base\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase316ud_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -638,7 +638,7 @@
 		<Configuration
 			Name="DLL Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswudll_x64\base"
+			IntermediateDirectory="vc_x64_mswudll\base"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -672,8 +672,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_basedll.pch"
-				ObjectFile="vc_mswudll_x64\base\"
+				PrecompiledHeaderFile="vc_x64_mswudll\wxprec_basedll.pch"
+				ObjectFile="vc_x64_mswudll\base\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase316u_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -1133,7 +1133,7 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswud_x64\base\common_secretstore.obj"
+						ObjectFile="vc_x64_mswud\base\common_secretstore.obj"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1141,7 +1141,7 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswu_x64\base\common_secretstore.obj"
+						ObjectFile="vc_x64_mswu\base\common_secretstore.obj"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1149,7 +1149,7 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswuddll_x64\base\common_secretstore.obj"
+						ObjectFile="vc_x64_mswuddll\base\common_secretstore.obj"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1157,7 +1157,7 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswudll_x64\base\common_secretstore.obj"
+						ObjectFile="vc_x64_mswudll\base\common_secretstore.obj"
 					/>
 				</FileConfiguration>
 			</File>
@@ -1285,7 +1285,7 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswud_x64\base\common_uilocale.obj"
+						ObjectFile="vc_x64_mswud\base\common_uilocale.obj"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1293,7 +1293,7 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswu_x64\base\common_uilocale.obj"
+						ObjectFile="vc_x64_mswu\base\common_uilocale.obj"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1301,7 +1301,7 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswuddll_x64\base\common_uilocale.obj"
+						ObjectFile="vc_x64_mswuddll\base\common_uilocale.obj"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1309,7 +1309,7 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswudll_x64\base\common_uilocale.obj"
+						ObjectFile="vc_x64_mswudll\base\common_uilocale.obj"
 					/>
 				</FileConfiguration>
 			</File>
@@ -1462,7 +1462,7 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswud_x64\base\msw_secretstore.obj"
+						ObjectFile="vc_x64_mswud\base\msw_secretstore.obj"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1470,7 +1470,7 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswu_x64\base\msw_secretstore.obj"
+						ObjectFile="vc_x64_mswu\base\msw_secretstore.obj"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1478,7 +1478,7 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswuddll_x64\base\msw_secretstore.obj"
+						ObjectFile="vc_x64_mswuddll\base\msw_secretstore.obj"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1486,7 +1486,7 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswudll_x64\base\msw_secretstore.obj"
+						ObjectFile="vc_x64_mswudll\base\msw_secretstore.obj"
 					/>
 				</FileConfiguration>
 			</File>
@@ -1550,7 +1550,7 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswud_x64\base\msw_uilocale.obj"
+						ObjectFile="vc_x64_mswud\base\msw_uilocale.obj"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1558,7 +1558,7 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswu_x64\base\msw_uilocale.obj"
+						ObjectFile="vc_x64_mswu\base\msw_uilocale.obj"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1566,7 +1566,7 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswuddll_x64\base\msw_uilocale.obj"
+						ObjectFile="vc_x64_mswuddll\base\msw_uilocale.obj"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1574,7 +1574,7 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswudll_x64\base\msw_uilocale.obj"
+						ObjectFile="vc_x64_mswudll\base\msw_uilocale.obj"
 					/>
 				</FileConfiguration>
 			</File>
diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj
index 9068588fa0..0fce999ed3 100644
--- a/build/msw/wx_vc9_core.vcproj
+++ b/build/msw/wx_vc9_core.vcproj
@@ -379,7 +379,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswud_x64\core"
+			IntermediateDirectory="vc_x64_mswud\core"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -415,8 +415,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswud_x64\wxprec_corelib.pch"
-				ObjectFile="vc_mswud_x64\core\"
+				PrecompiledHeaderFile="vc_x64_mswud\wxprec_corelib.pch"
+				ObjectFile="vc_x64_mswud\core\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxmsw31ud_core.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -463,7 +463,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswu_x64\core"
+			IntermediateDirectory="vc_x64_mswu\core"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -497,8 +497,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswu_x64\wxprec_corelib.pch"
-				ObjectFile="vc_mswu_x64\core\"
+				PrecompiledHeaderFile="vc_x64_mswu\wxprec_corelib.pch"
+				ObjectFile="vc_x64_mswu\core\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxmsw31u_core.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -545,7 +545,7 @@
 		<Configuration
 			Name="DLL Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswuddll_x64\core"
+			IntermediateDirectory="vc_x64_mswuddll\core"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -581,8 +581,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_coredll.pch"
-				ObjectFile="vc_mswuddll_x64\core\"
+				PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_coredll.pch"
+				ObjectFile="vc_x64_mswuddll\core\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_core_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -638,7 +638,7 @@
 		<Configuration
 			Name="DLL Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswudll_x64\core"
+			IntermediateDirectory="vc_x64_mswudll\core"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -672,8 +672,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_coredll.pch"
-				ObjectFile="vc_mswudll_x64\core\"
+				PrecompiledHeaderFile="vc_x64_mswudll\wxprec_coredll.pch"
+				ObjectFile="vc_x64_mswudll\core\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316u_core_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
diff --git a/build/msw/wx_vc9_gl.vcproj b/build/msw/wx_vc9_gl.vcproj
index f82ad24837..b60c410edc 100644
--- a/build/msw/wx_vc9_gl.vcproj
+++ b/build/msw/wx_vc9_gl.vcproj
@@ -379,7 +379,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswud_x64\gl"
+			IntermediateDirectory="vc_x64_mswud\gl"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -415,8 +415,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswud_x64\wxprec_gllib.pch"
-				ObjectFile="vc_mswud_x64\gl\"
+				PrecompiledHeaderFile="vc_x64_mswud\wxprec_gllib.pch"
+				ObjectFile="vc_x64_mswud\gl\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxmsw31ud_gl.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -463,7 +463,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswu_x64\gl"
+			IntermediateDirectory="vc_x64_mswu\gl"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -497,8 +497,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswu_x64\wxprec_gllib.pch"
-				ObjectFile="vc_mswu_x64\gl\"
+				PrecompiledHeaderFile="vc_x64_mswu\wxprec_gllib.pch"
+				ObjectFile="vc_x64_mswu\gl\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxmsw31u_gl.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -545,7 +545,7 @@
 		<Configuration
 			Name="DLL Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswuddll_x64\gl"
+			IntermediateDirectory="vc_x64_mswuddll\gl"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -581,8 +581,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_gldll.pch"
-				ObjectFile="vc_mswuddll_x64\gl\"
+				PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_gldll.pch"
+				ObjectFile="vc_x64_mswuddll\gl\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_gl_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -638,7 +638,7 @@
 		<Configuration
 			Name="DLL Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswudll_x64\gl"
+			IntermediateDirectory="vc_x64_mswudll\gl"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -672,8 +672,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_gldll.pch"
-				ObjectFile="vc_mswudll_x64\gl\"
+				PrecompiledHeaderFile="vc_x64_mswudll\wxprec_gldll.pch"
+				ObjectFile="vc_x64_mswudll\gl\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316u_gl_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
diff --git a/build/msw/wx_vc9_html.vcproj b/build/msw/wx_vc9_html.vcproj
index 61286ad186..5ab7750475 100644
--- a/build/msw/wx_vc9_html.vcproj
+++ b/build/msw/wx_vc9_html.vcproj
@@ -379,7 +379,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswud_x64\html"
+			IntermediateDirectory="vc_x64_mswud\html"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -415,8 +415,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswud_x64\wxprec_htmllib.pch"
-				ObjectFile="vc_mswud_x64\html\"
+				PrecompiledHeaderFile="vc_x64_mswud\wxprec_htmllib.pch"
+				ObjectFile="vc_x64_mswud\html\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxmsw31ud_html.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -463,7 +463,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswu_x64\html"
+			IntermediateDirectory="vc_x64_mswu\html"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -497,8 +497,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswu_x64\wxprec_htmllib.pch"
-				ObjectFile="vc_mswu_x64\html\"
+				PrecompiledHeaderFile="vc_x64_mswu\wxprec_htmllib.pch"
+				ObjectFile="vc_x64_mswu\html\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxmsw31u_html.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -545,7 +545,7 @@
 		<Configuration
 			Name="DLL Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswuddll_x64\html"
+			IntermediateDirectory="vc_x64_mswuddll\html"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -581,8 +581,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_htmldll.pch"
-				ObjectFile="vc_mswuddll_x64\html\"
+				PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_htmldll.pch"
+				ObjectFile="vc_x64_mswuddll\html\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_html_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -638,7 +638,7 @@
 		<Configuration
 			Name="DLL Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswudll_x64\html"
+			IntermediateDirectory="vc_x64_mswudll\html"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -672,8 +672,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_htmldll.pch"
-				ObjectFile="vc_mswudll_x64\html\"
+				PrecompiledHeaderFile="vc_x64_mswudll\wxprec_htmldll.pch"
+				ObjectFile="vc_x64_mswudll\html\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316u_html_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
diff --git a/build/msw/wx_vc9_media.vcproj b/build/msw/wx_vc9_media.vcproj
index 0a73e14f1b..14fbc5ca5d 100644
--- a/build/msw/wx_vc9_media.vcproj
+++ b/build/msw/wx_vc9_media.vcproj
@@ -379,7 +379,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswud_x64\media"
+			IntermediateDirectory="vc_x64_mswud\media"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -415,8 +415,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswud_x64\wxprec_medialib.pch"
-				ObjectFile="vc_mswud_x64\media\"
+				PrecompiledHeaderFile="vc_x64_mswud\wxprec_medialib.pch"
+				ObjectFile="vc_x64_mswud\media\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxmsw31ud_media.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -463,7 +463,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswu_x64\media"
+			IntermediateDirectory="vc_x64_mswu\media"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -497,8 +497,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswu_x64\wxprec_medialib.pch"
-				ObjectFile="vc_mswu_x64\media\"
+				PrecompiledHeaderFile="vc_x64_mswu\wxprec_medialib.pch"
+				ObjectFile="vc_x64_mswu\media\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxmsw31u_media.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -545,7 +545,7 @@
 		<Configuration
 			Name="DLL Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswuddll_x64\media"
+			IntermediateDirectory="vc_x64_mswuddll\media"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -581,8 +581,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_mediadll.pch"
-				ObjectFile="vc_mswuddll_x64\media\"
+				PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_mediadll.pch"
+				ObjectFile="vc_x64_mswuddll\media\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_media_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -638,7 +638,7 @@
 		<Configuration
 			Name="DLL Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswudll_x64\media"
+			IntermediateDirectory="vc_x64_mswudll\media"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -672,8 +672,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_mediadll.pch"
-				ObjectFile="vc_mswudll_x64\media\"
+				PrecompiledHeaderFile="vc_x64_mswudll\wxprec_mediadll.pch"
+				ObjectFile="vc_x64_mswudll\media\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316u_media_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
diff --git a/build/msw/wx_vc9_net.vcproj b/build/msw/wx_vc9_net.vcproj
index a7cbc2c444..128c1703f2 100644
--- a/build/msw/wx_vc9_net.vcproj
+++ b/build/msw/wx_vc9_net.vcproj
@@ -379,7 +379,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswud_x64\net"
+			IntermediateDirectory="vc_x64_mswud\net"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -415,8 +415,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswud_x64\wxprec_netlib.pch"
-				ObjectFile="vc_mswud_x64\net\"
+				PrecompiledHeaderFile="vc_x64_mswud\wxprec_netlib.pch"
+				ObjectFile="vc_x64_mswud\net\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxbase31ud_net.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -463,7 +463,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswu_x64\net"
+			IntermediateDirectory="vc_x64_mswu\net"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -497,8 +497,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswu_x64\wxprec_netlib.pch"
-				ObjectFile="vc_mswu_x64\net\"
+				PrecompiledHeaderFile="vc_x64_mswu\wxprec_netlib.pch"
+				ObjectFile="vc_x64_mswu\net\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxbase31u_net.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -545,7 +545,7 @@
 		<Configuration
 			Name="DLL Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswuddll_x64\net"
+			IntermediateDirectory="vc_x64_mswuddll\net"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -581,8 +581,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_netdll.pch"
-				ObjectFile="vc_mswuddll_x64\net\"
+				PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_netdll.pch"
+				ObjectFile="vc_x64_mswuddll\net\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase316ud_net_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -638,7 +638,7 @@
 		<Configuration
 			Name="DLL Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswudll_x64\net"
+			IntermediateDirectory="vc_x64_mswudll\net"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -672,8 +672,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_netdll.pch"
-				ObjectFile="vc_mswudll_x64\net\"
+				PrecompiledHeaderFile="vc_x64_mswudll\wxprec_netdll.pch"
+				ObjectFile="vc_x64_mswudll\net\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase316u_net_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
diff --git a/build/msw/wx_vc9_propgrid.vcproj b/build/msw/wx_vc9_propgrid.vcproj
index e7a80f17da..95afec2c52 100644
--- a/build/msw/wx_vc9_propgrid.vcproj
+++ b/build/msw/wx_vc9_propgrid.vcproj
@@ -379,7 +379,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswud_x64\propgrid"
+			IntermediateDirectory="vc_x64_mswud\propgrid"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -415,8 +415,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswud_x64\wxprec_propgridlib.pch"
-				ObjectFile="vc_mswud_x64\propgrid\"
+				PrecompiledHeaderFile="vc_x64_mswud\wxprec_propgridlib.pch"
+				ObjectFile="vc_x64_mswud\propgrid\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxmsw31ud_propgrid.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -463,7 +463,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswu_x64\propgrid"
+			IntermediateDirectory="vc_x64_mswu\propgrid"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -497,8 +497,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswu_x64\wxprec_propgridlib.pch"
-				ObjectFile="vc_mswu_x64\propgrid\"
+				PrecompiledHeaderFile="vc_x64_mswu\wxprec_propgridlib.pch"
+				ObjectFile="vc_x64_mswu\propgrid\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxmsw31u_propgrid.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -545,7 +545,7 @@
 		<Configuration
 			Name="DLL Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswuddll_x64\propgrid"
+			IntermediateDirectory="vc_x64_mswuddll\propgrid"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -581,8 +581,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_propgriddll.pch"
-				ObjectFile="vc_mswuddll_x64\propgrid\"
+				PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_propgriddll.pch"
+				ObjectFile="vc_x64_mswuddll\propgrid\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_propgrid_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -638,7 +638,7 @@
 		<Configuration
 			Name="DLL Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswudll_x64\propgrid"
+			IntermediateDirectory="vc_x64_mswudll\propgrid"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -672,8 +672,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_propgriddll.pch"
-				ObjectFile="vc_mswudll_x64\propgrid\"
+				PrecompiledHeaderFile="vc_x64_mswudll\wxprec_propgriddll.pch"
+				ObjectFile="vc_x64_mswudll\propgrid\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316u_propgrid_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
diff --git a/build/msw/wx_vc9_qa.vcproj b/build/msw/wx_vc9_qa.vcproj
index a420a6cefe..7d45c9f931 100644
--- a/build/msw/wx_vc9_qa.vcproj
+++ b/build/msw/wx_vc9_qa.vcproj
@@ -379,7 +379,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswud_x64\qa"
+			IntermediateDirectory="vc_x64_mswud\qa"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -415,8 +415,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswud_x64\wxprec_qalib.pch"
-				ObjectFile="vc_mswud_x64\qa\"
+				PrecompiledHeaderFile="vc_x64_mswud\wxprec_qalib.pch"
+				ObjectFile="vc_x64_mswud\qa\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxmsw31ud_qa.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -463,7 +463,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswu_x64\qa"
+			IntermediateDirectory="vc_x64_mswu\qa"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -497,8 +497,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswu_x64\wxprec_qalib.pch"
-				ObjectFile="vc_mswu_x64\qa\"
+				PrecompiledHeaderFile="vc_x64_mswu\wxprec_qalib.pch"
+				ObjectFile="vc_x64_mswu\qa\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxmsw31u_qa.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -545,7 +545,7 @@
 		<Configuration
 			Name="DLL Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswuddll_x64\qa"
+			IntermediateDirectory="vc_x64_mswuddll\qa"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -581,8 +581,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_qadll.pch"
-				ObjectFile="vc_mswuddll_x64\qa\"
+				PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_qadll.pch"
+				ObjectFile="vc_x64_mswuddll\qa\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_qa_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -638,7 +638,7 @@
 		<Configuration
 			Name="DLL Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswudll_x64\qa"
+			IntermediateDirectory="vc_x64_mswudll\qa"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -672,8 +672,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_qadll.pch"
-				ObjectFile="vc_mswudll_x64\qa\"
+				PrecompiledHeaderFile="vc_x64_mswudll\wxprec_qadll.pch"
+				ObjectFile="vc_x64_mswudll\qa\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316u_qa_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
diff --git a/build/msw/wx_vc9_ribbon.vcproj b/build/msw/wx_vc9_ribbon.vcproj
index 83a4491db7..667fb6a363 100644
--- a/build/msw/wx_vc9_ribbon.vcproj
+++ b/build/msw/wx_vc9_ribbon.vcproj
@@ -379,7 +379,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswud_x64\ribbon"
+			IntermediateDirectory="vc_x64_mswud\ribbon"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -415,8 +415,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswud_x64\wxprec_ribbonlib.pch"
-				ObjectFile="vc_mswud_x64\ribbon\"
+				PrecompiledHeaderFile="vc_x64_mswud\wxprec_ribbonlib.pch"
+				ObjectFile="vc_x64_mswud\ribbon\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxmsw31ud_ribbon.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -463,7 +463,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswu_x64\ribbon"
+			IntermediateDirectory="vc_x64_mswu\ribbon"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -497,8 +497,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswu_x64\wxprec_ribbonlib.pch"
-				ObjectFile="vc_mswu_x64\ribbon\"
+				PrecompiledHeaderFile="vc_x64_mswu\wxprec_ribbonlib.pch"
+				ObjectFile="vc_x64_mswu\ribbon\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxmsw31u_ribbon.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -545,7 +545,7 @@
 		<Configuration
 			Name="DLL Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswuddll_x64\ribbon"
+			IntermediateDirectory="vc_x64_mswuddll\ribbon"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -581,8 +581,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_ribbondll.pch"
-				ObjectFile="vc_mswuddll_x64\ribbon\"
+				PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_ribbondll.pch"
+				ObjectFile="vc_x64_mswuddll\ribbon\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_ribbon_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -638,7 +638,7 @@
 		<Configuration
 			Name="DLL Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswudll_x64\ribbon"
+			IntermediateDirectory="vc_x64_mswudll\ribbon"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -672,8 +672,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_ribbondll.pch"
-				ObjectFile="vc_mswudll_x64\ribbon\"
+				PrecompiledHeaderFile="vc_x64_mswudll\wxprec_ribbondll.pch"
+				ObjectFile="vc_x64_mswudll\ribbon\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316u_ribbon_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
diff --git a/build/msw/wx_vc9_richtext.vcproj b/build/msw/wx_vc9_richtext.vcproj
index 61e83f0f35..1b4de21fc1 100644
--- a/build/msw/wx_vc9_richtext.vcproj
+++ b/build/msw/wx_vc9_richtext.vcproj
@@ -379,7 +379,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswud_x64\richtext"
+			IntermediateDirectory="vc_x64_mswud\richtext"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -415,8 +415,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswud_x64\wxprec_richtextlib.pch"
-				ObjectFile="vc_mswud_x64\richtext\"
+				PrecompiledHeaderFile="vc_x64_mswud\wxprec_richtextlib.pch"
+				ObjectFile="vc_x64_mswud\richtext\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxmsw31ud_richtext.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -463,7 +463,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswu_x64\richtext"
+			IntermediateDirectory="vc_x64_mswu\richtext"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -497,8 +497,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswu_x64\wxprec_richtextlib.pch"
-				ObjectFile="vc_mswu_x64\richtext\"
+				PrecompiledHeaderFile="vc_x64_mswu\wxprec_richtextlib.pch"
+				ObjectFile="vc_x64_mswu\richtext\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxmsw31u_richtext.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -545,7 +545,7 @@
 		<Configuration
 			Name="DLL Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswuddll_x64\richtext"
+			IntermediateDirectory="vc_x64_mswuddll\richtext"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -581,8 +581,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_richtextdll.pch"
-				ObjectFile="vc_mswuddll_x64\richtext\"
+				PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_richtextdll.pch"
+				ObjectFile="vc_x64_mswuddll\richtext\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_richtext_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -638,7 +638,7 @@
 		<Configuration
 			Name="DLL Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswudll_x64\richtext"
+			IntermediateDirectory="vc_x64_mswudll\richtext"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -672,8 +672,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_richtextdll.pch"
-				ObjectFile="vc_mswudll_x64\richtext\"
+				PrecompiledHeaderFile="vc_x64_mswudll\wxprec_richtextdll.pch"
+				ObjectFile="vc_x64_mswudll\richtext\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316u_richtext_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
diff --git a/build/msw/wx_vc9_stc.vcproj b/build/msw/wx_vc9_stc.vcproj
index 3310f1aef7..686e743096 100644
--- a/build/msw/wx_vc9_stc.vcproj
+++ b/build/msw/wx_vc9_stc.vcproj
@@ -379,7 +379,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswud_x64\stc"
+			IntermediateDirectory="vc_x64_mswud\stc"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -415,8 +415,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswud_x64\wxprec_stclib.pch"
-				ObjectFile="vc_mswud_x64\stc\"
+				PrecompiledHeaderFile="vc_x64_mswud\wxprec_stclib.pch"
+				ObjectFile="vc_x64_mswud\stc\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxmsw31ud_stc.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -463,7 +463,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswu_x64\stc"
+			IntermediateDirectory="vc_x64_mswu\stc"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -497,8 +497,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswu_x64\wxprec_stclib.pch"
-				ObjectFile="vc_mswu_x64\stc\"
+				PrecompiledHeaderFile="vc_x64_mswu\wxprec_stclib.pch"
+				ObjectFile="vc_x64_mswu\stc\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxmsw31u_stc.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -545,7 +545,7 @@
 		<Configuration
 			Name="DLL Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswuddll_x64\stc"
+			IntermediateDirectory="vc_x64_mswuddll\stc"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -581,8 +581,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_stcdll.pch"
-				ObjectFile="vc_mswuddll_x64\stc\"
+				PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_stcdll.pch"
+				ObjectFile="vc_x64_mswuddll\stc\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_stc_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -638,7 +638,7 @@
 		<Configuration
 			Name="DLL Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswudll_x64\stc"
+			IntermediateDirectory="vc_x64_mswudll\stc"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -672,8 +672,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_stcdll.pch"
-				ObjectFile="vc_mswudll_x64\stc\"
+				PrecompiledHeaderFile="vc_x64_mswudll\wxprec_stcdll.pch"
+				ObjectFile="vc_x64_mswudll\stc\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316u_stc_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
diff --git a/build/msw/wx_vc9_webview.vcproj b/build/msw/wx_vc9_webview.vcproj
index 43c2a29070..5796a60335 100644
--- a/build/msw/wx_vc9_webview.vcproj
+++ b/build/msw/wx_vc9_webview.vcproj
@@ -379,7 +379,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswud_x64\webview"
+			IntermediateDirectory="vc_x64_mswud\webview"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -415,8 +415,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswud_x64\wxprec_webviewlib.pch"
-				ObjectFile="vc_mswud_x64\webview\"
+				PrecompiledHeaderFile="vc_x64_mswud\wxprec_webviewlib.pch"
+				ObjectFile="vc_x64_mswud\webview\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxmsw31ud_webview.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -463,7 +463,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswu_x64\webview"
+			IntermediateDirectory="vc_x64_mswu\webview"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -497,8 +497,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswu_x64\wxprec_webviewlib.pch"
-				ObjectFile="vc_mswu_x64\webview\"
+				PrecompiledHeaderFile="vc_x64_mswu\wxprec_webviewlib.pch"
+				ObjectFile="vc_x64_mswu\webview\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxmsw31u_webview.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -545,7 +545,7 @@
 		<Configuration
 			Name="DLL Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswuddll_x64\webview"
+			IntermediateDirectory="vc_x64_mswuddll\webview"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -581,8 +581,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_webviewdll.pch"
-				ObjectFile="vc_mswuddll_x64\webview\"
+				PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_webviewdll.pch"
+				ObjectFile="vc_x64_mswuddll\webview\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_webview_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -638,7 +638,7 @@
 		<Configuration
 			Name="DLL Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswudll_x64\webview"
+			IntermediateDirectory="vc_x64_mswudll\webview"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -672,8 +672,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_webviewdll.pch"
-				ObjectFile="vc_mswudll_x64\webview\"
+				PrecompiledHeaderFile="vc_x64_mswudll\wxprec_webviewdll.pch"
+				ObjectFile="vc_x64_mswudll\webview\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316u_webview_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
diff --git a/build/msw/wx_vc9_wxexpat.vcproj b/build/msw/wx_vc9_wxexpat.vcproj
index 2b7e3c570f..17a474d17d 100644
--- a/build/msw/wx_vc9_wxexpat.vcproj
+++ b/build/msw/wx_vc9_wxexpat.vcproj
@@ -343,7 +343,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswud_x64\wxexpat"
+			IntermediateDirectory="vc_x64_mswud\wxexpat"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -376,7 +376,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\wxexpat\"
+				ObjectFile="vc_x64_mswud\wxexpat\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxexpatd.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -423,7 +423,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswu_x64\wxexpat"
+			IntermediateDirectory="vc_x64_mswu\wxexpat"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -454,7 +454,7 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\wxexpat\"
+				ObjectFile="vc_x64_mswu\wxexpat\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxexpat.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -501,7 +501,7 @@
 		<Configuration
 			Name="DLL Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswuddll_x64\wxexpat"
+			IntermediateDirectory="vc_x64_mswuddll\wxexpat"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -534,7 +534,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\wxexpat\"
+				ObjectFile="vc_x64_mswuddll\wxexpat\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxexpatd.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -581,7 +581,7 @@
 		<Configuration
 			Name="DLL Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswudll_x64\wxexpat"
+			IntermediateDirectory="vc_x64_mswudll\wxexpat"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -612,7 +612,7 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\wxexpat\"
+				ObjectFile="vc_x64_mswudll\wxexpat\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxexpat.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
diff --git a/build/msw/wx_vc9_wxjpeg.vcproj b/build/msw/wx_vc9_wxjpeg.vcproj
index 5a1d2e894f..24e563ab78 100644
--- a/build/msw/wx_vc9_wxjpeg.vcproj
+++ b/build/msw/wx_vc9_wxjpeg.vcproj
@@ -343,7 +343,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswud_x64\wxjpeg"
+			IntermediateDirectory="vc_x64_mswud\wxjpeg"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -376,7 +376,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\wxjpeg\"
+				ObjectFile="vc_x64_mswud\wxjpeg\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxjpegd.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -423,7 +423,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswu_x64\wxjpeg"
+			IntermediateDirectory="vc_x64_mswu\wxjpeg"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -454,7 +454,7 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\wxjpeg\"
+				ObjectFile="vc_x64_mswu\wxjpeg\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxjpeg.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -501,7 +501,7 @@
 		<Configuration
 			Name="DLL Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswuddll_x64\wxjpeg"
+			IntermediateDirectory="vc_x64_mswuddll\wxjpeg"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -534,7 +534,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\wxjpeg\"
+				ObjectFile="vc_x64_mswuddll\wxjpeg\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxjpegd.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -581,7 +581,7 @@
 		<Configuration
 			Name="DLL Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswudll_x64\wxjpeg"
+			IntermediateDirectory="vc_x64_mswudll\wxjpeg"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -612,7 +612,7 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\wxjpeg\"
+				ObjectFile="vc_x64_mswudll\wxjpeg\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxjpeg.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
diff --git a/build/msw/wx_vc9_wxpng.vcproj b/build/msw/wx_vc9_wxpng.vcproj
index 9cc5c33421..15d42e21c4 100644
--- a/build/msw/wx_vc9_wxpng.vcproj
+++ b/build/msw/wx_vc9_wxpng.vcproj
@@ -343,7 +343,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswud_x64\wxpng"
+			IntermediateDirectory="vc_x64_mswud\wxpng"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -376,7 +376,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\wxpng\"
+				ObjectFile="vc_x64_mswud\wxpng\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxpngd.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -423,7 +423,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswu_x64\wxpng"
+			IntermediateDirectory="vc_x64_mswu\wxpng"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -454,7 +454,7 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\wxpng\"
+				ObjectFile="vc_x64_mswu\wxpng\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxpng.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -501,7 +501,7 @@
 		<Configuration
 			Name="DLL Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswuddll_x64\wxpng"
+			IntermediateDirectory="vc_x64_mswuddll\wxpng"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -534,7 +534,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\wxpng\"
+				ObjectFile="vc_x64_mswuddll\wxpng\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxpngd.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -581,7 +581,7 @@
 		<Configuration
 			Name="DLL Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswudll_x64\wxpng"
+			IntermediateDirectory="vc_x64_mswudll\wxpng"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -612,7 +612,7 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\wxpng\"
+				ObjectFile="vc_x64_mswudll\wxpng\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxpng.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
diff --git a/build/msw/wx_vc9_wxregex.vcproj b/build/msw/wx_vc9_wxregex.vcproj
index 8882030660..a513fa284e 100644
--- a/build/msw/wx_vc9_wxregex.vcproj
+++ b/build/msw/wx_vc9_wxregex.vcproj
@@ -347,7 +347,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswud_x64\wxregex"
+			IntermediateDirectory="vc_x64_mswud\wxregex"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -381,7 +381,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\wxregex\"
+				ObjectFile="vc_x64_mswud\wxregex\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxregexud.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -428,7 +428,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswu_x64\wxregex"
+			IntermediateDirectory="vc_x64_mswu\wxregex"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -460,7 +460,7 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\wxregex\"
+				ObjectFile="vc_x64_mswu\wxregex\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxregexu.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -507,7 +507,7 @@
 		<Configuration
 			Name="DLL Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswuddll_x64\wxregex"
+			IntermediateDirectory="vc_x64_mswuddll\wxregex"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,7 +541,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\wxregex\"
+				ObjectFile="vc_x64_mswuddll\wxregex\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxregexud.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -588,7 +588,7 @@
 		<Configuration
 			Name="DLL Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswudll_x64\wxregex"
+			IntermediateDirectory="vc_x64_mswudll\wxregex"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -620,7 +620,7 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\wxregex\"
+				ObjectFile="vc_x64_mswudll\wxregex\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxregexu.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
diff --git a/build/msw/wx_vc9_wxscintilla.vcproj b/build/msw/wx_vc9_wxscintilla.vcproj
index b55a0a3c88..db188b007a 100644
--- a/build/msw/wx_vc9_wxscintilla.vcproj
+++ b/build/msw/wx_vc9_wxscintilla.vcproj
@@ -347,7 +347,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswud_x64\wxscintilla"
+			IntermediateDirectory="vc_x64_mswud\wxscintilla"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -381,7 +381,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\wxscintilla\"
+				ObjectFile="vc_x64_mswud\wxscintilla\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxscintillad.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -428,7 +428,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswu_x64\wxscintilla"
+			IntermediateDirectory="vc_x64_mswu\wxscintilla"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -460,7 +460,7 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\wxscintilla\"
+				ObjectFile="vc_x64_mswu\wxscintilla\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxscintilla.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -507,7 +507,7 @@
 		<Configuration
 			Name="DLL Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswuddll_x64\wxscintilla"
+			IntermediateDirectory="vc_x64_mswuddll\wxscintilla"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,7 +541,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\wxscintilla\"
+				ObjectFile="vc_x64_mswuddll\wxscintilla\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxscintillad.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -588,7 +588,7 @@
 		<Configuration
 			Name="DLL Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswudll_x64\wxscintilla"
+			IntermediateDirectory="vc_x64_mswudll\wxscintilla"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -620,7 +620,7 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\wxscintilla\"
+				ObjectFile="vc_x64_mswudll\wxscintilla\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxscintilla.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
diff --git a/build/msw/wx_vc9_wxtiff.vcproj b/build/msw/wx_vc9_wxtiff.vcproj
index 9532cd4048..34dba5bea8 100644
--- a/build/msw/wx_vc9_wxtiff.vcproj
+++ b/build/msw/wx_vc9_wxtiff.vcproj
@@ -343,7 +343,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswud_x64\wxtiff"
+			IntermediateDirectory="vc_x64_mswud\wxtiff"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -376,7 +376,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\wxtiff\"
+				ObjectFile="vc_x64_mswud\wxtiff\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxtiffd.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -423,7 +423,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswu_x64\wxtiff"
+			IntermediateDirectory="vc_x64_mswu\wxtiff"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -454,7 +454,7 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\wxtiff\"
+				ObjectFile="vc_x64_mswu\wxtiff\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxtiff.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -501,7 +501,7 @@
 		<Configuration
 			Name="DLL Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswuddll_x64\wxtiff"
+			IntermediateDirectory="vc_x64_mswuddll\wxtiff"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -534,7 +534,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\wxtiff\"
+				ObjectFile="vc_x64_mswuddll\wxtiff\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxtiffd.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -581,7 +581,7 @@
 		<Configuration
 			Name="DLL Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswudll_x64\wxtiff"
+			IntermediateDirectory="vc_x64_mswudll\wxtiff"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -612,7 +612,7 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\wxtiff\"
+				ObjectFile="vc_x64_mswudll\wxtiff\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxtiff.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
diff --git a/build/msw/wx_vc9_wxzlib.vcproj b/build/msw/wx_vc9_wxzlib.vcproj
index ef4974125e..00211b7402 100644
--- a/build/msw/wx_vc9_wxzlib.vcproj
+++ b/build/msw/wx_vc9_wxzlib.vcproj
@@ -343,7 +343,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswud_x64\wxzlib"
+			IntermediateDirectory="vc_x64_mswud\wxzlib"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -376,7 +376,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\wxzlib\"
+				ObjectFile="vc_x64_mswud\wxzlib\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxzlibd.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -423,7 +423,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswu_x64\wxzlib"
+			IntermediateDirectory="vc_x64_mswu\wxzlib"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -454,7 +454,7 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\wxzlib\"
+				ObjectFile="vc_x64_mswu\wxzlib\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxzlib.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -501,7 +501,7 @@
 		<Configuration
 			Name="DLL Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswuddll_x64\wxzlib"
+			IntermediateDirectory="vc_x64_mswuddll\wxzlib"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -534,7 +534,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\wxzlib\"
+				ObjectFile="vc_x64_mswuddll\wxzlib\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxzlibd.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -581,7 +581,7 @@
 		<Configuration
 			Name="DLL Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswudll_x64\wxzlib"
+			IntermediateDirectory="vc_x64_mswudll\wxzlib"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -612,7 +612,7 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\wxzlib\"
+				ObjectFile="vc_x64_mswudll\wxzlib\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxzlib.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
diff --git a/build/msw/wx_vc9_xml.vcproj b/build/msw/wx_vc9_xml.vcproj
index 13d4289029..f933ee81b6 100644
--- a/build/msw/wx_vc9_xml.vcproj
+++ b/build/msw/wx_vc9_xml.vcproj
@@ -379,7 +379,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswud_x64\xml"
+			IntermediateDirectory="vc_x64_mswud\xml"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -415,8 +415,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswud_x64\wxprec_xmllib.pch"
-				ObjectFile="vc_mswud_x64\xml\"
+				PrecompiledHeaderFile="vc_x64_mswud\wxprec_xmllib.pch"
+				ObjectFile="vc_x64_mswud\xml\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxbase31ud_xml.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -463,7 +463,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswu_x64\xml"
+			IntermediateDirectory="vc_x64_mswu\xml"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -497,8 +497,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswu_x64\wxprec_xmllib.pch"
-				ObjectFile="vc_mswu_x64\xml\"
+				PrecompiledHeaderFile="vc_x64_mswu\wxprec_xmllib.pch"
+				ObjectFile="vc_x64_mswu\xml\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxbase31u_xml.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -545,7 +545,7 @@
 		<Configuration
 			Name="DLL Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswuddll_x64\xml"
+			IntermediateDirectory="vc_x64_mswuddll\xml"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -581,8 +581,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_xmldll.pch"
-				ObjectFile="vc_mswuddll_x64\xml\"
+				PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_xmldll.pch"
+				ObjectFile="vc_x64_mswuddll\xml\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase316ud_xml_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -638,7 +638,7 @@
 		<Configuration
 			Name="DLL Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswudll_x64\xml"
+			IntermediateDirectory="vc_x64_mswudll\xml"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -672,8 +672,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_xmldll.pch"
-				ObjectFile="vc_mswudll_x64\xml\"
+				PrecompiledHeaderFile="vc_x64_mswudll\wxprec_xmldll.pch"
+				ObjectFile="vc_x64_mswudll\xml\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase316u_xml_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
diff --git a/build/msw/wx_vc9_xrc.vcproj b/build/msw/wx_vc9_xrc.vcproj
index 0bcaafba5b..dd5f1f7d8d 100644
--- a/build/msw/wx_vc9_xrc.vcproj
+++ b/build/msw/wx_vc9_xrc.vcproj
@@ -379,7 +379,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswud_x64\xrc"
+			IntermediateDirectory="vc_x64_mswud\xrc"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -415,8 +415,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswud_x64\wxprec_xrclib.pch"
-				ObjectFile="vc_mswud_x64\xrc\"
+				PrecompiledHeaderFile="vc_x64_mswud\wxprec_xrclib.pch"
+				ObjectFile="vc_x64_mswud\xrc\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxmsw31ud_xrc.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -463,7 +463,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_lib"
-			IntermediateDirectory="vc_mswu_x64\xrc"
+			IntermediateDirectory="vc_x64_mswu\xrc"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -497,8 +497,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswu_x64\wxprec_xrclib.pch"
-				ObjectFile="vc_mswu_x64\xrc\"
+				PrecompiledHeaderFile="vc_x64_mswu\wxprec_xrclib.pch"
+				ObjectFile="vc_x64_mswu\xrc\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_lib\wxmsw31u_xrc.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -545,7 +545,7 @@
 		<Configuration
 			Name="DLL Debug|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswuddll_x64\xrc"
+			IntermediateDirectory="vc_x64_mswuddll\xrc"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -581,8 +581,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_xrcdll.pch"
-				ObjectFile="vc_mswuddll_x64\xrc\"
+				PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_xrcdll.pch"
+				ObjectFile="vc_x64_mswuddll\xrc\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_xrc_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -638,7 +638,7 @@
 		<Configuration
 			Name="DLL Release|x64"
 			OutputDirectory="..\..\lib\vc_x64_dll"
-			IntermediateDirectory="vc_mswudll_x64\xrc"
+			IntermediateDirectory="vc_x64_mswudll\xrc"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -672,8 +672,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_xrcdll.pch"
-				ObjectFile="vc_mswudll_x64\xrc\"
+				PrecompiledHeaderFile="vc_x64_mswudll\wxprec_xrcdll.pch"
+				ObjectFile="vc_x64_mswudll\xrc\"
 				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316u_xrc_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
diff --git a/demos/bombs/bombs_vc8.vcproj b/demos/bombs/bombs_vc8.vcproj
index cf84ba0129..c23f58ad6a 100644
--- a/demos/bombs/bombs_vc8.vcproj
+++ b/demos/bombs/bombs_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\bombs"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\bombs"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\bombs\"
-				ProgramDataBaseFileName="vc_mswud_x64\bombs.pdb"
+				ObjectFile="vc_x64_mswud\bombs\"
+				ProgramDataBaseFileName="vc_x64_mswud\bombs.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\bombs.exe"
+				OutputFile="vc_x64_mswud\bombs.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\bombs.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\bombs.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\bombs_vc8.bsc"
+				OutputFile="vc_x64_mswud\bombs_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\bombs"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\bombs"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\bombs\"
-				ProgramDataBaseFileName="vc_mswu_x64\bombs.pdb"
+				ObjectFile="vc_x64_mswu\bombs\"
+				ProgramDataBaseFileName="vc_x64_mswu\bombs.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\bombs.exe"
+				OutputFile="vc_x64_mswu\bombs.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\bombs.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\bombs.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\bombs_vc8.bsc"
+				OutputFile="vc_x64_mswu\bombs_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\bombs"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\bombs"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\bombs\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\bombs.pdb"
+				ObjectFile="vc_x64_mswuddll\bombs\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\bombs.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\bombs.exe"
+				OutputFile="vc_x64_mswuddll\bombs.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\bombs.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\bombs.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\bombs_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\bombs_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\bombs"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\bombs"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\bombs\"
-				ProgramDataBaseFileName="vc_mswudll_x64\bombs.pdb"
+				ObjectFile="vc_x64_mswudll\bombs\"
+				ProgramDataBaseFileName="vc_x64_mswudll\bombs.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\bombs.exe"
+				OutputFile="vc_x64_mswudll\bombs.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\bombs.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\bombs.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\bombs_vc8.bsc"
+				OutputFile="vc_x64_mswudll\bombs_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/demos/bombs/bombs_vc9.vcproj b/demos/bombs/bombs_vc9.vcproj
index a7b91beaba..ca4474557d 100644
--- a/demos/bombs/bombs_vc9.vcproj
+++ b/demos/bombs/bombs_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\bombs"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\bombs"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\bombs\"
-				ProgramDataBaseFileName="vc_mswud_x64\bombs.pdb"
+				ObjectFile="vc_x64_mswud\bombs\"
+				ProgramDataBaseFileName="vc_x64_mswud\bombs.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\bombs.exe"
+				OutputFile="vc_x64_mswud\bombs.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\bombs.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\bombs.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\bombs_vc9.bsc"
+				OutputFile="vc_x64_mswud\bombs_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\bombs"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\bombs"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\bombs\"
-				ProgramDataBaseFileName="vc_mswu_x64\bombs.pdb"
+				ObjectFile="vc_x64_mswu\bombs\"
+				ProgramDataBaseFileName="vc_x64_mswu\bombs.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\bombs.exe"
+				OutputFile="vc_x64_mswu\bombs.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\bombs.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\bombs.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\bombs_vc9.bsc"
+				OutputFile="vc_x64_mswu\bombs_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\bombs"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\bombs"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\bombs\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\bombs.pdb"
+				ObjectFile="vc_x64_mswuddll\bombs\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\bombs.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\bombs.exe"
+				OutputFile="vc_x64_mswuddll\bombs.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\bombs.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\bombs.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\bombs_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\bombs_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\bombs"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\bombs"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\bombs\"
-				ProgramDataBaseFileName="vc_mswudll_x64\bombs.pdb"
+				ObjectFile="vc_x64_mswudll\bombs\"
+				ProgramDataBaseFileName="vc_x64_mswudll\bombs.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\bombs.exe"
+				OutputFile="vc_x64_mswudll\bombs.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\bombs.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\bombs.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\bombs_vc9.bsc"
+				OutputFile="vc_x64_mswudll\bombs_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/demos/bombs/makefile.vc b/demos/bombs/makefile.vc
index db7b08ac97..7f72970323 100644
--- a/demos/bombs/makefile.vc
+++ b/demos/bombs/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/demos/forty/forty_vc8.vcproj b/demos/forty/forty_vc8.vcproj
index e64b07fc51..d960b83acd 100644
--- a/demos/forty/forty_vc8.vcproj
+++ b/demos/forty/forty_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\forty"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\forty"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\forty\"
-				ProgramDataBaseFileName="vc_mswud_x64\forty.pdb"
+				ObjectFile="vc_x64_mswud\forty\"
+				ProgramDataBaseFileName="vc_x64_mswud\forty.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxbase31ud_xml.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\forty.exe"
+				OutputFile="vc_x64_mswud\forty.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\forty.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\forty.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\forty_vc8.bsc"
+				OutputFile="vc_x64_mswud\forty_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\forty"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\forty"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\forty\"
-				ProgramDataBaseFileName="vc_mswu_x64\forty.pdb"
+				ObjectFile="vc_x64_mswu\forty\"
+				ProgramDataBaseFileName="vc_x64_mswu\forty.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxbase31u_xml.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\forty.exe"
+				OutputFile="vc_x64_mswu\forty.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\forty.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\forty.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\forty_vc8.bsc"
+				OutputFile="vc_x64_mswu\forty_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\forty"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\forty"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\forty\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\forty.pdb"
+				ObjectFile="vc_x64_mswuddll\forty\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\forty.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxbase31ud_xml.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\forty.exe"
+				OutputFile="vc_x64_mswuddll\forty.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\forty.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\forty.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\forty_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\forty_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\forty"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\forty"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\forty\"
-				ProgramDataBaseFileName="vc_mswudll_x64\forty.pdb"
+				ObjectFile="vc_x64_mswudll\forty\"
+				ProgramDataBaseFileName="vc_x64_mswudll\forty.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxbase31u_xml.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\forty.exe"
+				OutputFile="vc_x64_mswudll\forty.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\forty.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\forty.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\forty_vc8.bsc"
+				OutputFile="vc_x64_mswudll\forty_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/demos/forty/forty_vc9.vcproj b/demos/forty/forty_vc9.vcproj
index 8014fd3af4..ea7f70a7bb 100644
--- a/demos/forty/forty_vc9.vcproj
+++ b/demos/forty/forty_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\forty"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\forty"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\forty\"
-				ProgramDataBaseFileName="vc_mswud_x64\forty.pdb"
+				ObjectFile="vc_x64_mswud\forty\"
+				ProgramDataBaseFileName="vc_x64_mswud\forty.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxbase31ud_xml.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\forty.exe"
+				OutputFile="vc_x64_mswud\forty.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\forty.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\forty.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\forty_vc9.bsc"
+				OutputFile="vc_x64_mswud\forty_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\forty"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\forty"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\forty\"
-				ProgramDataBaseFileName="vc_mswu_x64\forty.pdb"
+				ObjectFile="vc_x64_mswu\forty\"
+				ProgramDataBaseFileName="vc_x64_mswu\forty.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxbase31u_xml.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\forty.exe"
+				OutputFile="vc_x64_mswu\forty.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\forty.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\forty.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\forty_vc9.bsc"
+				OutputFile="vc_x64_mswu\forty_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\forty"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\forty"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\forty\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\forty.pdb"
+				ObjectFile="vc_x64_mswuddll\forty\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\forty.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxbase31ud_xml.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\forty.exe"
+				OutputFile="vc_x64_mswuddll\forty.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\forty.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\forty.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\forty_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\forty_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\forty"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\forty"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\forty\"
-				ProgramDataBaseFileName="vc_mswudll_x64\forty.pdb"
+				ObjectFile="vc_x64_mswudll\forty\"
+				ProgramDataBaseFileName="vc_x64_mswudll\forty.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxbase31u_xml.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\forty.exe"
+				OutputFile="vc_x64_mswudll\forty.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\forty.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\forty.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\forty_vc9.bsc"
+				OutputFile="vc_x64_mswudll\forty_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/demos/forty/makefile.vc b/demos/forty/makefile.vc
index 1e9f227592..3c54edab2b 100644
--- a/demos/forty/makefile.vc
+++ b/demos/forty/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/demos/fractal/fractal_vc8.vcproj b/demos/fractal/fractal_vc8.vcproj
index bbeccb395c..380eee0e5b 100644
--- a/demos/fractal/fractal_vc8.vcproj
+++ b/demos/fractal/fractal_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\fractal"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\fractal"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\fractal\"
-				ProgramDataBaseFileName="vc_mswud_x64\fractal.pdb"
+				ObjectFile="vc_x64_mswud\fractal\"
+				ProgramDataBaseFileName="vc_x64_mswud\fractal.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\fractal.exe"
+				OutputFile="vc_x64_mswud\fractal.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\fractal.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\fractal.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\fractal_vc8.bsc"
+				OutputFile="vc_x64_mswud\fractal_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\fractal"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\fractal"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\fractal\"
-				ProgramDataBaseFileName="vc_mswu_x64\fractal.pdb"
+				ObjectFile="vc_x64_mswu\fractal\"
+				ProgramDataBaseFileName="vc_x64_mswu\fractal.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\fractal.exe"
+				OutputFile="vc_x64_mswu\fractal.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\fractal.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\fractal.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\fractal_vc8.bsc"
+				OutputFile="vc_x64_mswu\fractal_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\fractal"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\fractal"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\fractal\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\fractal.pdb"
+				ObjectFile="vc_x64_mswuddll\fractal\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\fractal.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\fractal.exe"
+				OutputFile="vc_x64_mswuddll\fractal.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\fractal.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\fractal.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\fractal_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\fractal_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\fractal"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\fractal"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\fractal\"
-				ProgramDataBaseFileName="vc_mswudll_x64\fractal.pdb"
+				ObjectFile="vc_x64_mswudll\fractal\"
+				ProgramDataBaseFileName="vc_x64_mswudll\fractal.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\fractal.exe"
+				OutputFile="vc_x64_mswudll\fractal.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\fractal.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\fractal.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\fractal_vc8.bsc"
+				OutputFile="vc_x64_mswudll\fractal_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/demos/fractal/fractal_vc9.vcproj b/demos/fractal/fractal_vc9.vcproj
index abe9f830c2..6684d39be5 100644
--- a/demos/fractal/fractal_vc9.vcproj
+++ b/demos/fractal/fractal_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\fractal"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\fractal"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\fractal\"
-				ProgramDataBaseFileName="vc_mswud_x64\fractal.pdb"
+				ObjectFile="vc_x64_mswud\fractal\"
+				ProgramDataBaseFileName="vc_x64_mswud\fractal.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\fractal.exe"
+				OutputFile="vc_x64_mswud\fractal.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\fractal.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\fractal.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\fractal_vc9.bsc"
+				OutputFile="vc_x64_mswud\fractal_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\fractal"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\fractal"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\fractal\"
-				ProgramDataBaseFileName="vc_mswu_x64\fractal.pdb"
+				ObjectFile="vc_x64_mswu\fractal\"
+				ProgramDataBaseFileName="vc_x64_mswu\fractal.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\fractal.exe"
+				OutputFile="vc_x64_mswu\fractal.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\fractal.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\fractal.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\fractal_vc9.bsc"
+				OutputFile="vc_x64_mswu\fractal_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\fractal"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\fractal"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\fractal\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\fractal.pdb"
+				ObjectFile="vc_x64_mswuddll\fractal\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\fractal.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\fractal.exe"
+				OutputFile="vc_x64_mswuddll\fractal.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\fractal.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\fractal.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\fractal_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\fractal_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\fractal"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\fractal"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\fractal\"
-				ProgramDataBaseFileName="vc_mswudll_x64\fractal.pdb"
+				ObjectFile="vc_x64_mswudll\fractal\"
+				ProgramDataBaseFileName="vc_x64_mswudll\fractal.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\fractal.exe"
+				OutputFile="vc_x64_mswudll\fractal.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\fractal.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\fractal.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\fractal_vc9.bsc"
+				OutputFile="vc_x64_mswudll\fractal_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/demos/fractal/makefile.vc b/demos/fractal/makefile.vc
index f789de0cb6..63e0ab7567 100644
--- a/demos/fractal/makefile.vc
+++ b/demos/fractal/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/demos/life/life_vc8.vcproj b/demos/life/life_vc8.vcproj
index 48b0644962..8b01919d5e 100644
--- a/demos/life/life_vc8.vcproj
+++ b/demos/life/life_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\life"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\life"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\life\"
-				ProgramDataBaseFileName="vc_mswud_x64\life.pdb"
+				ObjectFile="vc_x64_mswud\life\"
+				ProgramDataBaseFileName="vc_x64_mswud\life.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\life.exe"
+				OutputFile="vc_x64_mswud\life.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\life.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\life.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\life_vc8.bsc"
+				OutputFile="vc_x64_mswud\life_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\life"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\life"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\life\"
-				ProgramDataBaseFileName="vc_mswu_x64\life.pdb"
+				ObjectFile="vc_x64_mswu\life\"
+				ProgramDataBaseFileName="vc_x64_mswu\life.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\life.exe"
+				OutputFile="vc_x64_mswu\life.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\life.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\life.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\life_vc8.bsc"
+				OutputFile="vc_x64_mswu\life_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\life"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\life"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\life\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\life.pdb"
+				ObjectFile="vc_x64_mswuddll\life\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\life.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\life.exe"
+				OutputFile="vc_x64_mswuddll\life.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\life.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\life.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\life_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\life_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\life"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\life"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\life\"
-				ProgramDataBaseFileName="vc_mswudll_x64\life.pdb"
+				ObjectFile="vc_x64_mswudll\life\"
+				ProgramDataBaseFileName="vc_x64_mswudll\life.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\life.exe"
+				OutputFile="vc_x64_mswudll\life.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\life.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\life.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\life_vc8.bsc"
+				OutputFile="vc_x64_mswudll\life_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/demos/life/life_vc9.vcproj b/demos/life/life_vc9.vcproj
index ede089cb88..6e483fd48b 100644
--- a/demos/life/life_vc9.vcproj
+++ b/demos/life/life_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\life"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\life"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\life\"
-				ProgramDataBaseFileName="vc_mswud_x64\life.pdb"
+				ObjectFile="vc_x64_mswud\life\"
+				ProgramDataBaseFileName="vc_x64_mswud\life.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\life.exe"
+				OutputFile="vc_x64_mswud\life.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\life.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\life.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\life_vc9.bsc"
+				OutputFile="vc_x64_mswud\life_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\life"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\life"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\life\"
-				ProgramDataBaseFileName="vc_mswu_x64\life.pdb"
+				ObjectFile="vc_x64_mswu\life\"
+				ProgramDataBaseFileName="vc_x64_mswu\life.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\life.exe"
+				OutputFile="vc_x64_mswu\life.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\life.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\life.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\life_vc9.bsc"
+				OutputFile="vc_x64_mswu\life_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\life"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\life"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\life\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\life.pdb"
+				ObjectFile="vc_x64_mswuddll\life\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\life.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\life.exe"
+				OutputFile="vc_x64_mswuddll\life.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\life.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\life.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\life_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\life_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\life"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\life"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\life\"
-				ProgramDataBaseFileName="vc_mswudll_x64\life.pdb"
+				ObjectFile="vc_x64_mswudll\life\"
+				ProgramDataBaseFileName="vc_x64_mswudll\life.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\life.exe"
+				OutputFile="vc_x64_mswudll\life.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\life.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\life.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\life_vc9.bsc"
+				OutputFile="vc_x64_mswudll\life_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/demos/life/makefile.vc b/demos/life/makefile.vc
index fa71ae251e..dc06841cc9 100644
--- a/demos/life/makefile.vc
+++ b/demos/life/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/demos/poem/makefile.vc b/demos/poem/makefile.vc
index baf56ddd99..ec6c8ad0d5 100644
--- a/demos/poem/makefile.vc
+++ b/demos/poem/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/demos/poem/poem_vc8.vcproj b/demos/poem/poem_vc8.vcproj
index d4933919d8..2a215d1a4b 100644
--- a/demos/poem/poem_vc8.vcproj
+++ b/demos/poem/poem_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\wxpoem"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\wxpoem"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\wxpoem\"
-				ProgramDataBaseFileName="vc_mswud_x64\wxpoem.pdb"
+				ObjectFile="vc_x64_mswud\wxpoem\"
+				ProgramDataBaseFileName="vc_x64_mswud\wxpoem.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\wxpoem.exe"
+				OutputFile="vc_x64_mswud\wxpoem.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\wxpoem.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\wxpoem.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\poem_vc8.bsc"
+				OutputFile="vc_x64_mswud\poem_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\wxpoem"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\wxpoem"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\wxpoem\"
-				ProgramDataBaseFileName="vc_mswu_x64\wxpoem.pdb"
+				ObjectFile="vc_x64_mswu\wxpoem\"
+				ProgramDataBaseFileName="vc_x64_mswu\wxpoem.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\wxpoem.exe"
+				OutputFile="vc_x64_mswu\wxpoem.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\wxpoem.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\wxpoem.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\poem_vc8.bsc"
+				OutputFile="vc_x64_mswu\poem_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\wxpoem"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\wxpoem"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\wxpoem\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\wxpoem.pdb"
+				ObjectFile="vc_x64_mswuddll\wxpoem\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\wxpoem.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\wxpoem.exe"
+				OutputFile="vc_x64_mswuddll\wxpoem.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\wxpoem.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\wxpoem.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\poem_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\poem_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\wxpoem"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\wxpoem"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\wxpoem\"
-				ProgramDataBaseFileName="vc_mswudll_x64\wxpoem.pdb"
+				ObjectFile="vc_x64_mswudll\wxpoem\"
+				ProgramDataBaseFileName="vc_x64_mswudll\wxpoem.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\wxpoem.exe"
+				OutputFile="vc_x64_mswudll\wxpoem.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\wxpoem.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\wxpoem.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\poem_vc8.bsc"
+				OutputFile="vc_x64_mswudll\poem_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/demos/poem/poem_vc9.vcproj b/demos/poem/poem_vc9.vcproj
index 1ba3a91fff..6a1502cf2c 100644
--- a/demos/poem/poem_vc9.vcproj
+++ b/demos/poem/poem_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\wxpoem"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\wxpoem"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\wxpoem\"
-				ProgramDataBaseFileName="vc_mswud_x64\wxpoem.pdb"
+				ObjectFile="vc_x64_mswud\wxpoem\"
+				ProgramDataBaseFileName="vc_x64_mswud\wxpoem.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\wxpoem.exe"
+				OutputFile="vc_x64_mswud\wxpoem.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\wxpoem.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\wxpoem.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\poem_vc9.bsc"
+				OutputFile="vc_x64_mswud\poem_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\wxpoem"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\wxpoem"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\wxpoem\"
-				ProgramDataBaseFileName="vc_mswu_x64\wxpoem.pdb"
+				ObjectFile="vc_x64_mswu\wxpoem\"
+				ProgramDataBaseFileName="vc_x64_mswu\wxpoem.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\wxpoem.exe"
+				OutputFile="vc_x64_mswu\wxpoem.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\wxpoem.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\wxpoem.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\poem_vc9.bsc"
+				OutputFile="vc_x64_mswu\poem_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\wxpoem"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\wxpoem"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\wxpoem\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\wxpoem.pdb"
+				ObjectFile="vc_x64_mswuddll\wxpoem\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\wxpoem.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\wxpoem.exe"
+				OutputFile="vc_x64_mswuddll\wxpoem.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\wxpoem.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\wxpoem.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\poem_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\poem_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\wxpoem"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\wxpoem"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\wxpoem\"
-				ProgramDataBaseFileName="vc_mswudll_x64\wxpoem.pdb"
+				ObjectFile="vc_x64_mswudll\wxpoem\"
+				ProgramDataBaseFileName="vc_x64_mswudll\wxpoem.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\wxpoem.exe"
+				OutputFile="vc_x64_mswudll\wxpoem.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\wxpoem.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\wxpoem.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\poem_vc9.bsc"
+				OutputFile="vc_x64_mswudll\poem_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/access/access_vc8.vcproj b/samples/access/access_vc8.vcproj
index dee1a6fac5..aa175b4d55 100644
--- a/samples/access/access_vc8.vcproj
+++ b/samples/access/access_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\accesstest"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\accesstest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\accesstest\"
-				ProgramDataBaseFileName="vc_mswud_x64\accesstest.pdb"
+				ObjectFile="vc_x64_mswud\accesstest\"
+				ProgramDataBaseFileName="vc_x64_mswud\accesstest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\accesstest.exe"
+				OutputFile="vc_x64_mswud\accesstest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\accesstest.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\accesstest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\access_vc8.bsc"
+				OutputFile="vc_x64_mswud\access_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\accesstest"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\accesstest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\accesstest\"
-				ProgramDataBaseFileName="vc_mswu_x64\accesstest.pdb"
+				ObjectFile="vc_x64_mswu\accesstest\"
+				ProgramDataBaseFileName="vc_x64_mswu\accesstest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\accesstest.exe"
+				OutputFile="vc_x64_mswu\accesstest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\accesstest.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\accesstest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\access_vc8.bsc"
+				OutputFile="vc_x64_mswu\access_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\accesstest"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\accesstest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\accesstest\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\accesstest.pdb"
+				ObjectFile="vc_x64_mswuddll\accesstest\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\accesstest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\accesstest.exe"
+				OutputFile="vc_x64_mswuddll\accesstest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\accesstest.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\accesstest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\access_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\access_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\accesstest"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\accesstest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\accesstest\"
-				ProgramDataBaseFileName="vc_mswudll_x64\accesstest.pdb"
+				ObjectFile="vc_x64_mswudll\accesstest\"
+				ProgramDataBaseFileName="vc_x64_mswudll\accesstest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\accesstest.exe"
+				OutputFile="vc_x64_mswudll\accesstest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\accesstest.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\accesstest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\access_vc8.bsc"
+				OutputFile="vc_x64_mswudll\access_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/access/access_vc9.vcproj b/samples/access/access_vc9.vcproj
index 6c04df7652..dedadcd31a 100644
--- a/samples/access/access_vc9.vcproj
+++ b/samples/access/access_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\accesstest"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\accesstest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\accesstest\"
-				ProgramDataBaseFileName="vc_mswud_x64\accesstest.pdb"
+				ObjectFile="vc_x64_mswud\accesstest\"
+				ProgramDataBaseFileName="vc_x64_mswud\accesstest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\accesstest.exe"
+				OutputFile="vc_x64_mswud\accesstest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\accesstest.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\accesstest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\access_vc9.bsc"
+				OutputFile="vc_x64_mswud\access_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\accesstest"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\accesstest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\accesstest\"
-				ProgramDataBaseFileName="vc_mswu_x64\accesstest.pdb"
+				ObjectFile="vc_x64_mswu\accesstest\"
+				ProgramDataBaseFileName="vc_x64_mswu\accesstest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\accesstest.exe"
+				OutputFile="vc_x64_mswu\accesstest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\accesstest.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\accesstest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\access_vc9.bsc"
+				OutputFile="vc_x64_mswu\access_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\accesstest"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\accesstest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\accesstest\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\accesstest.pdb"
+				ObjectFile="vc_x64_mswuddll\accesstest\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\accesstest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\accesstest.exe"
+				OutputFile="vc_x64_mswuddll\accesstest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\accesstest.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\accesstest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\access_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\access_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\accesstest"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\accesstest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\accesstest\"
-				ProgramDataBaseFileName="vc_mswudll_x64\accesstest.pdb"
+				ObjectFile="vc_x64_mswudll\accesstest\"
+				ProgramDataBaseFileName="vc_x64_mswudll\accesstest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\accesstest.exe"
+				OutputFile="vc_x64_mswudll\accesstest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\accesstest.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\accesstest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\access_vc9.bsc"
+				OutputFile="vc_x64_mswudll\access_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/access/makefile.vc b/samples/access/makefile.vc
index 1e39589880..51f70915e6 100644
--- a/samples/access/makefile.vc
+++ b/samples/access/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/animate/anitest_vc8.vcproj b/samples/animate/anitest_vc8.vcproj
index 73ff4b95cd..723df58c18 100644
--- a/samples/animate/anitest_vc8.vcproj
+++ b/samples/animate/anitest_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\anitest"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\anitest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\anitest\"
-				ProgramDataBaseFileName="vc_mswud_x64\anitest.pdb"
+				ObjectFile="vc_x64_mswud\anitest\"
+				ProgramDataBaseFileName="vc_x64_mswud\anitest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\anitest.exe"
+				OutputFile="vc_x64_mswud\anitest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\anitest.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\anitest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\anitest_vc8.bsc"
+				OutputFile="vc_x64_mswud\anitest_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\anitest"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\anitest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\anitest\"
-				ProgramDataBaseFileName="vc_mswu_x64\anitest.pdb"
+				ObjectFile="vc_x64_mswu\anitest\"
+				ProgramDataBaseFileName="vc_x64_mswu\anitest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\anitest.exe"
+				OutputFile="vc_x64_mswu\anitest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\anitest.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\anitest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\anitest_vc8.bsc"
+				OutputFile="vc_x64_mswu\anitest_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\anitest"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\anitest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\anitest\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\anitest.pdb"
+				ObjectFile="vc_x64_mswuddll\anitest\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\anitest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\anitest.exe"
+				OutputFile="vc_x64_mswuddll\anitest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\anitest.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\anitest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\anitest_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\anitest_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\anitest"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\anitest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\anitest\"
-				ProgramDataBaseFileName="vc_mswudll_x64\anitest.pdb"
+				ObjectFile="vc_x64_mswudll\anitest\"
+				ProgramDataBaseFileName="vc_x64_mswudll\anitest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\anitest.exe"
+				OutputFile="vc_x64_mswudll\anitest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\anitest.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\anitest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\anitest_vc8.bsc"
+				OutputFile="vc_x64_mswudll\anitest_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/animate/anitest_vc9.vcproj b/samples/animate/anitest_vc9.vcproj
index 40ff73df2f..404a88cdbc 100644
--- a/samples/animate/anitest_vc9.vcproj
+++ b/samples/animate/anitest_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\anitest"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\anitest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\anitest\"
-				ProgramDataBaseFileName="vc_mswud_x64\anitest.pdb"
+				ObjectFile="vc_x64_mswud\anitest\"
+				ProgramDataBaseFileName="vc_x64_mswud\anitest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\anitest.exe"
+				OutputFile="vc_x64_mswud\anitest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\anitest.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\anitest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\anitest_vc9.bsc"
+				OutputFile="vc_x64_mswud\anitest_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\anitest"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\anitest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\anitest\"
-				ProgramDataBaseFileName="vc_mswu_x64\anitest.pdb"
+				ObjectFile="vc_x64_mswu\anitest\"
+				ProgramDataBaseFileName="vc_x64_mswu\anitest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\anitest.exe"
+				OutputFile="vc_x64_mswu\anitest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\anitest.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\anitest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\anitest_vc9.bsc"
+				OutputFile="vc_x64_mswu\anitest_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\anitest"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\anitest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\anitest\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\anitest.pdb"
+				ObjectFile="vc_x64_mswuddll\anitest\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\anitest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\anitest.exe"
+				OutputFile="vc_x64_mswuddll\anitest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\anitest.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\anitest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\anitest_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\anitest_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\anitest"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\anitest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\anitest\"
-				ProgramDataBaseFileName="vc_mswudll_x64\anitest.pdb"
+				ObjectFile="vc_x64_mswudll\anitest\"
+				ProgramDataBaseFileName="vc_x64_mswudll\anitest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\anitest.exe"
+				OutputFile="vc_x64_mswudll\anitest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\anitest.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\anitest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\anitest_vc9.bsc"
+				OutputFile="vc_x64_mswudll\anitest_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/animate/makefile.vc b/samples/animate/makefile.vc
index 1429d7add4..73c6647525 100644
--- a/samples/animate/makefile.vc
+++ b/samples/animate/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/archive/archive_vc8.vcproj b/samples/archive/archive_vc8.vcproj
index b9160fb425..f63ea986bd 100644
--- a/samples/archive/archive_vc8.vcproj
+++ b/samples/archive/archive_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\archive"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\archive"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\archive\"
-				ProgramDataBaseFileName="vc_mswud_x64\archive.pdb"
+				ObjectFile="vc_x64_mswud\archive\"
+				ProgramDataBaseFileName="vc_x64_mswud\archive.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\archive.exe"
+				OutputFile="vc_x64_mswud\archive.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\archive.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\archive.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\archive_vc8.bsc"
+				OutputFile="vc_x64_mswud\archive_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\archive"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\archive"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\archive\"
-				ProgramDataBaseFileName="vc_mswu_x64\archive.pdb"
+				ObjectFile="vc_x64_mswu\archive\"
+				ProgramDataBaseFileName="vc_x64_mswu\archive.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\archive.exe"
+				OutputFile="vc_x64_mswu\archive.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\archive.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\archive.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\archive_vc8.bsc"
+				OutputFile="vc_x64_mswu\archive_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\archive"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\archive"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\archive\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\archive.pdb"
+				ObjectFile="vc_x64_mswuddll\archive\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\archive.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\archive.exe"
+				OutputFile="vc_x64_mswuddll\archive.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\archive.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\archive.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\archive_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\archive_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\archive"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\archive"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\archive\"
-				ProgramDataBaseFileName="vc_mswudll_x64\archive.pdb"
+				ObjectFile="vc_x64_mswudll\archive\"
+				ProgramDataBaseFileName="vc_x64_mswudll\archive.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\archive.exe"
+				OutputFile="vc_x64_mswudll\archive.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\archive.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\archive.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\archive_vc8.bsc"
+				OutputFile="vc_x64_mswudll\archive_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/archive/archive_vc9.vcproj b/samples/archive/archive_vc9.vcproj
index 1c4fbf5fbb..27736a70d7 100644
--- a/samples/archive/archive_vc9.vcproj
+++ b/samples/archive/archive_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\archive"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\archive"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\archive\"
-				ProgramDataBaseFileName="vc_mswud_x64\archive.pdb"
+				ObjectFile="vc_x64_mswud\archive\"
+				ProgramDataBaseFileName="vc_x64_mswud\archive.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\archive.exe"
+				OutputFile="vc_x64_mswud\archive.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\archive.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\archive.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\archive_vc9.bsc"
+				OutputFile="vc_x64_mswud\archive_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\archive"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\archive"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\archive\"
-				ProgramDataBaseFileName="vc_mswu_x64\archive.pdb"
+				ObjectFile="vc_x64_mswu\archive\"
+				ProgramDataBaseFileName="vc_x64_mswu\archive.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\archive.exe"
+				OutputFile="vc_x64_mswu\archive.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\archive.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\archive.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\archive_vc9.bsc"
+				OutputFile="vc_x64_mswu\archive_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\archive"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\archive"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\archive\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\archive.pdb"
+				ObjectFile="vc_x64_mswuddll\archive\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\archive.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\archive.exe"
+				OutputFile="vc_x64_mswuddll\archive.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\archive.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\archive.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\archive_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\archive_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\archive"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\archive"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\archive\"
-				ProgramDataBaseFileName="vc_mswudll_x64\archive.pdb"
+				ObjectFile="vc_x64_mswudll\archive\"
+				ProgramDataBaseFileName="vc_x64_mswudll\archive.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\archive.exe"
+				OutputFile="vc_x64_mswudll\archive.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\archive.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\archive.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\archive_vc9.bsc"
+				OutputFile="vc_x64_mswudll\archive_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/archive/makefile.vc b/samples/archive/makefile.vc
index 14e8068a14..c7a2d7ca5e 100644
--- a/samples/archive/makefile.vc
+++ b/samples/archive/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/artprov/artprov_vc8.vcproj b/samples/artprov/artprov_vc8.vcproj
index 7720d999de..1ddb020a70 100644
--- a/samples/artprov/artprov_vc8.vcproj
+++ b/samples/artprov/artprov_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\arttest"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\arttest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\arttest\"
-				ProgramDataBaseFileName="vc_mswud_x64\arttest.pdb"
+				ObjectFile="vc_x64_mswud\arttest\"
+				ProgramDataBaseFileName="vc_x64_mswud\arttest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\arttest.exe"
+				OutputFile="vc_x64_mswud\arttest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\arttest.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\arttest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\artprov_vc8.bsc"
+				OutputFile="vc_x64_mswud\artprov_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\arttest"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\arttest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\arttest\"
-				ProgramDataBaseFileName="vc_mswu_x64\arttest.pdb"
+				ObjectFile="vc_x64_mswu\arttest\"
+				ProgramDataBaseFileName="vc_x64_mswu\arttest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\arttest.exe"
+				OutputFile="vc_x64_mswu\arttest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\arttest.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\arttest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\artprov_vc8.bsc"
+				OutputFile="vc_x64_mswu\artprov_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\arttest"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\arttest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\arttest\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\arttest.pdb"
+				ObjectFile="vc_x64_mswuddll\arttest\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\arttest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\arttest.exe"
+				OutputFile="vc_x64_mswuddll\arttest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\arttest.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\arttest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\artprov_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\artprov_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\arttest"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\arttest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\arttest\"
-				ProgramDataBaseFileName="vc_mswudll_x64\arttest.pdb"
+				ObjectFile="vc_x64_mswudll\arttest\"
+				ProgramDataBaseFileName="vc_x64_mswudll\arttest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\arttest.exe"
+				OutputFile="vc_x64_mswudll\arttest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\arttest.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\arttest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\artprov_vc8.bsc"
+				OutputFile="vc_x64_mswudll\artprov_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/artprov/artprov_vc9.vcproj b/samples/artprov/artprov_vc9.vcproj
index db721fbcbd..9ad617b13a 100644
--- a/samples/artprov/artprov_vc9.vcproj
+++ b/samples/artprov/artprov_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\arttest"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\arttest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\arttest\"
-				ProgramDataBaseFileName="vc_mswud_x64\arttest.pdb"
+				ObjectFile="vc_x64_mswud\arttest\"
+				ProgramDataBaseFileName="vc_x64_mswud\arttest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\arttest.exe"
+				OutputFile="vc_x64_mswud\arttest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\arttest.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\arttest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\artprov_vc9.bsc"
+				OutputFile="vc_x64_mswud\artprov_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\arttest"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\arttest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\arttest\"
-				ProgramDataBaseFileName="vc_mswu_x64\arttest.pdb"
+				ObjectFile="vc_x64_mswu\arttest\"
+				ProgramDataBaseFileName="vc_x64_mswu\arttest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\arttest.exe"
+				OutputFile="vc_x64_mswu\arttest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\arttest.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\arttest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\artprov_vc9.bsc"
+				OutputFile="vc_x64_mswu\artprov_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\arttest"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\arttest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\arttest\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\arttest.pdb"
+				ObjectFile="vc_x64_mswuddll\arttest\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\arttest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\arttest.exe"
+				OutputFile="vc_x64_mswuddll\arttest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\arttest.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\arttest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\artprov_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\artprov_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\arttest"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\arttest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\arttest\"
-				ProgramDataBaseFileName="vc_mswudll_x64\arttest.pdb"
+				ObjectFile="vc_x64_mswudll\arttest\"
+				ProgramDataBaseFileName="vc_x64_mswudll\arttest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\arttest.exe"
+				OutputFile="vc_x64_mswudll\arttest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\arttest.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\arttest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\artprov_vc9.bsc"
+				OutputFile="vc_x64_mswudll\artprov_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/artprov/makefile.vc b/samples/artprov/makefile.vc
index fa3e651115..3e05993fd3 100644
--- a/samples/artprov/makefile.vc
+++ b/samples/artprov/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/aui/auidemo_vc8.vcproj b/samples/aui/auidemo_vc8.vcproj
index 72f2f2fda2..6366293363 100644
--- a/samples/aui/auidemo_vc8.vcproj
+++ b/samples/aui/auidemo_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\auidemo"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\auidemo"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\auidemo\"
-				ProgramDataBaseFileName="vc_mswud_x64\auidemo.pdb"
+				ObjectFile="vc_x64_mswud\auidemo\"
+				ProgramDataBaseFileName="vc_x64_mswud\auidemo.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_aui.lib  wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud_xml.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\auidemo.exe"
+				OutputFile="vc_x64_mswud\auidemo.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\auidemo.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\auidemo.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\auidemo_vc8.bsc"
+				OutputFile="vc_x64_mswud\auidemo_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\auidemo"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\auidemo"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\auidemo\"
-				ProgramDataBaseFileName="vc_mswu_x64\auidemo.pdb"
+				ObjectFile="vc_x64_mswu\auidemo\"
+				ProgramDataBaseFileName="vc_x64_mswu\auidemo.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_aui.lib  wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u_xml.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\auidemo.exe"
+				OutputFile="vc_x64_mswu\auidemo.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\auidemo.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\auidemo.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\auidemo_vc8.bsc"
+				OutputFile="vc_x64_mswu\auidemo_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\auidemo"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\auidemo"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\auidemo\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\auidemo.pdb"
+				ObjectFile="vc_x64_mswuddll\auidemo\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\auidemo.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_aui.lib  wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud_xml.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\auidemo.exe"
+				OutputFile="vc_x64_mswuddll\auidemo.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\auidemo.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\auidemo.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\auidemo_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\auidemo_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\auidemo"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\auidemo"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\auidemo\"
-				ProgramDataBaseFileName="vc_mswudll_x64\auidemo.pdb"
+				ObjectFile="vc_x64_mswudll\auidemo\"
+				ProgramDataBaseFileName="vc_x64_mswudll\auidemo.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_aui.lib  wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u_xml.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\auidemo.exe"
+				OutputFile="vc_x64_mswudll\auidemo.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\auidemo.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\auidemo.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\auidemo_vc8.bsc"
+				OutputFile="vc_x64_mswudll\auidemo_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/aui/auidemo_vc9.vcproj b/samples/aui/auidemo_vc9.vcproj
index 3a3acc22f1..f0f5b81f24 100644
--- a/samples/aui/auidemo_vc9.vcproj
+++ b/samples/aui/auidemo_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\auidemo"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\auidemo"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\auidemo\"
-				ProgramDataBaseFileName="vc_mswud_x64\auidemo.pdb"
+				ObjectFile="vc_x64_mswud\auidemo\"
+				ProgramDataBaseFileName="vc_x64_mswud\auidemo.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_aui.lib  wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud_xml.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\auidemo.exe"
+				OutputFile="vc_x64_mswud\auidemo.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\auidemo.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\auidemo.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\auidemo_vc9.bsc"
+				OutputFile="vc_x64_mswud\auidemo_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\auidemo"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\auidemo"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\auidemo\"
-				ProgramDataBaseFileName="vc_mswu_x64\auidemo.pdb"
+				ObjectFile="vc_x64_mswu\auidemo\"
+				ProgramDataBaseFileName="vc_x64_mswu\auidemo.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_aui.lib  wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u_xml.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\auidemo.exe"
+				OutputFile="vc_x64_mswu\auidemo.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\auidemo.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\auidemo.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\auidemo_vc9.bsc"
+				OutputFile="vc_x64_mswu\auidemo_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\auidemo"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\auidemo"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\auidemo\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\auidemo.pdb"
+				ObjectFile="vc_x64_mswuddll\auidemo\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\auidemo.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_aui.lib  wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud_xml.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\auidemo.exe"
+				OutputFile="vc_x64_mswuddll\auidemo.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\auidemo.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\auidemo.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\auidemo_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\auidemo_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\auidemo"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\auidemo"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\auidemo\"
-				ProgramDataBaseFileName="vc_mswudll_x64\auidemo.pdb"
+				ObjectFile="vc_x64_mswudll\auidemo\"
+				ProgramDataBaseFileName="vc_x64_mswudll\auidemo.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_aui.lib  wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u_xml.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\auidemo.exe"
+				OutputFile="vc_x64_mswudll\auidemo.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\auidemo.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\auidemo.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\auidemo_vc9.bsc"
+				OutputFile="vc_x64_mswudll\auidemo_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/aui/makefile.vc b/samples/aui/makefile.vc
index 7e2d6128af..1a259ee044 100644
--- a/samples/aui/makefile.vc
+++ b/samples/aui/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/calendar/calendar_vc8.vcproj b/samples/calendar/calendar_vc8.vcproj
index 6631b6f4a4..cc150bfeb8 100644
--- a/samples/calendar/calendar_vc8.vcproj
+++ b/samples/calendar/calendar_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\calendar"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\calendar"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\calendar\"
-				ProgramDataBaseFileName="vc_mswud_x64\calendar.pdb"
+				ObjectFile="vc_x64_mswud\calendar\"
+				ProgramDataBaseFileName="vc_x64_mswud\calendar.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\calendar.exe"
+				OutputFile="vc_x64_mswud\calendar.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\calendar.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\calendar.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\calendar_vc8.bsc"
+				OutputFile="vc_x64_mswud\calendar_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\calendar"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\calendar"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\calendar\"
-				ProgramDataBaseFileName="vc_mswu_x64\calendar.pdb"
+				ObjectFile="vc_x64_mswu\calendar\"
+				ProgramDataBaseFileName="vc_x64_mswu\calendar.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\calendar.exe"
+				OutputFile="vc_x64_mswu\calendar.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\calendar.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\calendar.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\calendar_vc8.bsc"
+				OutputFile="vc_x64_mswu\calendar_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\calendar"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\calendar"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\calendar\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\calendar.pdb"
+				ObjectFile="vc_x64_mswuddll\calendar\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\calendar.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\calendar.exe"
+				OutputFile="vc_x64_mswuddll\calendar.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\calendar.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\calendar.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\calendar_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\calendar_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\calendar"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\calendar"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\calendar\"
-				ProgramDataBaseFileName="vc_mswudll_x64\calendar.pdb"
+				ObjectFile="vc_x64_mswudll\calendar\"
+				ProgramDataBaseFileName="vc_x64_mswudll\calendar.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\calendar.exe"
+				OutputFile="vc_x64_mswudll\calendar.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\calendar.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\calendar.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\calendar_vc8.bsc"
+				OutputFile="vc_x64_mswudll\calendar_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/calendar/calendar_vc9.vcproj b/samples/calendar/calendar_vc9.vcproj
index b2bcd91689..22737f6da6 100644
--- a/samples/calendar/calendar_vc9.vcproj
+++ b/samples/calendar/calendar_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\calendar"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\calendar"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\calendar\"
-				ProgramDataBaseFileName="vc_mswud_x64\calendar.pdb"
+				ObjectFile="vc_x64_mswud\calendar\"
+				ProgramDataBaseFileName="vc_x64_mswud\calendar.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\calendar.exe"
+				OutputFile="vc_x64_mswud\calendar.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\calendar.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\calendar.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\calendar_vc9.bsc"
+				OutputFile="vc_x64_mswud\calendar_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\calendar"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\calendar"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\calendar\"
-				ProgramDataBaseFileName="vc_mswu_x64\calendar.pdb"
+				ObjectFile="vc_x64_mswu\calendar\"
+				ProgramDataBaseFileName="vc_x64_mswu\calendar.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\calendar.exe"
+				OutputFile="vc_x64_mswu\calendar.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\calendar.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\calendar.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\calendar_vc9.bsc"
+				OutputFile="vc_x64_mswu\calendar_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\calendar"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\calendar"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\calendar\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\calendar.pdb"
+				ObjectFile="vc_x64_mswuddll\calendar\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\calendar.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\calendar.exe"
+				OutputFile="vc_x64_mswuddll\calendar.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\calendar.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\calendar.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\calendar_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\calendar_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\calendar"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\calendar"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\calendar\"
-				ProgramDataBaseFileName="vc_mswudll_x64\calendar.pdb"
+				ObjectFile="vc_x64_mswudll\calendar\"
+				ProgramDataBaseFileName="vc_x64_mswudll\calendar.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\calendar.exe"
+				OutputFile="vc_x64_mswudll\calendar.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\calendar.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\calendar.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\calendar_vc9.bsc"
+				OutputFile="vc_x64_mswudll\calendar_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/calendar/makefile.vc b/samples/calendar/makefile.vc
index 73af9aaf6e..30bef6ec2b 100644
--- a/samples/calendar/makefile.vc
+++ b/samples/calendar/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/caret/caret_vc8.vcproj b/samples/caret/caret_vc8.vcproj
index a00ed0f676..ba6678f7e9 100644
--- a/samples/caret/caret_vc8.vcproj
+++ b/samples/caret/caret_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\caret"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\caret"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\caret\"
-				ProgramDataBaseFileName="vc_mswud_x64\caret.pdb"
+				ObjectFile="vc_x64_mswud\caret\"
+				ProgramDataBaseFileName="vc_x64_mswud\caret.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\caret.exe"
+				OutputFile="vc_x64_mswud\caret.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\caret.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\caret.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\caret_vc8.bsc"
+				OutputFile="vc_x64_mswud\caret_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\caret"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\caret"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\caret\"
-				ProgramDataBaseFileName="vc_mswu_x64\caret.pdb"
+				ObjectFile="vc_x64_mswu\caret\"
+				ProgramDataBaseFileName="vc_x64_mswu\caret.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\caret.exe"
+				OutputFile="vc_x64_mswu\caret.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\caret.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\caret.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\caret_vc8.bsc"
+				OutputFile="vc_x64_mswu\caret_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\caret"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\caret"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\caret\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\caret.pdb"
+				ObjectFile="vc_x64_mswuddll\caret\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\caret.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\caret.exe"
+				OutputFile="vc_x64_mswuddll\caret.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\caret.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\caret.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\caret_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\caret_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\caret"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\caret"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\caret\"
-				ProgramDataBaseFileName="vc_mswudll_x64\caret.pdb"
+				ObjectFile="vc_x64_mswudll\caret\"
+				ProgramDataBaseFileName="vc_x64_mswudll\caret.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\caret.exe"
+				OutputFile="vc_x64_mswudll\caret.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\caret.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\caret.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\caret_vc8.bsc"
+				OutputFile="vc_x64_mswudll\caret_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/caret/caret_vc9.vcproj b/samples/caret/caret_vc9.vcproj
index 7254622108..1f5eafb343 100644
--- a/samples/caret/caret_vc9.vcproj
+++ b/samples/caret/caret_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\caret"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\caret"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\caret\"
-				ProgramDataBaseFileName="vc_mswud_x64\caret.pdb"
+				ObjectFile="vc_x64_mswud\caret\"
+				ProgramDataBaseFileName="vc_x64_mswud\caret.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\caret.exe"
+				OutputFile="vc_x64_mswud\caret.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\caret.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\caret.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\caret_vc9.bsc"
+				OutputFile="vc_x64_mswud\caret_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\caret"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\caret"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\caret\"
-				ProgramDataBaseFileName="vc_mswu_x64\caret.pdb"
+				ObjectFile="vc_x64_mswu\caret\"
+				ProgramDataBaseFileName="vc_x64_mswu\caret.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\caret.exe"
+				OutputFile="vc_x64_mswu\caret.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\caret.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\caret.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\caret_vc9.bsc"
+				OutputFile="vc_x64_mswu\caret_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\caret"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\caret"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\caret\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\caret.pdb"
+				ObjectFile="vc_x64_mswuddll\caret\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\caret.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\caret.exe"
+				OutputFile="vc_x64_mswuddll\caret.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\caret.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\caret.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\caret_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\caret_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\caret"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\caret"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\caret\"
-				ProgramDataBaseFileName="vc_mswudll_x64\caret.pdb"
+				ObjectFile="vc_x64_mswudll\caret\"
+				ProgramDataBaseFileName="vc_x64_mswudll\caret.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\caret.exe"
+				OutputFile="vc_x64_mswudll\caret.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\caret.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\caret.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\caret_vc9.bsc"
+				OutputFile="vc_x64_mswudll\caret_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/caret/makefile.vc b/samples/caret/makefile.vc
index a99dffd375..aa76a613ac 100644
--- a/samples/caret/makefile.vc
+++ b/samples/caret/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/clipboard/clipboard_vc8.vcproj b/samples/clipboard/clipboard_vc8.vcproj
index 8465df4e77..5ad80186eb 100644
--- a/samples/clipboard/clipboard_vc8.vcproj
+++ b/samples/clipboard/clipboard_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\clipboard"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\clipboard"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\clipboard\"
-				ProgramDataBaseFileName="vc_mswud_x64\clipboard.pdb"
+				ObjectFile="vc_x64_mswud\clipboard\"
+				ProgramDataBaseFileName="vc_x64_mswud\clipboard.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\clipboard.exe"
+				OutputFile="vc_x64_mswud\clipboard.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\clipboard.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\clipboard.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\clipboard_vc8.bsc"
+				OutputFile="vc_x64_mswud\clipboard_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\clipboard"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\clipboard"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\clipboard\"
-				ProgramDataBaseFileName="vc_mswu_x64\clipboard.pdb"
+				ObjectFile="vc_x64_mswu\clipboard\"
+				ProgramDataBaseFileName="vc_x64_mswu\clipboard.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\clipboard.exe"
+				OutputFile="vc_x64_mswu\clipboard.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\clipboard.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\clipboard.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\clipboard_vc8.bsc"
+				OutputFile="vc_x64_mswu\clipboard_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\clipboard"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\clipboard"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\clipboard\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\clipboard.pdb"
+				ObjectFile="vc_x64_mswuddll\clipboard\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\clipboard.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\clipboard.exe"
+				OutputFile="vc_x64_mswuddll\clipboard.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\clipboard.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\clipboard.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\clipboard_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\clipboard_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\clipboard"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\clipboard"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\clipboard\"
-				ProgramDataBaseFileName="vc_mswudll_x64\clipboard.pdb"
+				ObjectFile="vc_x64_mswudll\clipboard\"
+				ProgramDataBaseFileName="vc_x64_mswudll\clipboard.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\clipboard.exe"
+				OutputFile="vc_x64_mswudll\clipboard.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\clipboard.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\clipboard.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\clipboard_vc8.bsc"
+				OutputFile="vc_x64_mswudll\clipboard_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/clipboard/clipboard_vc9.vcproj b/samples/clipboard/clipboard_vc9.vcproj
index 36b1a700c7..8dbc7b5d8c 100644
--- a/samples/clipboard/clipboard_vc9.vcproj
+++ b/samples/clipboard/clipboard_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\clipboard"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\clipboard"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\clipboard\"
-				ProgramDataBaseFileName="vc_mswud_x64\clipboard.pdb"
+				ObjectFile="vc_x64_mswud\clipboard\"
+				ProgramDataBaseFileName="vc_x64_mswud\clipboard.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\clipboard.exe"
+				OutputFile="vc_x64_mswud\clipboard.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\clipboard.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\clipboard.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\clipboard_vc9.bsc"
+				OutputFile="vc_x64_mswud\clipboard_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\clipboard"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\clipboard"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\clipboard\"
-				ProgramDataBaseFileName="vc_mswu_x64\clipboard.pdb"
+				ObjectFile="vc_x64_mswu\clipboard\"
+				ProgramDataBaseFileName="vc_x64_mswu\clipboard.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\clipboard.exe"
+				OutputFile="vc_x64_mswu\clipboard.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\clipboard.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\clipboard.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\clipboard_vc9.bsc"
+				OutputFile="vc_x64_mswu\clipboard_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\clipboard"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\clipboard"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\clipboard\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\clipboard.pdb"
+				ObjectFile="vc_x64_mswuddll\clipboard\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\clipboard.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\clipboard.exe"
+				OutputFile="vc_x64_mswuddll\clipboard.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\clipboard.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\clipboard.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\clipboard_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\clipboard_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\clipboard"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\clipboard"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\clipboard\"
-				ProgramDataBaseFileName="vc_mswudll_x64\clipboard.pdb"
+				ObjectFile="vc_x64_mswudll\clipboard\"
+				ProgramDataBaseFileName="vc_x64_mswudll\clipboard.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\clipboard.exe"
+				OutputFile="vc_x64_mswudll\clipboard.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\clipboard.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\clipboard.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\clipboard_vc9.bsc"
+				OutputFile="vc_x64_mswudll\clipboard_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/clipboard/makefile.vc b/samples/clipboard/makefile.vc
index a04285848e..a1044b2c19 100644
--- a/samples/clipboard/makefile.vc
+++ b/samples/clipboard/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/collpane/collpane_vc8.vcproj b/samples/collpane/collpane_vc8.vcproj
index 62513558b6..d3817684b6 100644
--- a/samples/collpane/collpane_vc8.vcproj
+++ b/samples/collpane/collpane_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\collpane"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\collpane"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\collpane\"
-				ProgramDataBaseFileName="vc_mswud_x64\collpane.pdb"
+				ObjectFile="vc_x64_mswud\collpane\"
+				ProgramDataBaseFileName="vc_x64_mswud\collpane.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\collpane.exe"
+				OutputFile="vc_x64_mswud\collpane.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\collpane.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\collpane.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\collpane_vc8.bsc"
+				OutputFile="vc_x64_mswud\collpane_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\collpane"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\collpane"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\collpane\"
-				ProgramDataBaseFileName="vc_mswu_x64\collpane.pdb"
+				ObjectFile="vc_x64_mswu\collpane\"
+				ProgramDataBaseFileName="vc_x64_mswu\collpane.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\collpane.exe"
+				OutputFile="vc_x64_mswu\collpane.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\collpane.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\collpane.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\collpane_vc8.bsc"
+				OutputFile="vc_x64_mswu\collpane_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\collpane"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\collpane"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\collpane\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\collpane.pdb"
+				ObjectFile="vc_x64_mswuddll\collpane\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\collpane.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\collpane.exe"
+				OutputFile="vc_x64_mswuddll\collpane.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\collpane.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\collpane.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\collpane_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\collpane_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\collpane"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\collpane"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\collpane\"
-				ProgramDataBaseFileName="vc_mswudll_x64\collpane.pdb"
+				ObjectFile="vc_x64_mswudll\collpane\"
+				ProgramDataBaseFileName="vc_x64_mswudll\collpane.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\collpane.exe"
+				OutputFile="vc_x64_mswudll\collpane.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\collpane.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\collpane.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\collpane_vc8.bsc"
+				OutputFile="vc_x64_mswudll\collpane_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/collpane/collpane_vc9.vcproj b/samples/collpane/collpane_vc9.vcproj
index 46726bdcaa..edcd7ae1c5 100644
--- a/samples/collpane/collpane_vc9.vcproj
+++ b/samples/collpane/collpane_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\collpane"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\collpane"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\collpane\"
-				ProgramDataBaseFileName="vc_mswud_x64\collpane.pdb"
+				ObjectFile="vc_x64_mswud\collpane\"
+				ProgramDataBaseFileName="vc_x64_mswud\collpane.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\collpane.exe"
+				OutputFile="vc_x64_mswud\collpane.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\collpane.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\collpane.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\collpane_vc9.bsc"
+				OutputFile="vc_x64_mswud\collpane_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\collpane"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\collpane"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\collpane\"
-				ProgramDataBaseFileName="vc_mswu_x64\collpane.pdb"
+				ObjectFile="vc_x64_mswu\collpane\"
+				ProgramDataBaseFileName="vc_x64_mswu\collpane.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\collpane.exe"
+				OutputFile="vc_x64_mswu\collpane.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\collpane.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\collpane.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\collpane_vc9.bsc"
+				OutputFile="vc_x64_mswu\collpane_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\collpane"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\collpane"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\collpane\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\collpane.pdb"
+				ObjectFile="vc_x64_mswuddll\collpane\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\collpane.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\collpane.exe"
+				OutputFile="vc_x64_mswuddll\collpane.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\collpane.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\collpane.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\collpane_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\collpane_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\collpane"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\collpane"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\collpane\"
-				ProgramDataBaseFileName="vc_mswudll_x64\collpane.pdb"
+				ObjectFile="vc_x64_mswudll\collpane\"
+				ProgramDataBaseFileName="vc_x64_mswudll\collpane.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\collpane.exe"
+				OutputFile="vc_x64_mswudll\collpane.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\collpane.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\collpane.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\collpane_vc9.bsc"
+				OutputFile="vc_x64_mswudll\collpane_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/collpane/makefile.vc b/samples/collpane/makefile.vc
index 1160d55f5d..5cb4607498 100644
--- a/samples/collpane/makefile.vc
+++ b/samples/collpane/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/combo/combo_vc8.vcproj b/samples/combo/combo_vc8.vcproj
index 0ab7dce44b..2e3272eb67 100644
--- a/samples/combo/combo_vc8.vcproj
+++ b/samples/combo/combo_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\combo"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\combo"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\combo\"
-				ProgramDataBaseFileName="vc_mswud_x64\combo.pdb"
+				ObjectFile="vc_x64_mswud\combo\"
+				ProgramDataBaseFileName="vc_x64_mswud\combo.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\combo.exe"
+				OutputFile="vc_x64_mswud\combo.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\combo.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\combo.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\combo_vc8.bsc"
+				OutputFile="vc_x64_mswud\combo_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\combo"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\combo"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\combo\"
-				ProgramDataBaseFileName="vc_mswu_x64\combo.pdb"
+				ObjectFile="vc_x64_mswu\combo\"
+				ProgramDataBaseFileName="vc_x64_mswu\combo.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\combo.exe"
+				OutputFile="vc_x64_mswu\combo.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\combo.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\combo.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\combo_vc8.bsc"
+				OutputFile="vc_x64_mswu\combo_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\combo"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\combo"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\combo\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\combo.pdb"
+				ObjectFile="vc_x64_mswuddll\combo\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\combo.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\combo.exe"
+				OutputFile="vc_x64_mswuddll\combo.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\combo.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\combo.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\combo_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\combo_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\combo"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\combo"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\combo\"
-				ProgramDataBaseFileName="vc_mswudll_x64\combo.pdb"
+				ObjectFile="vc_x64_mswudll\combo\"
+				ProgramDataBaseFileName="vc_x64_mswudll\combo.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\combo.exe"
+				OutputFile="vc_x64_mswudll\combo.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\combo.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\combo.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\combo_vc8.bsc"
+				OutputFile="vc_x64_mswudll\combo_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/combo/combo_vc9.vcproj b/samples/combo/combo_vc9.vcproj
index d7e55b4f48..1b695be8c6 100644
--- a/samples/combo/combo_vc9.vcproj
+++ b/samples/combo/combo_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\combo"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\combo"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\combo\"
-				ProgramDataBaseFileName="vc_mswud_x64\combo.pdb"
+				ObjectFile="vc_x64_mswud\combo\"
+				ProgramDataBaseFileName="vc_x64_mswud\combo.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\combo.exe"
+				OutputFile="vc_x64_mswud\combo.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\combo.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\combo.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\combo_vc9.bsc"
+				OutputFile="vc_x64_mswud\combo_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\combo"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\combo"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\combo\"
-				ProgramDataBaseFileName="vc_mswu_x64\combo.pdb"
+				ObjectFile="vc_x64_mswu\combo\"
+				ProgramDataBaseFileName="vc_x64_mswu\combo.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\combo.exe"
+				OutputFile="vc_x64_mswu\combo.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\combo.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\combo.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\combo_vc9.bsc"
+				OutputFile="vc_x64_mswu\combo_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\combo"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\combo"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\combo\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\combo.pdb"
+				ObjectFile="vc_x64_mswuddll\combo\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\combo.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\combo.exe"
+				OutputFile="vc_x64_mswuddll\combo.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\combo.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\combo.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\combo_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\combo_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\combo"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\combo"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\combo\"
-				ProgramDataBaseFileName="vc_mswudll_x64\combo.pdb"
+				ObjectFile="vc_x64_mswudll\combo\"
+				ProgramDataBaseFileName="vc_x64_mswudll\combo.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\combo.exe"
+				OutputFile="vc_x64_mswudll\combo.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\combo.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\combo.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\combo_vc9.bsc"
+				OutputFile="vc_x64_mswudll\combo_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/combo/makefile.vc b/samples/combo/makefile.vc
index 59c1492d0d..7a51640e5f 100644
--- a/samples/combo/makefile.vc
+++ b/samples/combo/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/config/config_vc8.vcproj b/samples/config/config_vc8.vcproj
index dbb0686802..cf38cc2984 100644
--- a/samples/config/config_vc8.vcproj
+++ b/samples/config/config_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\conftest"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\conftest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\conftest\"
-				ProgramDataBaseFileName="vc_mswud_x64\conftest.pdb"
+				ObjectFile="vc_x64_mswud\conftest\"
+				ProgramDataBaseFileName="vc_x64_mswud\conftest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\conftest.exe"
+				OutputFile="vc_x64_mswud\conftest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\conftest.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\conftest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\config_vc8.bsc"
+				OutputFile="vc_x64_mswud\config_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\conftest"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\conftest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\conftest\"
-				ProgramDataBaseFileName="vc_mswu_x64\conftest.pdb"
+				ObjectFile="vc_x64_mswu\conftest\"
+				ProgramDataBaseFileName="vc_x64_mswu\conftest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\conftest.exe"
+				OutputFile="vc_x64_mswu\conftest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\conftest.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\conftest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\config_vc8.bsc"
+				OutputFile="vc_x64_mswu\config_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\conftest"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\conftest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\conftest\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\conftest.pdb"
+				ObjectFile="vc_x64_mswuddll\conftest\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\conftest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\conftest.exe"
+				OutputFile="vc_x64_mswuddll\conftest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\conftest.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\conftest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\config_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\config_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\conftest"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\conftest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\conftest\"
-				ProgramDataBaseFileName="vc_mswudll_x64\conftest.pdb"
+				ObjectFile="vc_x64_mswudll\conftest\"
+				ProgramDataBaseFileName="vc_x64_mswudll\conftest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\conftest.exe"
+				OutputFile="vc_x64_mswudll\conftest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\conftest.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\conftest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\config_vc8.bsc"
+				OutputFile="vc_x64_mswudll\config_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/config/config_vc9.vcproj b/samples/config/config_vc9.vcproj
index 18743902e1..db47c98003 100644
--- a/samples/config/config_vc9.vcproj
+++ b/samples/config/config_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\conftest"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\conftest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\conftest\"
-				ProgramDataBaseFileName="vc_mswud_x64\conftest.pdb"
+				ObjectFile="vc_x64_mswud\conftest\"
+				ProgramDataBaseFileName="vc_x64_mswud\conftest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\conftest.exe"
+				OutputFile="vc_x64_mswud\conftest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\conftest.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\conftest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\config_vc9.bsc"
+				OutputFile="vc_x64_mswud\config_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\conftest"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\conftest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\conftest\"
-				ProgramDataBaseFileName="vc_mswu_x64\conftest.pdb"
+				ObjectFile="vc_x64_mswu\conftest\"
+				ProgramDataBaseFileName="vc_x64_mswu\conftest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\conftest.exe"
+				OutputFile="vc_x64_mswu\conftest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\conftest.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\conftest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\config_vc9.bsc"
+				OutputFile="vc_x64_mswu\config_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\conftest"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\conftest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\conftest\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\conftest.pdb"
+				ObjectFile="vc_x64_mswuddll\conftest\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\conftest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\conftest.exe"
+				OutputFile="vc_x64_mswuddll\conftest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\conftest.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\conftest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\config_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\config_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\conftest"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\conftest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\conftest\"
-				ProgramDataBaseFileName="vc_mswudll_x64\conftest.pdb"
+				ObjectFile="vc_x64_mswudll\conftest\"
+				ProgramDataBaseFileName="vc_x64_mswudll\conftest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\conftest.exe"
+				OutputFile="vc_x64_mswudll\conftest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\conftest.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\conftest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\config_vc9.bsc"
+				OutputFile="vc_x64_mswudll\config_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/config/makefile.vc b/samples/config/makefile.vc
index cf4088defb..698d5ac04a 100644
--- a/samples/config/makefile.vc
+++ b/samples/config/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/console/console_vc8.vcproj b/samples/console/console_vc8.vcproj
index 26b7395ed5..a2db974f66 100644
--- a/samples/console/console_vc8.vcproj
+++ b/samples/console/console_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\console"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\console"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\console\"
-				ProgramDataBaseFileName="vc_mswud_x64\console.pdb"
+				ObjectFile="vc_x64_mswud\console\"
+				ProgramDataBaseFileName="vc_x64_mswud\console.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud_net.lib  wxbase31ud.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\console.exe"
+				OutputFile="vc_x64_mswud\console.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\console.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\console.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\console_vc8.bsc"
+				OutputFile="vc_x64_mswud\console_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\console"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\console"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\console\"
-				ProgramDataBaseFileName="vc_mswu_x64\console.pdb"
+				ObjectFile="vc_x64_mswu\console\"
+				ProgramDataBaseFileName="vc_x64_mswu\console.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u_net.lib  wxbase31u.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\console.exe"
+				OutputFile="vc_x64_mswu\console.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\console.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\console.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\console_vc8.bsc"
+				OutputFile="vc_x64_mswu\console_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\console"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\console"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\console\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\console.pdb"
+				ObjectFile="vc_x64_mswuddll\console\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\console.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud_net.lib  wxbase31ud.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\console.exe"
+				OutputFile="vc_x64_mswuddll\console.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\console.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\console.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\console_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\console_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\console"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\console"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\console\"
-				ProgramDataBaseFileName="vc_mswudll_x64\console.pdb"
+				ObjectFile="vc_x64_mswudll\console\"
+				ProgramDataBaseFileName="vc_x64_mswudll\console.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u_net.lib  wxbase31u.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\console.exe"
+				OutputFile="vc_x64_mswudll\console.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\console.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\console.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\console_vc8.bsc"
+				OutputFile="vc_x64_mswudll\console_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/console/console_vc9.vcproj b/samples/console/console_vc9.vcproj
index 363b9f2da4..a1690e06ae 100644
--- a/samples/console/console_vc9.vcproj
+++ b/samples/console/console_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\console"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\console"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\console\"
-				ProgramDataBaseFileName="vc_mswud_x64\console.pdb"
+				ObjectFile="vc_x64_mswud\console\"
+				ProgramDataBaseFileName="vc_x64_mswud\console.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud_net.lib  wxbase31ud.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\console.exe"
+				OutputFile="vc_x64_mswud\console.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\console.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\console.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\console_vc9.bsc"
+				OutputFile="vc_x64_mswud\console_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\console"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\console"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\console\"
-				ProgramDataBaseFileName="vc_mswu_x64\console.pdb"
+				ObjectFile="vc_x64_mswu\console\"
+				ProgramDataBaseFileName="vc_x64_mswu\console.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u_net.lib  wxbase31u.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\console.exe"
+				OutputFile="vc_x64_mswu\console.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\console.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\console.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\console_vc9.bsc"
+				OutputFile="vc_x64_mswu\console_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\console"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\console"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\console\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\console.pdb"
+				ObjectFile="vc_x64_mswuddll\console\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\console.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud_net.lib  wxbase31ud.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\console.exe"
+				OutputFile="vc_x64_mswuddll\console.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\console.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\console.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\console_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\console_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\console"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\console"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\console\"
-				ProgramDataBaseFileName="vc_mswudll_x64\console.pdb"
+				ObjectFile="vc_x64_mswudll\console\"
+				ProgramDataBaseFileName="vc_x64_mswudll\console.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u_net.lib  wxbase31u.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\console.exe"
+				OutputFile="vc_x64_mswudll\console.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\console.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\console.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\console_vc9.bsc"
+				OutputFile="vc_x64_mswudll\console_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/console/makefile.vc b/samples/console/makefile.vc
index e188e80a21..eeab817487 100644
--- a/samples/console/makefile.vc
+++ b/samples/console/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/dataview/dataview_vc8.vcproj b/samples/dataview/dataview_vc8.vcproj
index 55c2cf5fae..a4b5f57d11 100644
--- a/samples/dataview/dataview_vc8.vcproj
+++ b/samples/dataview/dataview_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\dataview"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\dataview"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\dataview\"
-				ProgramDataBaseFileName="vc_mswud_x64\dataview.pdb"
+				ObjectFile="vc_x64_mswud\dataview\"
+				ProgramDataBaseFileName="vc_x64_mswud\dataview.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\dataview.exe"
+				OutputFile="vc_x64_mswud\dataview.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\dataview.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\dataview.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\dataview_vc8.bsc"
+				OutputFile="vc_x64_mswud\dataview_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\dataview"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\dataview"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\dataview\"
-				ProgramDataBaseFileName="vc_mswu_x64\dataview.pdb"
+				ObjectFile="vc_x64_mswu\dataview\"
+				ProgramDataBaseFileName="vc_x64_mswu\dataview.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\dataview.exe"
+				OutputFile="vc_x64_mswu\dataview.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\dataview.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\dataview.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\dataview_vc8.bsc"
+				OutputFile="vc_x64_mswu\dataview_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\dataview"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\dataview"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\dataview\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\dataview.pdb"
+				ObjectFile="vc_x64_mswuddll\dataview\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\dataview.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\dataview.exe"
+				OutputFile="vc_x64_mswuddll\dataview.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\dataview.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\dataview.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\dataview_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\dataview_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\dataview"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\dataview"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\dataview\"
-				ProgramDataBaseFileName="vc_mswudll_x64\dataview.pdb"
+				ObjectFile="vc_x64_mswudll\dataview\"
+				ProgramDataBaseFileName="vc_x64_mswudll\dataview.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\dataview.exe"
+				OutputFile="vc_x64_mswudll\dataview.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\dataview.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\dataview.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\dataview_vc8.bsc"
+				OutputFile="vc_x64_mswudll\dataview_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/dataview/dataview_vc9.vcproj b/samples/dataview/dataview_vc9.vcproj
index 37638d4f8f..01431d306d 100644
--- a/samples/dataview/dataview_vc9.vcproj
+++ b/samples/dataview/dataview_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\dataview"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\dataview"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\dataview\"
-				ProgramDataBaseFileName="vc_mswud_x64\dataview.pdb"
+				ObjectFile="vc_x64_mswud\dataview\"
+				ProgramDataBaseFileName="vc_x64_mswud\dataview.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\dataview.exe"
+				OutputFile="vc_x64_mswud\dataview.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\dataview.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\dataview.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\dataview_vc9.bsc"
+				OutputFile="vc_x64_mswud\dataview_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\dataview"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\dataview"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\dataview\"
-				ProgramDataBaseFileName="vc_mswu_x64\dataview.pdb"
+				ObjectFile="vc_x64_mswu\dataview\"
+				ProgramDataBaseFileName="vc_x64_mswu\dataview.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\dataview.exe"
+				OutputFile="vc_x64_mswu\dataview.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\dataview.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\dataview.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\dataview_vc9.bsc"
+				OutputFile="vc_x64_mswu\dataview_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\dataview"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\dataview"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\dataview\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\dataview.pdb"
+				ObjectFile="vc_x64_mswuddll\dataview\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\dataview.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\dataview.exe"
+				OutputFile="vc_x64_mswuddll\dataview.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\dataview.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\dataview.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\dataview_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\dataview_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\dataview"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\dataview"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\dataview\"
-				ProgramDataBaseFileName="vc_mswudll_x64\dataview.pdb"
+				ObjectFile="vc_x64_mswudll\dataview\"
+				ProgramDataBaseFileName="vc_x64_mswudll\dataview.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\dataview.exe"
+				OutputFile="vc_x64_mswudll\dataview.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\dataview.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\dataview.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\dataview_vc9.bsc"
+				OutputFile="vc_x64_mswudll\dataview_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/dataview/makefile.vc b/samples/dataview/makefile.vc
index 4a0a63189a..a22cfe6f86 100644
--- a/samples/dataview/makefile.vc
+++ b/samples/dataview/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/debugrpt/debugrpt_vc8.vcproj b/samples/debugrpt/debugrpt_vc8.vcproj
index 5d8f65a429..e7ea32db80 100644
--- a/samples/debugrpt/debugrpt_vc8.vcproj
+++ b/samples/debugrpt/debugrpt_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\debugrpt"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\debugrpt"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\debugrpt\"
-				ProgramDataBaseFileName="vc_mswud_x64\debugrpt.pdb"
+				ObjectFile="vc_x64_mswud\debugrpt\"
+				ProgramDataBaseFileName="vc_x64_mswud\debugrpt.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_qa.lib  wxmsw31ud_core.lib  wxbase31ud.lib  wxbase31ud_xml.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\debugrpt.exe"
+				OutputFile="vc_x64_mswud\debugrpt.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\debugrpt.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\debugrpt.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\debugrpt_vc8.bsc"
+				OutputFile="vc_x64_mswud\debugrpt_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\debugrpt"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\debugrpt"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\debugrpt\"
-				ProgramDataBaseFileName="vc_mswu_x64\debugrpt.pdb"
+				ObjectFile="vc_x64_mswu\debugrpt\"
+				ProgramDataBaseFileName="vc_x64_mswu\debugrpt.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_qa.lib  wxmsw31u_core.lib  wxbase31u.lib  wxbase31u_xml.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\debugrpt.exe"
+				OutputFile="vc_x64_mswu\debugrpt.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\debugrpt.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\debugrpt.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\debugrpt_vc8.bsc"
+				OutputFile="vc_x64_mswu\debugrpt_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\debugrpt"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\debugrpt"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\debugrpt\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\debugrpt.pdb"
+				ObjectFile="vc_x64_mswuddll\debugrpt\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\debugrpt.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_qa.lib  wxmsw31ud_core.lib  wxbase31ud.lib  wxbase31ud_xml.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\debugrpt.exe"
+				OutputFile="vc_x64_mswuddll\debugrpt.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\debugrpt.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\debugrpt.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\debugrpt_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\debugrpt_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\debugrpt"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\debugrpt"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\debugrpt\"
-				ProgramDataBaseFileName="vc_mswudll_x64\debugrpt.pdb"
+				ObjectFile="vc_x64_mswudll\debugrpt\"
+				ProgramDataBaseFileName="vc_x64_mswudll\debugrpt.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_qa.lib  wxmsw31u_core.lib  wxbase31u.lib  wxbase31u_xml.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\debugrpt.exe"
+				OutputFile="vc_x64_mswudll\debugrpt.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\debugrpt.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\debugrpt.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\debugrpt_vc8.bsc"
+				OutputFile="vc_x64_mswudll\debugrpt_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/debugrpt/debugrpt_vc9.vcproj b/samples/debugrpt/debugrpt_vc9.vcproj
index ae80aca652..96a3f3ddf1 100644
--- a/samples/debugrpt/debugrpt_vc9.vcproj
+++ b/samples/debugrpt/debugrpt_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\debugrpt"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\debugrpt"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\debugrpt\"
-				ProgramDataBaseFileName="vc_mswud_x64\debugrpt.pdb"
+				ObjectFile="vc_x64_mswud\debugrpt\"
+				ProgramDataBaseFileName="vc_x64_mswud\debugrpt.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_qa.lib  wxmsw31ud_core.lib  wxbase31ud.lib  wxbase31ud_xml.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\debugrpt.exe"
+				OutputFile="vc_x64_mswud\debugrpt.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\debugrpt.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\debugrpt.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\debugrpt_vc9.bsc"
+				OutputFile="vc_x64_mswud\debugrpt_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\debugrpt"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\debugrpt"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\debugrpt\"
-				ProgramDataBaseFileName="vc_mswu_x64\debugrpt.pdb"
+				ObjectFile="vc_x64_mswu\debugrpt\"
+				ProgramDataBaseFileName="vc_x64_mswu\debugrpt.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_qa.lib  wxmsw31u_core.lib  wxbase31u.lib  wxbase31u_xml.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\debugrpt.exe"
+				OutputFile="vc_x64_mswu\debugrpt.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\debugrpt.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\debugrpt.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\debugrpt_vc9.bsc"
+				OutputFile="vc_x64_mswu\debugrpt_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\debugrpt"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\debugrpt"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\debugrpt\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\debugrpt.pdb"
+				ObjectFile="vc_x64_mswuddll\debugrpt\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\debugrpt.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_qa.lib  wxmsw31ud_core.lib  wxbase31ud.lib  wxbase31ud_xml.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\debugrpt.exe"
+				OutputFile="vc_x64_mswuddll\debugrpt.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\debugrpt.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\debugrpt.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\debugrpt_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\debugrpt_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\debugrpt"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\debugrpt"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\debugrpt\"
-				ProgramDataBaseFileName="vc_mswudll_x64\debugrpt.pdb"
+				ObjectFile="vc_x64_mswudll\debugrpt\"
+				ProgramDataBaseFileName="vc_x64_mswudll\debugrpt.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_qa.lib  wxmsw31u_core.lib  wxbase31u.lib  wxbase31u_xml.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\debugrpt.exe"
+				OutputFile="vc_x64_mswudll\debugrpt.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\debugrpt.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\debugrpt.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\debugrpt_vc9.bsc"
+				OutputFile="vc_x64_mswudll\debugrpt_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/debugrpt/makefile.vc b/samples/debugrpt/makefile.vc
index 058616724a..e11480b84b 100644
--- a/samples/debugrpt/makefile.vc
+++ b/samples/debugrpt/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/dialogs/dialogs_vc8.vcproj b/samples/dialogs/dialogs_vc8.vcproj
index 11d1a57e27..d6749baaf6 100644
--- a/samples/dialogs/dialogs_vc8.vcproj
+++ b/samples/dialogs/dialogs_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\dialogs"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\dialogs"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\dialogs\"
-				ProgramDataBaseFileName="vc_mswud_x64\dialogs.pdb"
+				ObjectFile="vc_x64_mswud\dialogs\"
+				ProgramDataBaseFileName="vc_x64_mswud\dialogs.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\dialogs.exe"
+				OutputFile="vc_x64_mswud\dialogs.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\dialogs.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\dialogs.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\dialogs_vc8.bsc"
+				OutputFile="vc_x64_mswud\dialogs_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\dialogs"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\dialogs"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\dialogs\"
-				ProgramDataBaseFileName="vc_mswu_x64\dialogs.pdb"
+				ObjectFile="vc_x64_mswu\dialogs\"
+				ProgramDataBaseFileName="vc_x64_mswu\dialogs.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\dialogs.exe"
+				OutputFile="vc_x64_mswu\dialogs.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\dialogs.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\dialogs.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\dialogs_vc8.bsc"
+				OutputFile="vc_x64_mswu\dialogs_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\dialogs"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\dialogs"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\dialogs\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\dialogs.pdb"
+				ObjectFile="vc_x64_mswuddll\dialogs\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\dialogs.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\dialogs.exe"
+				OutputFile="vc_x64_mswuddll\dialogs.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\dialogs.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\dialogs.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\dialogs_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\dialogs_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\dialogs"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\dialogs"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\dialogs\"
-				ProgramDataBaseFileName="vc_mswudll_x64\dialogs.pdb"
+				ObjectFile="vc_x64_mswudll\dialogs\"
+				ProgramDataBaseFileName="vc_x64_mswudll\dialogs.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\dialogs.exe"
+				OutputFile="vc_x64_mswudll\dialogs.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\dialogs.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\dialogs.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\dialogs_vc8.bsc"
+				OutputFile="vc_x64_mswudll\dialogs_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/dialogs/dialogs_vc9.vcproj b/samples/dialogs/dialogs_vc9.vcproj
index 20b463a77f..e375561587 100644
--- a/samples/dialogs/dialogs_vc9.vcproj
+++ b/samples/dialogs/dialogs_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\dialogs"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\dialogs"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\dialogs\"
-				ProgramDataBaseFileName="vc_mswud_x64\dialogs.pdb"
+				ObjectFile="vc_x64_mswud\dialogs\"
+				ProgramDataBaseFileName="vc_x64_mswud\dialogs.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\dialogs.exe"
+				OutputFile="vc_x64_mswud\dialogs.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\dialogs.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\dialogs.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\dialogs_vc9.bsc"
+				OutputFile="vc_x64_mswud\dialogs_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\dialogs"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\dialogs"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\dialogs\"
-				ProgramDataBaseFileName="vc_mswu_x64\dialogs.pdb"
+				ObjectFile="vc_x64_mswu\dialogs\"
+				ProgramDataBaseFileName="vc_x64_mswu\dialogs.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\dialogs.exe"
+				OutputFile="vc_x64_mswu\dialogs.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\dialogs.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\dialogs.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\dialogs_vc9.bsc"
+				OutputFile="vc_x64_mswu\dialogs_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\dialogs"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\dialogs"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\dialogs\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\dialogs.pdb"
+				ObjectFile="vc_x64_mswuddll\dialogs\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\dialogs.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\dialogs.exe"
+				OutputFile="vc_x64_mswuddll\dialogs.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\dialogs.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\dialogs.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\dialogs_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\dialogs_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\dialogs"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\dialogs"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\dialogs\"
-				ProgramDataBaseFileName="vc_mswudll_x64\dialogs.pdb"
+				ObjectFile="vc_x64_mswudll\dialogs\"
+				ProgramDataBaseFileName="vc_x64_mswudll\dialogs.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\dialogs.exe"
+				OutputFile="vc_x64_mswudll\dialogs.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\dialogs.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\dialogs.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\dialogs_vc9.bsc"
+				OutputFile="vc_x64_mswudll\dialogs_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/dialogs/makefile.vc b/samples/dialogs/makefile.vc
index aec28149a0..02c4db70a6 100644
--- a/samples/dialogs/makefile.vc
+++ b/samples/dialogs/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/dialup/dialup_vc8.vcproj b/samples/dialup/dialup_vc8.vcproj
index 3077c114d6..cd342effe4 100644
--- a/samples/dialup/dialup_vc8.vcproj
+++ b/samples/dialup/dialup_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\nettest"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\nettest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\nettest\"
-				ProgramDataBaseFileName="vc_mswud_x64\nettest.pdb"
+				ObjectFile="vc_x64_mswud\nettest\"
+				ProgramDataBaseFileName="vc_x64_mswud\nettest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\nettest.exe"
+				OutputFile="vc_x64_mswud\nettest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\nettest.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\nettest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\dialup_vc8.bsc"
+				OutputFile="vc_x64_mswud\dialup_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\nettest"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\nettest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\nettest\"
-				ProgramDataBaseFileName="vc_mswu_x64\nettest.pdb"
+				ObjectFile="vc_x64_mswu\nettest\"
+				ProgramDataBaseFileName="vc_x64_mswu\nettest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\nettest.exe"
+				OutputFile="vc_x64_mswu\nettest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\nettest.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\nettest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\dialup_vc8.bsc"
+				OutputFile="vc_x64_mswu\dialup_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\nettest"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\nettest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\nettest\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\nettest.pdb"
+				ObjectFile="vc_x64_mswuddll\nettest\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\nettest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\nettest.exe"
+				OutputFile="vc_x64_mswuddll\nettest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\nettest.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\nettest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\dialup_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\dialup_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\nettest"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\nettest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\nettest\"
-				ProgramDataBaseFileName="vc_mswudll_x64\nettest.pdb"
+				ObjectFile="vc_x64_mswudll\nettest\"
+				ProgramDataBaseFileName="vc_x64_mswudll\nettest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\nettest.exe"
+				OutputFile="vc_x64_mswudll\nettest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\nettest.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\nettest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\dialup_vc8.bsc"
+				OutputFile="vc_x64_mswudll\dialup_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/dialup/dialup_vc9.vcproj b/samples/dialup/dialup_vc9.vcproj
index 4083326f86..113815f354 100644
--- a/samples/dialup/dialup_vc9.vcproj
+++ b/samples/dialup/dialup_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\nettest"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\nettest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\nettest\"
-				ProgramDataBaseFileName="vc_mswud_x64\nettest.pdb"
+				ObjectFile="vc_x64_mswud\nettest\"
+				ProgramDataBaseFileName="vc_x64_mswud\nettest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\nettest.exe"
+				OutputFile="vc_x64_mswud\nettest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\nettest.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\nettest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\dialup_vc9.bsc"
+				OutputFile="vc_x64_mswud\dialup_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\nettest"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\nettest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\nettest\"
-				ProgramDataBaseFileName="vc_mswu_x64\nettest.pdb"
+				ObjectFile="vc_x64_mswu\nettest\"
+				ProgramDataBaseFileName="vc_x64_mswu\nettest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\nettest.exe"
+				OutputFile="vc_x64_mswu\nettest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\nettest.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\nettest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\dialup_vc9.bsc"
+				OutputFile="vc_x64_mswu\dialup_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\nettest"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\nettest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\nettest\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\nettest.pdb"
+				ObjectFile="vc_x64_mswuddll\nettest\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\nettest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\nettest.exe"
+				OutputFile="vc_x64_mswuddll\nettest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\nettest.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\nettest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\dialup_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\dialup_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\nettest"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\nettest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\nettest\"
-				ProgramDataBaseFileName="vc_mswudll_x64\nettest.pdb"
+				ObjectFile="vc_x64_mswudll\nettest\"
+				ProgramDataBaseFileName="vc_x64_mswudll\nettest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\nettest.exe"
+				OutputFile="vc_x64_mswudll\nettest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\nettest.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\nettest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\dialup_vc9.bsc"
+				OutputFile="vc_x64_mswudll\dialup_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/dialup/makefile.vc b/samples/dialup/makefile.vc
index 7a2467dbef..53c1eac67e 100644
--- a/samples/dialup/makefile.vc
+++ b/samples/dialup/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/display/display_vc8.vcproj b/samples/display/display_vc8.vcproj
index d4a86daf3a..5d1be9bc04 100644
--- a/samples/display/display_vc8.vcproj
+++ b/samples/display/display_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\display"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\display"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\display\"
-				ProgramDataBaseFileName="vc_mswud_x64\display.pdb"
+				ObjectFile="vc_x64_mswud\display\"
+				ProgramDataBaseFileName="vc_x64_mswud\display.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\display.exe"
+				OutputFile="vc_x64_mswud\display.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\display.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\display.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\display_vc8.bsc"
+				OutputFile="vc_x64_mswud\display_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\display"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\display"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\display\"
-				ProgramDataBaseFileName="vc_mswu_x64\display.pdb"
+				ObjectFile="vc_x64_mswu\display\"
+				ProgramDataBaseFileName="vc_x64_mswu\display.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\display.exe"
+				OutputFile="vc_x64_mswu\display.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\display.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\display.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\display_vc8.bsc"
+				OutputFile="vc_x64_mswu\display_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\display"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\display"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\display\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\display.pdb"
+				ObjectFile="vc_x64_mswuddll\display\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\display.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\display.exe"
+				OutputFile="vc_x64_mswuddll\display.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\display.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\display.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\display_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\display_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\display"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\display"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\display\"
-				ProgramDataBaseFileName="vc_mswudll_x64\display.pdb"
+				ObjectFile="vc_x64_mswudll\display\"
+				ProgramDataBaseFileName="vc_x64_mswudll\display.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\display.exe"
+				OutputFile="vc_x64_mswudll\display.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\display.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\display.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\display_vc8.bsc"
+				OutputFile="vc_x64_mswudll\display_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/display/display_vc9.vcproj b/samples/display/display_vc9.vcproj
index 8a68786900..c7789bb3fc 100644
--- a/samples/display/display_vc9.vcproj
+++ b/samples/display/display_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\display"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\display"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\display\"
-				ProgramDataBaseFileName="vc_mswud_x64\display.pdb"
+				ObjectFile="vc_x64_mswud\display\"
+				ProgramDataBaseFileName="vc_x64_mswud\display.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\display.exe"
+				OutputFile="vc_x64_mswud\display.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\display.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\display.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\display_vc9.bsc"
+				OutputFile="vc_x64_mswud\display_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\display"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\display"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\display\"
-				ProgramDataBaseFileName="vc_mswu_x64\display.pdb"
+				ObjectFile="vc_x64_mswu\display\"
+				ProgramDataBaseFileName="vc_x64_mswu\display.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\display.exe"
+				OutputFile="vc_x64_mswu\display.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\display.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\display.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\display_vc9.bsc"
+				OutputFile="vc_x64_mswu\display_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\display"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\display"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\display\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\display.pdb"
+				ObjectFile="vc_x64_mswuddll\display\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\display.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\display.exe"
+				OutputFile="vc_x64_mswuddll\display.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\display.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\display.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\display_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\display_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\display"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\display"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\display\"
-				ProgramDataBaseFileName="vc_mswudll_x64\display.pdb"
+				ObjectFile="vc_x64_mswudll\display\"
+				ProgramDataBaseFileName="vc_x64_mswudll\display.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\display.exe"
+				OutputFile="vc_x64_mswudll\display.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\display.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\display.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\display_vc9.bsc"
+				OutputFile="vc_x64_mswudll\display_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/display/makefile.vc b/samples/display/makefile.vc
index 200a5361e7..2fde52c0a3 100644
--- a/samples/display/makefile.vc
+++ b/samples/display/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/dll/dll_vc8_my_dll.vcproj b/samples/dll/dll_vc8_my_dll.vcproj
index d1af3e7a92..418a08b940 100644
--- a/samples/dll/dll_vc8_my_dll.vcproj
+++ b/samples/dll/dll_vc8_my_dll.vcproj
@@ -388,8 +388,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\my_dll"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\my_dll"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -423,8 +423,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\my_dll\"
-				ProgramDataBaseFileName="vc_mswud_x64\my_dll.pdb"
+				ObjectFile="vc_x64_mswud\my_dll\"
+				ProgramDataBaseFileName="vc_x64_mswud\my_dll.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -446,14 +446,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\my_dll.dll"
+				OutputFile="vc_x64_mswud\my_dll.dll"
 				LinkIncremental="2"
-				ImportLibrary="vc_mswud_x64\my_dll.lib"
+				ImportLibrary="vc_x64_mswud\my_dll.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\my_dll.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\my_dll.pdb"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -467,7 +467,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\dll_vc8_my_dll.bsc"
+				OutputFile="vc_x64_mswud\dll_vc8_my_dll.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -479,8 +479,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\my_dll"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\my_dll"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -511,8 +511,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\my_dll\"
-				ProgramDataBaseFileName="vc_mswu_x64\my_dll.pdb"
+				ObjectFile="vc_x64_mswu\my_dll\"
+				ProgramDataBaseFileName="vc_x64_mswu\my_dll.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -534,14 +534,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\my_dll.dll"
+				OutputFile="vc_x64_mswu\my_dll.dll"
 				LinkIncremental="1"
-				ImportLibrary="vc_mswu_x64\my_dll.lib"
+				ImportLibrary="vc_x64_mswu\my_dll.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\my_dll.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\my_dll.pdb"
 				TargetMachine="17"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -557,7 +557,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\dll_vc8_my_dll.bsc"
+				OutputFile="vc_x64_mswu\dll_vc8_my_dll.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -569,8 +569,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\my_dll"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\my_dll"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -604,8 +604,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\my_dll\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\my_dll.pdb"
+				ObjectFile="vc_x64_mswuddll\my_dll\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\my_dll.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -627,14 +627,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\my_dll.dll"
+				OutputFile="vc_x64_mswuddll\my_dll.dll"
 				LinkIncremental="2"
-				ImportLibrary="vc_mswuddll_x64\my_dll.lib"
+				ImportLibrary="vc_x64_mswuddll\my_dll.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\my_dll.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\my_dll.pdb"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -648,7 +648,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\dll_vc8_my_dll.bsc"
+				OutputFile="vc_x64_mswuddll\dll_vc8_my_dll.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -660,8 +660,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\my_dll"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\my_dll"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -692,8 +692,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\my_dll\"
-				ProgramDataBaseFileName="vc_mswudll_x64\my_dll.pdb"
+				ObjectFile="vc_x64_mswudll\my_dll\"
+				ProgramDataBaseFileName="vc_x64_mswudll\my_dll.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -715,14 +715,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\my_dll.dll"
+				OutputFile="vc_x64_mswudll\my_dll.dll"
 				LinkIncremental="1"
-				ImportLibrary="vc_mswudll_x64\my_dll.lib"
+				ImportLibrary="vc_x64_mswudll\my_dll.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\my_dll.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\my_dll.pdb"
 				TargetMachine="17"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -738,7 +738,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\dll_vc8_my_dll.bsc"
+				OutputFile="vc_x64_mswudll\dll_vc8_my_dll.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/dll/dll_vc8_sdk_exe.vcproj b/samples/dll/dll_vc8_sdk_exe.vcproj
index f115288ef3..ae883cd62b 100644
--- a/samples/dll/dll_vc8_sdk_exe.vcproj
+++ b/samples/dll/dll_vc8_sdk_exe.vcproj
@@ -408,8 +408,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\sdk_exe"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\sdk_exe"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -442,8 +442,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\sdk_exe\"
-				ProgramDataBaseFileName="vc_mswud_x64\sdk_exe.pdb"
+				ObjectFile="vc_x64_mswud\sdk_exe\"
+				ProgramDataBaseFileName="vc_x64_mswud\sdk_exe.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -464,14 +464,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="vc_mswud_x64\my_dll.lib user32.lib"
-				OutputFile="vc_mswud_x64\sdk_exe.exe"
+				AdditionalDependencies="vc_x64_mswud\my_dll.lib user32.lib"
+				OutputFile="vc_x64_mswud\sdk_exe.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=""
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\sdk_exe.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\sdk_exe.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -486,7 +486,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\dll_vc8_sdk_exe.bsc"
+				OutputFile="vc_x64_mswud\dll_vc8_sdk_exe.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -504,8 +504,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\sdk_exe"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\sdk_exe"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -535,8 +535,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\sdk_exe\"
-				ProgramDataBaseFileName="vc_mswu_x64\sdk_exe.pdb"
+				ObjectFile="vc_x64_mswu\sdk_exe\"
+				ProgramDataBaseFileName="vc_x64_mswu\sdk_exe.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -557,14 +557,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="vc_mswu_x64\my_dll.lib user32.lib"
-				OutputFile="vc_mswu_x64\sdk_exe.exe"
+				AdditionalDependencies="vc_x64_mswu\my_dll.lib user32.lib"
+				OutputFile="vc_x64_mswu\sdk_exe.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=""
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\sdk_exe.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\sdk_exe.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -581,7 +581,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\dll_vc8_sdk_exe.bsc"
+				OutputFile="vc_x64_mswu\dll_vc8_sdk_exe.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -599,8 +599,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\sdk_exe"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\sdk_exe"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -633,8 +633,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\sdk_exe\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\sdk_exe.pdb"
+				ObjectFile="vc_x64_mswuddll\sdk_exe\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\sdk_exe.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -655,14 +655,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="vc_mswuddll_x64\my_dll.lib user32.lib"
-				OutputFile="vc_mswuddll_x64\sdk_exe.exe"
+				AdditionalDependencies="vc_x64_mswuddll\my_dll.lib user32.lib"
+				OutputFile="vc_x64_mswuddll\sdk_exe.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=""
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\sdk_exe.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\sdk_exe.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -677,7 +677,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\dll_vc8_sdk_exe.bsc"
+				OutputFile="vc_x64_mswuddll\dll_vc8_sdk_exe.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -695,8 +695,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\sdk_exe"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\sdk_exe"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -726,8 +726,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\sdk_exe\"
-				ProgramDataBaseFileName="vc_mswudll_x64\sdk_exe.pdb"
+				ObjectFile="vc_x64_mswudll\sdk_exe\"
+				ProgramDataBaseFileName="vc_x64_mswudll\sdk_exe.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -748,14 +748,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="vc_mswudll_x64\my_dll.lib user32.lib"
-				OutputFile="vc_mswudll_x64\sdk_exe.exe"
+				AdditionalDependencies="vc_x64_mswudll\my_dll.lib user32.lib"
+				OutputFile="vc_x64_mswudll\sdk_exe.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=""
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\sdk_exe.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\sdk_exe.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -772,7 +772,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\dll_vc8_sdk_exe.bsc"
+				OutputFile="vc_x64_mswudll\dll_vc8_sdk_exe.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/dll/dll_vc8_wx_exe.vcproj b/samples/dll/dll_vc8_wx_exe.vcproj
index 65ce8ff559..b1ea1a8c2f 100644
--- a/samples/dll/dll_vc8_wx_exe.vcproj
+++ b/samples/dll/dll_vc8_wx_exe.vcproj
@@ -219,8 +219,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\wx_exe"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\wx_exe"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -254,8 +254,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\wx_exe\"
-				ProgramDataBaseFileName="vc_mswud_x64\wx_exe.pdb"
+				ObjectFile="vc_x64_mswud\wx_exe\"
+				ProgramDataBaseFileName="vc_x64_mswud\wx_exe.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -276,14 +276,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib  vc_mswud_x64\my_dll.lib   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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\wx_exe.exe"
+				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib  vc_x64_mswud\my_dll.lib   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 ws2_32.lib wininet.lib"
+				OutputFile="vc_x64_mswud\wx_exe.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\wx_exe.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\wx_exe.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -298,7 +298,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\dll_vc8_wx_exe.bsc"
+				OutputFile="vc_x64_mswud\dll_vc8_wx_exe.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -316,8 +316,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\wx_exe"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\wx_exe"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -348,8 +348,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\wx_exe\"
-				ProgramDataBaseFileName="vc_mswu_x64\wx_exe.pdb"
+				ObjectFile="vc_x64_mswu\wx_exe\"
+				ProgramDataBaseFileName="vc_x64_mswu\wx_exe.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -370,14 +370,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib  vc_mswu_x64\my_dll.lib   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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\wx_exe.exe"
+				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib  vc_x64_mswu\my_dll.lib   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 ws2_32.lib wininet.lib"
+				OutputFile="vc_x64_mswu\wx_exe.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\wx_exe.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\wx_exe.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -394,7 +394,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\dll_vc8_wx_exe.bsc"
+				OutputFile="vc_x64_mswu\dll_vc8_wx_exe.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/dll/dll_vc9_my_dll.vcproj b/samples/dll/dll_vc9_my_dll.vcproj
index f44c705c31..cfa705f58d 100644
--- a/samples/dll/dll_vc9_my_dll.vcproj
+++ b/samples/dll/dll_vc9_my_dll.vcproj
@@ -386,8 +386,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\my_dll"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\my_dll"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -421,8 +421,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\my_dll\"
-				ProgramDataBaseFileName="vc_mswud_x64\my_dll.pdb"
+				ObjectFile="vc_x64_mswud\my_dll\"
+				ProgramDataBaseFileName="vc_x64_mswud\my_dll.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -443,14 +443,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\my_dll.dll"
+				OutputFile="vc_x64_mswud\my_dll.dll"
 				LinkIncremental="2"
-				ImportLibrary="vc_mswud_x64\my_dll.lib"
+				ImportLibrary="vc_x64_mswud\my_dll.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\my_dll.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\my_dll.pdb"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -464,7 +464,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\dll_vc9_my_dll.bsc"
+				OutputFile="vc_x64_mswud\dll_vc9_my_dll.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -476,8 +476,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\my_dll"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\my_dll"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -509,8 +509,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\my_dll\"
-				ProgramDataBaseFileName="vc_mswu_x64\my_dll.pdb"
+				ObjectFile="vc_x64_mswu\my_dll\"
+				ProgramDataBaseFileName="vc_x64_mswu\my_dll.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -531,14 +531,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\my_dll.dll"
+				OutputFile="vc_x64_mswu\my_dll.dll"
 				LinkIncremental="1"
-				ImportLibrary="vc_mswu_x64\my_dll.lib"
+				ImportLibrary="vc_x64_mswu\my_dll.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\my_dll.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\my_dll.pdb"
 				TargetMachine="17"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -554,7 +554,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\dll_vc9_my_dll.bsc"
+				OutputFile="vc_x64_mswu\dll_vc9_my_dll.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -566,8 +566,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\my_dll"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\my_dll"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -601,8 +601,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\my_dll\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\my_dll.pdb"
+				ObjectFile="vc_x64_mswuddll\my_dll\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\my_dll.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -623,14 +623,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\my_dll.dll"
+				OutputFile="vc_x64_mswuddll\my_dll.dll"
 				LinkIncremental="2"
-				ImportLibrary="vc_mswuddll_x64\my_dll.lib"
+				ImportLibrary="vc_x64_mswuddll\my_dll.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\my_dll.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\my_dll.pdb"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -644,7 +644,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\dll_vc9_my_dll.bsc"
+				OutputFile="vc_x64_mswuddll\dll_vc9_my_dll.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -656,8 +656,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\my_dll"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\my_dll"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -689,8 +689,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\my_dll\"
-				ProgramDataBaseFileName="vc_mswudll_x64\my_dll.pdb"
+				ObjectFile="vc_x64_mswudll\my_dll\"
+				ProgramDataBaseFileName="vc_x64_mswudll\my_dll.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -711,14 +711,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\my_dll.dll"
+				OutputFile="vc_x64_mswudll\my_dll.dll"
 				LinkIncremental="1"
-				ImportLibrary="vc_mswudll_x64\my_dll.lib"
+				ImportLibrary="vc_x64_mswudll\my_dll.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\my_dll.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\my_dll.pdb"
 				TargetMachine="17"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -734,7 +734,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\dll_vc9_my_dll.bsc"
+				OutputFile="vc_x64_mswudll\dll_vc9_my_dll.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/dll/dll_vc9_sdk_exe.vcproj b/samples/dll/dll_vc9_sdk_exe.vcproj
index b2a05cb7d8..d6850ca537 100644
--- a/samples/dll/dll_vc9_sdk_exe.vcproj
+++ b/samples/dll/dll_vc9_sdk_exe.vcproj
@@ -394,8 +394,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\sdk_exe"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\sdk_exe"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -428,8 +428,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\sdk_exe\"
-				ProgramDataBaseFileName="vc_mswud_x64\sdk_exe.pdb"
+				ObjectFile="vc_x64_mswud\sdk_exe\"
+				ProgramDataBaseFileName="vc_x64_mswud\sdk_exe.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -449,14 +449,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="vc_mswud_x64\my_dll.lib user32.lib"
-				OutputFile="vc_mswud_x64\sdk_exe.exe"
+				AdditionalDependencies="vc_x64_mswud\my_dll.lib user32.lib"
+				OutputFile="vc_x64_mswud\sdk_exe.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=""
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\sdk_exe.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\sdk_exe.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -471,7 +471,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\dll_vc9_sdk_exe.bsc"
+				OutputFile="vc_x64_mswud\dll_vc9_sdk_exe.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -486,8 +486,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\sdk_exe"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\sdk_exe"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -518,8 +518,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\sdk_exe\"
-				ProgramDataBaseFileName="vc_mswu_x64\sdk_exe.pdb"
+				ObjectFile="vc_x64_mswu\sdk_exe\"
+				ProgramDataBaseFileName="vc_x64_mswu\sdk_exe.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -539,14 +539,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="vc_mswu_x64\my_dll.lib user32.lib"
-				OutputFile="vc_mswu_x64\sdk_exe.exe"
+				AdditionalDependencies="vc_x64_mswu\my_dll.lib user32.lib"
+				OutputFile="vc_x64_mswu\sdk_exe.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=""
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\sdk_exe.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\sdk_exe.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -563,7 +563,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\dll_vc9_sdk_exe.bsc"
+				OutputFile="vc_x64_mswu\dll_vc9_sdk_exe.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -578,8 +578,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\sdk_exe"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\sdk_exe"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -612,8 +612,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\sdk_exe\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\sdk_exe.pdb"
+				ObjectFile="vc_x64_mswuddll\sdk_exe\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\sdk_exe.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -633,14 +633,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="vc_mswuddll_x64\my_dll.lib user32.lib"
-				OutputFile="vc_mswuddll_x64\sdk_exe.exe"
+				AdditionalDependencies="vc_x64_mswuddll\my_dll.lib user32.lib"
+				OutputFile="vc_x64_mswuddll\sdk_exe.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=""
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\sdk_exe.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\sdk_exe.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -655,7 +655,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\dll_vc9_sdk_exe.bsc"
+				OutputFile="vc_x64_mswuddll\dll_vc9_sdk_exe.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -670,8 +670,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\sdk_exe"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\sdk_exe"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -702,8 +702,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\sdk_exe\"
-				ProgramDataBaseFileName="vc_mswudll_x64\sdk_exe.pdb"
+				ObjectFile="vc_x64_mswudll\sdk_exe\"
+				ProgramDataBaseFileName="vc_x64_mswudll\sdk_exe.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -723,14 +723,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="vc_mswudll_x64\my_dll.lib user32.lib"
-				OutputFile="vc_mswudll_x64\sdk_exe.exe"
+				AdditionalDependencies="vc_x64_mswudll\my_dll.lib user32.lib"
+				OutputFile="vc_x64_mswudll\sdk_exe.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=""
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\sdk_exe.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\sdk_exe.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -747,7 +747,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\dll_vc9_sdk_exe.bsc"
+				OutputFile="vc_x64_mswudll\dll_vc9_sdk_exe.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/dll/dll_vc9_wx_exe.vcproj b/samples/dll/dll_vc9_wx_exe.vcproj
index cc650efa81..c5a8f4fa90 100644
--- a/samples/dll/dll_vc9_wx_exe.vcproj
+++ b/samples/dll/dll_vc9_wx_exe.vcproj
@@ -212,8 +212,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\wx_exe"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\wx_exe"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -247,8 +247,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\wx_exe\"
-				ProgramDataBaseFileName="vc_mswud_x64\wx_exe.pdb"
+				ObjectFile="vc_x64_mswud\wx_exe\"
+				ProgramDataBaseFileName="vc_x64_mswud\wx_exe.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -268,14 +268,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib  vc_mswud_x64\my_dll.lib   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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\wx_exe.exe"
+				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib  vc_x64_mswud\my_dll.lib   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 ws2_32.lib wininet.lib"
+				OutputFile="vc_x64_mswud\wx_exe.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\wx_exe.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\wx_exe.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -290,7 +290,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\dll_vc9_wx_exe.bsc"
+				OutputFile="vc_x64_mswud\dll_vc9_wx_exe.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -305,8 +305,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\wx_exe"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\wx_exe"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -338,8 +338,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\wx_exe\"
-				ProgramDataBaseFileName="vc_mswu_x64\wx_exe.pdb"
+				ObjectFile="vc_x64_mswu\wx_exe\"
+				ProgramDataBaseFileName="vc_x64_mswu\wx_exe.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -359,14 +359,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib  vc_mswu_x64\my_dll.lib   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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\wx_exe.exe"
+				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib  vc_x64_mswu\my_dll.lib   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 ws2_32.lib wininet.lib"
+				OutputFile="vc_x64_mswu\wx_exe.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\wx_exe.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\wx_exe.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -383,7 +383,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\dll_vc9_wx_exe.bsc"
+				OutputFile="vc_x64_mswu\dll_vc9_wx_exe.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/dll/makefile.vc b/samples/dll/makefile.vc
index dad873006e..d859f746be 100644
--- a/samples/dll/makefile.vc
+++ b/samples/dll/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/dnd/dnd_vc8.vcproj b/samples/dnd/dnd_vc8.vcproj
index e86340fbb8..c289eb2a26 100644
--- a/samples/dnd/dnd_vc8.vcproj
+++ b/samples/dnd/dnd_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\dnd"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\dnd"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\dnd\"
-				ProgramDataBaseFileName="vc_mswud_x64\dnd.pdb"
+				ObjectFile="vc_x64_mswud\dnd\"
+				ProgramDataBaseFileName="vc_x64_mswud\dnd.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\dnd.exe"
+				OutputFile="vc_x64_mswud\dnd.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\dnd.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\dnd.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\dnd_vc8.bsc"
+				OutputFile="vc_x64_mswud\dnd_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\dnd"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\dnd"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\dnd\"
-				ProgramDataBaseFileName="vc_mswu_x64\dnd.pdb"
+				ObjectFile="vc_x64_mswu\dnd\"
+				ProgramDataBaseFileName="vc_x64_mswu\dnd.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\dnd.exe"
+				OutputFile="vc_x64_mswu\dnd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\dnd.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\dnd.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\dnd_vc8.bsc"
+				OutputFile="vc_x64_mswu\dnd_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\dnd"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\dnd"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\dnd\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\dnd.pdb"
+				ObjectFile="vc_x64_mswuddll\dnd\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\dnd.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\dnd.exe"
+				OutputFile="vc_x64_mswuddll\dnd.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\dnd.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\dnd.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\dnd_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\dnd_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\dnd"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\dnd"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\dnd\"
-				ProgramDataBaseFileName="vc_mswudll_x64\dnd.pdb"
+				ObjectFile="vc_x64_mswudll\dnd\"
+				ProgramDataBaseFileName="vc_x64_mswudll\dnd.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\dnd.exe"
+				OutputFile="vc_x64_mswudll\dnd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\dnd.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\dnd.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\dnd_vc8.bsc"
+				OutputFile="vc_x64_mswudll\dnd_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/dnd/dnd_vc9.vcproj b/samples/dnd/dnd_vc9.vcproj
index 88f344fcfc..d5237aafb5 100644
--- a/samples/dnd/dnd_vc9.vcproj
+++ b/samples/dnd/dnd_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\dnd"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\dnd"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\dnd\"
-				ProgramDataBaseFileName="vc_mswud_x64\dnd.pdb"
+				ObjectFile="vc_x64_mswud\dnd\"
+				ProgramDataBaseFileName="vc_x64_mswud\dnd.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\dnd.exe"
+				OutputFile="vc_x64_mswud\dnd.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\dnd.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\dnd.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\dnd_vc9.bsc"
+				OutputFile="vc_x64_mswud\dnd_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\dnd"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\dnd"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\dnd\"
-				ProgramDataBaseFileName="vc_mswu_x64\dnd.pdb"
+				ObjectFile="vc_x64_mswu\dnd\"
+				ProgramDataBaseFileName="vc_x64_mswu\dnd.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\dnd.exe"
+				OutputFile="vc_x64_mswu\dnd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\dnd.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\dnd.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\dnd_vc9.bsc"
+				OutputFile="vc_x64_mswu\dnd_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\dnd"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\dnd"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\dnd\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\dnd.pdb"
+				ObjectFile="vc_x64_mswuddll\dnd\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\dnd.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\dnd.exe"
+				OutputFile="vc_x64_mswuddll\dnd.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\dnd.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\dnd.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\dnd_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\dnd_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\dnd"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\dnd"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\dnd\"
-				ProgramDataBaseFileName="vc_mswudll_x64\dnd.pdb"
+				ObjectFile="vc_x64_mswudll\dnd\"
+				ProgramDataBaseFileName="vc_x64_mswudll\dnd.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\dnd.exe"
+				OutputFile="vc_x64_mswudll\dnd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\dnd.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\dnd.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\dnd_vc9.bsc"
+				OutputFile="vc_x64_mswudll\dnd_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/dnd/makefile.vc b/samples/dnd/makefile.vc
index ba849ae751..8c9af1bc33 100644
--- a/samples/dnd/makefile.vc
+++ b/samples/dnd/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/docview/docview_vc8.vcproj b/samples/docview/docview_vc8.vcproj
index 5983ce1747..25e9ecb61d 100644
--- a/samples/docview/docview_vc8.vcproj
+++ b/samples/docview/docview_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\docview"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\docview"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\docview\"
-				ProgramDataBaseFileName="vc_mswud_x64\docview.pdb"
+				ObjectFile="vc_x64_mswud\docview\"
+				ProgramDataBaseFileName="vc_x64_mswud\docview.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_aui.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\docview.exe"
+				OutputFile="vc_x64_mswud\docview.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\docview.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\docview.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\docview_vc8.bsc"
+				OutputFile="vc_x64_mswud\docview_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\docview"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\docview"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\docview\"
-				ProgramDataBaseFileName="vc_mswu_x64\docview.pdb"
+				ObjectFile="vc_x64_mswu\docview\"
+				ProgramDataBaseFileName="vc_x64_mswu\docview.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_aui.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\docview.exe"
+				OutputFile="vc_x64_mswu\docview.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\docview.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\docview.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\docview_vc8.bsc"
+				OutputFile="vc_x64_mswu\docview_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\docview"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\docview"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\docview\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\docview.pdb"
+				ObjectFile="vc_x64_mswuddll\docview\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\docview.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_aui.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\docview.exe"
+				OutputFile="vc_x64_mswuddll\docview.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\docview.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\docview.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\docview_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\docview_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\docview"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\docview"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\docview\"
-				ProgramDataBaseFileName="vc_mswudll_x64\docview.pdb"
+				ObjectFile="vc_x64_mswudll\docview\"
+				ProgramDataBaseFileName="vc_x64_mswudll\docview.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_aui.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\docview.exe"
+				OutputFile="vc_x64_mswudll\docview.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\docview.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\docview.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\docview_vc8.bsc"
+				OutputFile="vc_x64_mswudll\docview_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/docview/docview_vc9.vcproj b/samples/docview/docview_vc9.vcproj
index 8658a2b9d7..27c2b69ffa 100644
--- a/samples/docview/docview_vc9.vcproj
+++ b/samples/docview/docview_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\docview"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\docview"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\docview\"
-				ProgramDataBaseFileName="vc_mswud_x64\docview.pdb"
+				ObjectFile="vc_x64_mswud\docview\"
+				ProgramDataBaseFileName="vc_x64_mswud\docview.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_aui.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\docview.exe"
+				OutputFile="vc_x64_mswud\docview.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\docview.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\docview.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\docview_vc9.bsc"
+				OutputFile="vc_x64_mswud\docview_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\docview"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\docview"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\docview\"
-				ProgramDataBaseFileName="vc_mswu_x64\docview.pdb"
+				ObjectFile="vc_x64_mswu\docview\"
+				ProgramDataBaseFileName="vc_x64_mswu\docview.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_aui.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\docview.exe"
+				OutputFile="vc_x64_mswu\docview.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\docview.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\docview.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\docview_vc9.bsc"
+				OutputFile="vc_x64_mswu\docview_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\docview"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\docview"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\docview\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\docview.pdb"
+				ObjectFile="vc_x64_mswuddll\docview\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\docview.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_aui.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\docview.exe"
+				OutputFile="vc_x64_mswuddll\docview.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\docview.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\docview.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\docview_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\docview_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\docview"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\docview"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\docview\"
-				ProgramDataBaseFileName="vc_mswudll_x64\docview.pdb"
+				ObjectFile="vc_x64_mswudll\docview\"
+				ProgramDataBaseFileName="vc_x64_mswudll\docview.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_aui.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\docview.exe"
+				OutputFile="vc_x64_mswudll\docview.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\docview.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\docview.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\docview_vc9.bsc"
+				OutputFile="vc_x64_mswudll\docview_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/docview/makefile.vc b/samples/docview/makefile.vc
index cb0e0a8704..9fd2ace6a0 100644
--- a/samples/docview/makefile.vc
+++ b/samples/docview/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/dragimag/dragimag_vc8.vcproj b/samples/dragimag/dragimag_vc8.vcproj
index b9caad20c8..b019dcf395 100644
--- a/samples/dragimag/dragimag_vc8.vcproj
+++ b/samples/dragimag/dragimag_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\dragimag"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\dragimag"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\dragimag\"
-				ProgramDataBaseFileName="vc_mswud_x64\dragimag.pdb"
+				ObjectFile="vc_x64_mswud\dragimag\"
+				ProgramDataBaseFileName="vc_x64_mswud\dragimag.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\dragimag.exe"
+				OutputFile="vc_x64_mswud\dragimag.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\dragimag.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\dragimag.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\dragimag_vc8.bsc"
+				OutputFile="vc_x64_mswud\dragimag_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\dragimag"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\dragimag"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\dragimag\"
-				ProgramDataBaseFileName="vc_mswu_x64\dragimag.pdb"
+				ObjectFile="vc_x64_mswu\dragimag\"
+				ProgramDataBaseFileName="vc_x64_mswu\dragimag.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\dragimag.exe"
+				OutputFile="vc_x64_mswu\dragimag.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\dragimag.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\dragimag.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\dragimag_vc8.bsc"
+				OutputFile="vc_x64_mswu\dragimag_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\dragimag"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\dragimag"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\dragimag\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\dragimag.pdb"
+				ObjectFile="vc_x64_mswuddll\dragimag\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\dragimag.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\dragimag.exe"
+				OutputFile="vc_x64_mswuddll\dragimag.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\dragimag.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\dragimag.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\dragimag_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\dragimag_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\dragimag"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\dragimag"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\dragimag\"
-				ProgramDataBaseFileName="vc_mswudll_x64\dragimag.pdb"
+				ObjectFile="vc_x64_mswudll\dragimag\"
+				ProgramDataBaseFileName="vc_x64_mswudll\dragimag.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\dragimag.exe"
+				OutputFile="vc_x64_mswudll\dragimag.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\dragimag.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\dragimag.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\dragimag_vc8.bsc"
+				OutputFile="vc_x64_mswudll\dragimag_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/dragimag/dragimag_vc9.vcproj b/samples/dragimag/dragimag_vc9.vcproj
index 6a5c7765e3..0663132de0 100644
--- a/samples/dragimag/dragimag_vc9.vcproj
+++ b/samples/dragimag/dragimag_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\dragimag"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\dragimag"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\dragimag\"
-				ProgramDataBaseFileName="vc_mswud_x64\dragimag.pdb"
+				ObjectFile="vc_x64_mswud\dragimag\"
+				ProgramDataBaseFileName="vc_x64_mswud\dragimag.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\dragimag.exe"
+				OutputFile="vc_x64_mswud\dragimag.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\dragimag.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\dragimag.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\dragimag_vc9.bsc"
+				OutputFile="vc_x64_mswud\dragimag_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\dragimag"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\dragimag"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\dragimag\"
-				ProgramDataBaseFileName="vc_mswu_x64\dragimag.pdb"
+				ObjectFile="vc_x64_mswu\dragimag\"
+				ProgramDataBaseFileName="vc_x64_mswu\dragimag.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\dragimag.exe"
+				OutputFile="vc_x64_mswu\dragimag.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\dragimag.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\dragimag.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\dragimag_vc9.bsc"
+				OutputFile="vc_x64_mswu\dragimag_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\dragimag"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\dragimag"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\dragimag\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\dragimag.pdb"
+				ObjectFile="vc_x64_mswuddll\dragimag\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\dragimag.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\dragimag.exe"
+				OutputFile="vc_x64_mswuddll\dragimag.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\dragimag.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\dragimag.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\dragimag_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\dragimag_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\dragimag"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\dragimag"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\dragimag\"
-				ProgramDataBaseFileName="vc_mswudll_x64\dragimag.pdb"
+				ObjectFile="vc_x64_mswudll\dragimag\"
+				ProgramDataBaseFileName="vc_x64_mswudll\dragimag.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\dragimag.exe"
+				OutputFile="vc_x64_mswudll\dragimag.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\dragimag.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\dragimag.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\dragimag_vc9.bsc"
+				OutputFile="vc_x64_mswudll\dragimag_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/dragimag/makefile.vc b/samples/dragimag/makefile.vc
index 54136a06ae..ba5cc7d395 100644
--- a/samples/dragimag/makefile.vc
+++ b/samples/dragimag/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/drawing/drawing_vc8.vcproj b/samples/drawing/drawing_vc8.vcproj
index 3ec106bd54..95de9ea148 100644
--- a/samples/drawing/drawing_vc8.vcproj
+++ b/samples/drawing/drawing_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\drawing"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\drawing"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\drawing\"
-				ProgramDataBaseFileName="vc_mswud_x64\drawing.pdb"
+				ObjectFile="vc_x64_mswud\drawing\"
+				ProgramDataBaseFileName="vc_x64_mswud\drawing.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\drawing.exe"
+				OutputFile="vc_x64_mswud\drawing.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\drawing.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\drawing.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\drawing_vc8.bsc"
+				OutputFile="vc_x64_mswud\drawing_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\drawing"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\drawing"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\drawing\"
-				ProgramDataBaseFileName="vc_mswu_x64\drawing.pdb"
+				ObjectFile="vc_x64_mswu\drawing\"
+				ProgramDataBaseFileName="vc_x64_mswu\drawing.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\drawing.exe"
+				OutputFile="vc_x64_mswu\drawing.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\drawing.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\drawing.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\drawing_vc8.bsc"
+				OutputFile="vc_x64_mswu\drawing_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\drawing"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\drawing"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\drawing\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\drawing.pdb"
+				ObjectFile="vc_x64_mswuddll\drawing\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\drawing.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\drawing.exe"
+				OutputFile="vc_x64_mswuddll\drawing.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\drawing.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\drawing.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\drawing_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\drawing_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\drawing"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\drawing"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\drawing\"
-				ProgramDataBaseFileName="vc_mswudll_x64\drawing.pdb"
+				ObjectFile="vc_x64_mswudll\drawing\"
+				ProgramDataBaseFileName="vc_x64_mswudll\drawing.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\drawing.exe"
+				OutputFile="vc_x64_mswudll\drawing.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\drawing.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\drawing.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\drawing_vc8.bsc"
+				OutputFile="vc_x64_mswudll\drawing_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/drawing/drawing_vc9.vcproj b/samples/drawing/drawing_vc9.vcproj
index 6025588a4f..59f3ccf1b4 100644
--- a/samples/drawing/drawing_vc9.vcproj
+++ b/samples/drawing/drawing_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\drawing"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\drawing"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\drawing\"
-				ProgramDataBaseFileName="vc_mswud_x64\drawing.pdb"
+				ObjectFile="vc_x64_mswud\drawing\"
+				ProgramDataBaseFileName="vc_x64_mswud\drawing.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\drawing.exe"
+				OutputFile="vc_x64_mswud\drawing.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\drawing.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\drawing.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\drawing_vc9.bsc"
+				OutputFile="vc_x64_mswud\drawing_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\drawing"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\drawing"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\drawing\"
-				ProgramDataBaseFileName="vc_mswu_x64\drawing.pdb"
+				ObjectFile="vc_x64_mswu\drawing\"
+				ProgramDataBaseFileName="vc_x64_mswu\drawing.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\drawing.exe"
+				OutputFile="vc_x64_mswu\drawing.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\drawing.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\drawing.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\drawing_vc9.bsc"
+				OutputFile="vc_x64_mswu\drawing_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\drawing"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\drawing"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\drawing\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\drawing.pdb"
+				ObjectFile="vc_x64_mswuddll\drawing\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\drawing.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\drawing.exe"
+				OutputFile="vc_x64_mswuddll\drawing.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\drawing.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\drawing.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\drawing_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\drawing_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\drawing"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\drawing"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\drawing\"
-				ProgramDataBaseFileName="vc_mswudll_x64\drawing.pdb"
+				ObjectFile="vc_x64_mswudll\drawing\"
+				ProgramDataBaseFileName="vc_x64_mswudll\drawing.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\drawing.exe"
+				OutputFile="vc_x64_mswudll\drawing.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\drawing.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\drawing.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\drawing_vc9.bsc"
+				OutputFile="vc_x64_mswudll\drawing_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/drawing/makefile.vc b/samples/drawing/makefile.vc
index 158051c45b..5c038b99bb 100644
--- a/samples/drawing/makefile.vc
+++ b/samples/drawing/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/erase/erase_vc8.vcproj b/samples/erase/erase_vc8.vcproj
index 47c9201c06..25d9c83ea4 100644
--- a/samples/erase/erase_vc8.vcproj
+++ b/samples/erase/erase_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\erase"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\erase"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\erase\"
-				ProgramDataBaseFileName="vc_mswud_x64\erase.pdb"
+				ObjectFile="vc_x64_mswud\erase\"
+				ProgramDataBaseFileName="vc_x64_mswud\erase.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\erase.exe"
+				OutputFile="vc_x64_mswud\erase.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\erase.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\erase.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\erase_vc8.bsc"
+				OutputFile="vc_x64_mswud\erase_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\erase"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\erase"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\erase\"
-				ProgramDataBaseFileName="vc_mswu_x64\erase.pdb"
+				ObjectFile="vc_x64_mswu\erase\"
+				ProgramDataBaseFileName="vc_x64_mswu\erase.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\erase.exe"
+				OutputFile="vc_x64_mswu\erase.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\erase.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\erase.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\erase_vc8.bsc"
+				OutputFile="vc_x64_mswu\erase_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\erase"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\erase"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\erase\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\erase.pdb"
+				ObjectFile="vc_x64_mswuddll\erase\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\erase.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\erase.exe"
+				OutputFile="vc_x64_mswuddll\erase.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\erase.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\erase.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\erase_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\erase_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\erase"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\erase"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\erase\"
-				ProgramDataBaseFileName="vc_mswudll_x64\erase.pdb"
+				ObjectFile="vc_x64_mswudll\erase\"
+				ProgramDataBaseFileName="vc_x64_mswudll\erase.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\erase.exe"
+				OutputFile="vc_x64_mswudll\erase.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\erase.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\erase.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\erase_vc8.bsc"
+				OutputFile="vc_x64_mswudll\erase_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/erase/erase_vc9.vcproj b/samples/erase/erase_vc9.vcproj
index e25ae586ba..de650118f2 100644
--- a/samples/erase/erase_vc9.vcproj
+++ b/samples/erase/erase_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\erase"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\erase"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\erase\"
-				ProgramDataBaseFileName="vc_mswud_x64\erase.pdb"
+				ObjectFile="vc_x64_mswud\erase\"
+				ProgramDataBaseFileName="vc_x64_mswud\erase.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\erase.exe"
+				OutputFile="vc_x64_mswud\erase.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\erase.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\erase.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\erase_vc9.bsc"
+				OutputFile="vc_x64_mswud\erase_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\erase"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\erase"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\erase\"
-				ProgramDataBaseFileName="vc_mswu_x64\erase.pdb"
+				ObjectFile="vc_x64_mswu\erase\"
+				ProgramDataBaseFileName="vc_x64_mswu\erase.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\erase.exe"
+				OutputFile="vc_x64_mswu\erase.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\erase.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\erase.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\erase_vc9.bsc"
+				OutputFile="vc_x64_mswu\erase_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\erase"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\erase"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\erase\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\erase.pdb"
+				ObjectFile="vc_x64_mswuddll\erase\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\erase.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\erase.exe"
+				OutputFile="vc_x64_mswuddll\erase.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\erase.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\erase.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\erase_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\erase_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\erase"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\erase"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\erase\"
-				ProgramDataBaseFileName="vc_mswudll_x64\erase.pdb"
+				ObjectFile="vc_x64_mswudll\erase\"
+				ProgramDataBaseFileName="vc_x64_mswudll\erase.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\erase.exe"
+				OutputFile="vc_x64_mswudll\erase.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\erase.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\erase.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\erase_vc9.bsc"
+				OutputFile="vc_x64_mswudll\erase_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/erase/makefile.vc b/samples/erase/makefile.vc
index 99ee39ea31..8b4484aa91 100644
--- a/samples/erase/makefile.vc
+++ b/samples/erase/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/event/event_vc8.vcproj b/samples/event/event_vc8.vcproj
index f3b8a9b14e..c67e348ec0 100644
--- a/samples/event/event_vc8.vcproj
+++ b/samples/event/event_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\event"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\event"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\event\"
-				ProgramDataBaseFileName="vc_mswud_x64\event.pdb"
+				ObjectFile="vc_x64_mswud\event\"
+				ProgramDataBaseFileName="vc_x64_mswud\event.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\event.exe"
+				OutputFile="vc_x64_mswud\event.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\event.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\event.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\event_vc8.bsc"
+				OutputFile="vc_x64_mswud\event_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\event"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\event"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\event\"
-				ProgramDataBaseFileName="vc_mswu_x64\event.pdb"
+				ObjectFile="vc_x64_mswu\event\"
+				ProgramDataBaseFileName="vc_x64_mswu\event.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\event.exe"
+				OutputFile="vc_x64_mswu\event.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\event.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\event.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\event_vc8.bsc"
+				OutputFile="vc_x64_mswu\event_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\event"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\event"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\event\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\event.pdb"
+				ObjectFile="vc_x64_mswuddll\event\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\event.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\event.exe"
+				OutputFile="vc_x64_mswuddll\event.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\event.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\event.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\event_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\event_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\event"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\event"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\event\"
-				ProgramDataBaseFileName="vc_mswudll_x64\event.pdb"
+				ObjectFile="vc_x64_mswudll\event\"
+				ProgramDataBaseFileName="vc_x64_mswudll\event.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\event.exe"
+				OutputFile="vc_x64_mswudll\event.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\event.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\event.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\event_vc8.bsc"
+				OutputFile="vc_x64_mswudll\event_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/event/event_vc9.vcproj b/samples/event/event_vc9.vcproj
index c4160f7fb0..96c0577e1e 100644
--- a/samples/event/event_vc9.vcproj
+++ b/samples/event/event_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\event"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\event"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\event\"
-				ProgramDataBaseFileName="vc_mswud_x64\event.pdb"
+				ObjectFile="vc_x64_mswud\event\"
+				ProgramDataBaseFileName="vc_x64_mswud\event.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\event.exe"
+				OutputFile="vc_x64_mswud\event.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\event.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\event.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\event_vc9.bsc"
+				OutputFile="vc_x64_mswud\event_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\event"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\event"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\event\"
-				ProgramDataBaseFileName="vc_mswu_x64\event.pdb"
+				ObjectFile="vc_x64_mswu\event\"
+				ProgramDataBaseFileName="vc_x64_mswu\event.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\event.exe"
+				OutputFile="vc_x64_mswu\event.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\event.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\event.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\event_vc9.bsc"
+				OutputFile="vc_x64_mswu\event_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\event"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\event"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\event\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\event.pdb"
+				ObjectFile="vc_x64_mswuddll\event\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\event.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\event.exe"
+				OutputFile="vc_x64_mswuddll\event.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\event.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\event.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\event_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\event_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\event"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\event"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\event\"
-				ProgramDataBaseFileName="vc_mswudll_x64\event.pdb"
+				ObjectFile="vc_x64_mswudll\event\"
+				ProgramDataBaseFileName="vc_x64_mswudll\event.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\event.exe"
+				OutputFile="vc_x64_mswudll\event.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\event.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\event.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\event_vc9.bsc"
+				OutputFile="vc_x64_mswudll\event_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/event/makefile.vc b/samples/event/makefile.vc
index 26f26c3bfb..00c78c4061 100644
--- a/samples/event/makefile.vc
+++ b/samples/event/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/except/except_vc8.vcproj b/samples/except/except_vc8.vcproj
index fbbb409464..10c0bb545d 100644
--- a/samples/except/except_vc8.vcproj
+++ b/samples/except/except_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\except"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\except"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\except\"
-				ProgramDataBaseFileName="vc_mswud_x64\except.pdb"
+				ObjectFile="vc_x64_mswud\except\"
+				ProgramDataBaseFileName="vc_x64_mswud\except.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\except.exe"
+				OutputFile="vc_x64_mswud\except.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\except.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\except.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\except_vc8.bsc"
+				OutputFile="vc_x64_mswud\except_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\except"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\except"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\except\"
-				ProgramDataBaseFileName="vc_mswu_x64\except.pdb"
+				ObjectFile="vc_x64_mswu\except\"
+				ProgramDataBaseFileName="vc_x64_mswu\except.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\except.exe"
+				OutputFile="vc_x64_mswu\except.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\except.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\except.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\except_vc8.bsc"
+				OutputFile="vc_x64_mswu\except_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\except"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\except"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\except\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\except.pdb"
+				ObjectFile="vc_x64_mswuddll\except\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\except.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\except.exe"
+				OutputFile="vc_x64_mswuddll\except.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\except.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\except.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\except_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\except_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\except"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\except"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\except\"
-				ProgramDataBaseFileName="vc_mswudll_x64\except.pdb"
+				ObjectFile="vc_x64_mswudll\except\"
+				ProgramDataBaseFileName="vc_x64_mswudll\except.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\except.exe"
+				OutputFile="vc_x64_mswudll\except.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\except.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\except.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\except_vc8.bsc"
+				OutputFile="vc_x64_mswudll\except_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/except/except_vc9.vcproj b/samples/except/except_vc9.vcproj
index 33795ed26c..786dcc3a2a 100644
--- a/samples/except/except_vc9.vcproj
+++ b/samples/except/except_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\except"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\except"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\except\"
-				ProgramDataBaseFileName="vc_mswud_x64\except.pdb"
+				ObjectFile="vc_x64_mswud\except\"
+				ProgramDataBaseFileName="vc_x64_mswud\except.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\except.exe"
+				OutputFile="vc_x64_mswud\except.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\except.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\except.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\except_vc9.bsc"
+				OutputFile="vc_x64_mswud\except_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\except"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\except"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\except\"
-				ProgramDataBaseFileName="vc_mswu_x64\except.pdb"
+				ObjectFile="vc_x64_mswu\except\"
+				ProgramDataBaseFileName="vc_x64_mswu\except.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\except.exe"
+				OutputFile="vc_x64_mswu\except.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\except.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\except.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\except_vc9.bsc"
+				OutputFile="vc_x64_mswu\except_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\except"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\except"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\except\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\except.pdb"
+				ObjectFile="vc_x64_mswuddll\except\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\except.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\except.exe"
+				OutputFile="vc_x64_mswuddll\except.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\except.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\except.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\except_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\except_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\except"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\except"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\except\"
-				ProgramDataBaseFileName="vc_mswudll_x64\except.pdb"
+				ObjectFile="vc_x64_mswudll\except\"
+				ProgramDataBaseFileName="vc_x64_mswudll\except.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\except.exe"
+				OutputFile="vc_x64_mswudll\except.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\except.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\except.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\except_vc9.bsc"
+				OutputFile="vc_x64_mswudll\except_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/except/makefile.vc b/samples/except/makefile.vc
index 63606f2bdf..69edc7e6ea 100644
--- a/samples/except/makefile.vc
+++ b/samples/except/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/exec/exec_vc8.vcproj b/samples/exec/exec_vc8.vcproj
index c9046ad6a9..61d1fd4009 100644
--- a/samples/exec/exec_vc8.vcproj
+++ b/samples/exec/exec_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\exec"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\exec"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\exec\"
-				ProgramDataBaseFileName="vc_mswud_x64\exec.pdb"
+				ObjectFile="vc_x64_mswud\exec\"
+				ProgramDataBaseFileName="vc_x64_mswud\exec.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\exec.exe"
+				OutputFile="vc_x64_mswud\exec.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\exec.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\exec.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\exec_vc8.bsc"
+				OutputFile="vc_x64_mswud\exec_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\exec"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\exec"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\exec\"
-				ProgramDataBaseFileName="vc_mswu_x64\exec.pdb"
+				ObjectFile="vc_x64_mswu\exec\"
+				ProgramDataBaseFileName="vc_x64_mswu\exec.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\exec.exe"
+				OutputFile="vc_x64_mswu\exec.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\exec.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\exec.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\exec_vc8.bsc"
+				OutputFile="vc_x64_mswu\exec_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\exec"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\exec"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\exec\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\exec.pdb"
+				ObjectFile="vc_x64_mswuddll\exec\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\exec.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\exec.exe"
+				OutputFile="vc_x64_mswuddll\exec.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\exec.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\exec.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\exec_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\exec_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\exec"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\exec"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\exec\"
-				ProgramDataBaseFileName="vc_mswudll_x64\exec.pdb"
+				ObjectFile="vc_x64_mswudll\exec\"
+				ProgramDataBaseFileName="vc_x64_mswudll\exec.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\exec.exe"
+				OutputFile="vc_x64_mswudll\exec.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\exec.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\exec.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\exec_vc8.bsc"
+				OutputFile="vc_x64_mswudll\exec_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/exec/exec_vc9.vcproj b/samples/exec/exec_vc9.vcproj
index 4be1343449..c79a17954f 100644
--- a/samples/exec/exec_vc9.vcproj
+++ b/samples/exec/exec_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\exec"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\exec"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\exec\"
-				ProgramDataBaseFileName="vc_mswud_x64\exec.pdb"
+				ObjectFile="vc_x64_mswud\exec\"
+				ProgramDataBaseFileName="vc_x64_mswud\exec.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\exec.exe"
+				OutputFile="vc_x64_mswud\exec.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\exec.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\exec.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\exec_vc9.bsc"
+				OutputFile="vc_x64_mswud\exec_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\exec"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\exec"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\exec\"
-				ProgramDataBaseFileName="vc_mswu_x64\exec.pdb"
+				ObjectFile="vc_x64_mswu\exec\"
+				ProgramDataBaseFileName="vc_x64_mswu\exec.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\exec.exe"
+				OutputFile="vc_x64_mswu\exec.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\exec.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\exec.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\exec_vc9.bsc"
+				OutputFile="vc_x64_mswu\exec_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\exec"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\exec"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\exec\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\exec.pdb"
+				ObjectFile="vc_x64_mswuddll\exec\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\exec.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\exec.exe"
+				OutputFile="vc_x64_mswuddll\exec.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\exec.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\exec.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\exec_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\exec_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\exec"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\exec"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\exec\"
-				ProgramDataBaseFileName="vc_mswudll_x64\exec.pdb"
+				ObjectFile="vc_x64_mswudll\exec\"
+				ProgramDataBaseFileName="vc_x64_mswudll\exec.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\exec.exe"
+				OutputFile="vc_x64_mswudll\exec.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\exec.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\exec.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\exec_vc9.bsc"
+				OutputFile="vc_x64_mswudll\exec_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/exec/makefile.vc b/samples/exec/makefile.vc
index 79f010a131..42b9a2e5cc 100644
--- a/samples/exec/makefile.vc
+++ b/samples/exec/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/font/font_vc8.vcproj b/samples/font/font_vc8.vcproj
index b1df634314..20d6fec5f9 100644
--- a/samples/font/font_vc8.vcproj
+++ b/samples/font/font_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\font"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\font"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\font\"
-				ProgramDataBaseFileName="vc_mswud_x64\font.pdb"
+				ObjectFile="vc_x64_mswud\font\"
+				ProgramDataBaseFileName="vc_x64_mswud\font.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\font.exe"
+				OutputFile="vc_x64_mswud\font.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\font.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\font.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\font_vc8.bsc"
+				OutputFile="vc_x64_mswud\font_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\font"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\font"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\font\"
-				ProgramDataBaseFileName="vc_mswu_x64\font.pdb"
+				ObjectFile="vc_x64_mswu\font\"
+				ProgramDataBaseFileName="vc_x64_mswu\font.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\font.exe"
+				OutputFile="vc_x64_mswu\font.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\font.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\font.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\font_vc8.bsc"
+				OutputFile="vc_x64_mswu\font_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\font"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\font"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\font\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\font.pdb"
+				ObjectFile="vc_x64_mswuddll\font\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\font.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\font.exe"
+				OutputFile="vc_x64_mswuddll\font.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\font.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\font.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\font_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\font_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\font"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\font"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\font\"
-				ProgramDataBaseFileName="vc_mswudll_x64\font.pdb"
+				ObjectFile="vc_x64_mswudll\font\"
+				ProgramDataBaseFileName="vc_x64_mswudll\font.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\font.exe"
+				OutputFile="vc_x64_mswudll\font.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\font.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\font.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\font_vc8.bsc"
+				OutputFile="vc_x64_mswudll\font_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/font/font_vc9.vcproj b/samples/font/font_vc9.vcproj
index e12b040e13..8fb7d2eae6 100644
--- a/samples/font/font_vc9.vcproj
+++ b/samples/font/font_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\font"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\font"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\font\"
-				ProgramDataBaseFileName="vc_mswud_x64\font.pdb"
+				ObjectFile="vc_x64_mswud\font\"
+				ProgramDataBaseFileName="vc_x64_mswud\font.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\font.exe"
+				OutputFile="vc_x64_mswud\font.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\font.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\font.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\font_vc9.bsc"
+				OutputFile="vc_x64_mswud\font_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\font"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\font"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\font\"
-				ProgramDataBaseFileName="vc_mswu_x64\font.pdb"
+				ObjectFile="vc_x64_mswu\font\"
+				ProgramDataBaseFileName="vc_x64_mswu\font.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\font.exe"
+				OutputFile="vc_x64_mswu\font.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\font.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\font.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\font_vc9.bsc"
+				OutputFile="vc_x64_mswu\font_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\font"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\font"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\font\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\font.pdb"
+				ObjectFile="vc_x64_mswuddll\font\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\font.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\font.exe"
+				OutputFile="vc_x64_mswuddll\font.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\font.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\font.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\font_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\font_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\font"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\font"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\font\"
-				ProgramDataBaseFileName="vc_mswudll_x64\font.pdb"
+				ObjectFile="vc_x64_mswudll\font\"
+				ProgramDataBaseFileName="vc_x64_mswudll\font.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\font.exe"
+				OutputFile="vc_x64_mswudll\font.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\font.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\font.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\font_vc9.bsc"
+				OutputFile="vc_x64_mswudll\font_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/font/makefile.vc b/samples/font/makefile.vc
index 2f2590e08f..37357f81ff 100644
--- a/samples/font/makefile.vc
+++ b/samples/font/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/fswatcher/fswatcher_vc8.vcproj b/samples/fswatcher/fswatcher_vc8.vcproj
index 58bedb4dc5..0d5ac29c81 100644
--- a/samples/fswatcher/fswatcher_vc8.vcproj
+++ b/samples/fswatcher/fswatcher_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\fswatcher"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\fswatcher"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\fswatcher\"
-				ProgramDataBaseFileName="vc_mswud_x64\fswatcher.pdb"
+				ObjectFile="vc_x64_mswud\fswatcher\"
+				ProgramDataBaseFileName="vc_x64_mswud\fswatcher.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\fswatcher.exe"
+				OutputFile="vc_x64_mswud\fswatcher.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\fswatcher.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\fswatcher.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\fswatcher_vc8.bsc"
+				OutputFile="vc_x64_mswud\fswatcher_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\fswatcher"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\fswatcher"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\fswatcher\"
-				ProgramDataBaseFileName="vc_mswu_x64\fswatcher.pdb"
+				ObjectFile="vc_x64_mswu\fswatcher\"
+				ProgramDataBaseFileName="vc_x64_mswu\fswatcher.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\fswatcher.exe"
+				OutputFile="vc_x64_mswu\fswatcher.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\fswatcher.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\fswatcher.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\fswatcher_vc8.bsc"
+				OutputFile="vc_x64_mswu\fswatcher_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\fswatcher"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\fswatcher"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\fswatcher\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\fswatcher.pdb"
+				ObjectFile="vc_x64_mswuddll\fswatcher\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\fswatcher.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\fswatcher.exe"
+				OutputFile="vc_x64_mswuddll\fswatcher.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\fswatcher.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\fswatcher.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\fswatcher_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\fswatcher_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\fswatcher"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\fswatcher"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\fswatcher\"
-				ProgramDataBaseFileName="vc_mswudll_x64\fswatcher.pdb"
+				ObjectFile="vc_x64_mswudll\fswatcher\"
+				ProgramDataBaseFileName="vc_x64_mswudll\fswatcher.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\fswatcher.exe"
+				OutputFile="vc_x64_mswudll\fswatcher.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\fswatcher.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\fswatcher.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\fswatcher_vc8.bsc"
+				OutputFile="vc_x64_mswudll\fswatcher_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/fswatcher/fswatcher_vc9.vcproj b/samples/fswatcher/fswatcher_vc9.vcproj
index 01a86eea70..b3a47a8c3a 100644
--- a/samples/fswatcher/fswatcher_vc9.vcproj
+++ b/samples/fswatcher/fswatcher_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\fswatcher"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\fswatcher"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\fswatcher\"
-				ProgramDataBaseFileName="vc_mswud_x64\fswatcher.pdb"
+				ObjectFile="vc_x64_mswud\fswatcher\"
+				ProgramDataBaseFileName="vc_x64_mswud\fswatcher.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\fswatcher.exe"
+				OutputFile="vc_x64_mswud\fswatcher.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\fswatcher.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\fswatcher.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\fswatcher_vc9.bsc"
+				OutputFile="vc_x64_mswud\fswatcher_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\fswatcher"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\fswatcher"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\fswatcher\"
-				ProgramDataBaseFileName="vc_mswu_x64\fswatcher.pdb"
+				ObjectFile="vc_x64_mswu\fswatcher\"
+				ProgramDataBaseFileName="vc_x64_mswu\fswatcher.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\fswatcher.exe"
+				OutputFile="vc_x64_mswu\fswatcher.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\fswatcher.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\fswatcher.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\fswatcher_vc9.bsc"
+				OutputFile="vc_x64_mswu\fswatcher_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\fswatcher"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\fswatcher"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\fswatcher\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\fswatcher.pdb"
+				ObjectFile="vc_x64_mswuddll\fswatcher\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\fswatcher.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\fswatcher.exe"
+				OutputFile="vc_x64_mswuddll\fswatcher.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\fswatcher.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\fswatcher.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\fswatcher_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\fswatcher_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\fswatcher"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\fswatcher"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\fswatcher\"
-				ProgramDataBaseFileName="vc_mswudll_x64\fswatcher.pdb"
+				ObjectFile="vc_x64_mswudll\fswatcher\"
+				ProgramDataBaseFileName="vc_x64_mswudll\fswatcher.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\fswatcher.exe"
+				OutputFile="vc_x64_mswudll\fswatcher.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\fswatcher.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\fswatcher.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\fswatcher_vc9.bsc"
+				OutputFile="vc_x64_mswudll\fswatcher_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/fswatcher/makefile.vc b/samples/fswatcher/makefile.vc
index 8b35c909cc..37f492a495 100644
--- a/samples/fswatcher/makefile.vc
+++ b/samples/fswatcher/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/grid/grid_vc8.vcproj b/samples/grid/grid_vc8.vcproj
index 83c958adcb..683e2e193a 100644
--- a/samples/grid/grid_vc8.vcproj
+++ b/samples/grid/grid_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\grid"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\grid"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\grid\"
-				ProgramDataBaseFileName="vc_mswud_x64\grid.pdb"
+				ObjectFile="vc_x64_mswud\grid\"
+				ProgramDataBaseFileName="vc_x64_mswud\grid.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\grid.exe"
+				OutputFile="vc_x64_mswud\grid.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\grid.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\grid.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\grid_vc8.bsc"
+				OutputFile="vc_x64_mswud\grid_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\grid"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\grid"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\grid\"
-				ProgramDataBaseFileName="vc_mswu_x64\grid.pdb"
+				ObjectFile="vc_x64_mswu\grid\"
+				ProgramDataBaseFileName="vc_x64_mswu\grid.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\grid.exe"
+				OutputFile="vc_x64_mswu\grid.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\grid.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\grid.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\grid_vc8.bsc"
+				OutputFile="vc_x64_mswu\grid_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\grid"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\grid"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\grid\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\grid.pdb"
+				ObjectFile="vc_x64_mswuddll\grid\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\grid.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\grid.exe"
+				OutputFile="vc_x64_mswuddll\grid.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\grid.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\grid.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\grid_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\grid_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\grid"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\grid"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\grid\"
-				ProgramDataBaseFileName="vc_mswudll_x64\grid.pdb"
+				ObjectFile="vc_x64_mswudll\grid\"
+				ProgramDataBaseFileName="vc_x64_mswudll\grid.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\grid.exe"
+				OutputFile="vc_x64_mswudll\grid.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\grid.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\grid.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\grid_vc8.bsc"
+				OutputFile="vc_x64_mswudll\grid_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/grid/grid_vc9.vcproj b/samples/grid/grid_vc9.vcproj
index 080b4454ee..0dc8c24444 100644
--- a/samples/grid/grid_vc9.vcproj
+++ b/samples/grid/grid_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\grid"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\grid"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\grid\"
-				ProgramDataBaseFileName="vc_mswud_x64\grid.pdb"
+				ObjectFile="vc_x64_mswud\grid\"
+				ProgramDataBaseFileName="vc_x64_mswud\grid.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\grid.exe"
+				OutputFile="vc_x64_mswud\grid.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\grid.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\grid.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\grid_vc9.bsc"
+				OutputFile="vc_x64_mswud\grid_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\grid"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\grid"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\grid\"
-				ProgramDataBaseFileName="vc_mswu_x64\grid.pdb"
+				ObjectFile="vc_x64_mswu\grid\"
+				ProgramDataBaseFileName="vc_x64_mswu\grid.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\grid.exe"
+				OutputFile="vc_x64_mswu\grid.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\grid.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\grid.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\grid_vc9.bsc"
+				OutputFile="vc_x64_mswu\grid_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\grid"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\grid"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\grid\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\grid.pdb"
+				ObjectFile="vc_x64_mswuddll\grid\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\grid.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\grid.exe"
+				OutputFile="vc_x64_mswuddll\grid.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\grid.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\grid.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\grid_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\grid_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\grid"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\grid"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\grid\"
-				ProgramDataBaseFileName="vc_mswudll_x64\grid.pdb"
+				ObjectFile="vc_x64_mswudll\grid\"
+				ProgramDataBaseFileName="vc_x64_mswudll\grid.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\grid.exe"
+				OutputFile="vc_x64_mswudll\grid.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\grid.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\grid.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\grid_vc9.bsc"
+				OutputFile="vc_x64_mswudll\grid_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/grid/makefile.vc b/samples/grid/makefile.vc
index dd0bd14a28..5153031263 100644
--- a/samples/grid/makefile.vc
+++ b/samples/grid/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/help/help_vc8.vcproj b/samples/help/help_vc8.vcproj
index 5ccdc4b614..e737421492 100644
--- a/samples/help/help_vc8.vcproj
+++ b/samples/help/help_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\help"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\help"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\help\"
-				ProgramDataBaseFileName="vc_mswud_x64\help.pdb"
+				ObjectFile="vc_x64_mswud\help\"
+				ProgramDataBaseFileName="vc_x64_mswud\help.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\help.exe"
+				OutputFile="vc_x64_mswud\help.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\help.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\help.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\help_vc8.bsc"
+				OutputFile="vc_x64_mswud\help_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\help"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\help"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\help\"
-				ProgramDataBaseFileName="vc_mswu_x64\help.pdb"
+				ObjectFile="vc_x64_mswu\help\"
+				ProgramDataBaseFileName="vc_x64_mswu\help.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\help.exe"
+				OutputFile="vc_x64_mswu\help.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\help.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\help.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\help_vc8.bsc"
+				OutputFile="vc_x64_mswu\help_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\help"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\help"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\help\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\help.pdb"
+				ObjectFile="vc_x64_mswuddll\help\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\help.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\help.exe"
+				OutputFile="vc_x64_mswuddll\help.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\help.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\help.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\help_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\help_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\help"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\help"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\help\"
-				ProgramDataBaseFileName="vc_mswudll_x64\help.pdb"
+				ObjectFile="vc_x64_mswudll\help\"
+				ProgramDataBaseFileName="vc_x64_mswudll\help.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\help.exe"
+				OutputFile="vc_x64_mswudll\help.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\help.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\help.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\help_vc8.bsc"
+				OutputFile="vc_x64_mswudll\help_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/help/help_vc9.vcproj b/samples/help/help_vc9.vcproj
index 6c4d01e2ad..185a6dce10 100644
--- a/samples/help/help_vc9.vcproj
+++ b/samples/help/help_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\help"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\help"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\help\"
-				ProgramDataBaseFileName="vc_mswud_x64\help.pdb"
+				ObjectFile="vc_x64_mswud\help\"
+				ProgramDataBaseFileName="vc_x64_mswud\help.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\help.exe"
+				OutputFile="vc_x64_mswud\help.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\help.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\help.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\help_vc9.bsc"
+				OutputFile="vc_x64_mswud\help_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\help"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\help"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\help\"
-				ProgramDataBaseFileName="vc_mswu_x64\help.pdb"
+				ObjectFile="vc_x64_mswu\help\"
+				ProgramDataBaseFileName="vc_x64_mswu\help.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\help.exe"
+				OutputFile="vc_x64_mswu\help.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\help.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\help.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\help_vc9.bsc"
+				OutputFile="vc_x64_mswu\help_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\help"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\help"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\help\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\help.pdb"
+				ObjectFile="vc_x64_mswuddll\help\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\help.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\help.exe"
+				OutputFile="vc_x64_mswuddll\help.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\help.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\help.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\help_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\help_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\help"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\help"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\help\"
-				ProgramDataBaseFileName="vc_mswudll_x64\help.pdb"
+				ObjectFile="vc_x64_mswudll\help\"
+				ProgramDataBaseFileName="vc_x64_mswudll\help.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\help.exe"
+				OutputFile="vc_x64_mswudll\help.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\help.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\help.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\help_vc9.bsc"
+				OutputFile="vc_x64_mswudll\help_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/help/makefile.vc b/samples/help/makefile.vc
index c11fab5f8f..4c61d0076d 100644
--- a/samples/help/makefile.vc
+++ b/samples/help/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/htlbox/htlbox_vc8.vcproj b/samples/htlbox/htlbox_vc8.vcproj
index dd59bea9bd..de4ef031c4 100644
--- a/samples/htlbox/htlbox_vc8.vcproj
+++ b/samples/htlbox/htlbox_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\htlbox"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\htlbox"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\htlbox\"
-				ProgramDataBaseFileName="vc_mswud_x64\htlbox.pdb"
+				ObjectFile="vc_x64_mswud\htlbox\"
+				ProgramDataBaseFileName="vc_x64_mswud\htlbox.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\htlbox.exe"
+				OutputFile="vc_x64_mswud\htlbox.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\htlbox.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\htlbox.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\htlbox_vc8.bsc"
+				OutputFile="vc_x64_mswud\htlbox_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\htlbox"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\htlbox"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\htlbox\"
-				ProgramDataBaseFileName="vc_mswu_x64\htlbox.pdb"
+				ObjectFile="vc_x64_mswu\htlbox\"
+				ProgramDataBaseFileName="vc_x64_mswu\htlbox.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\htlbox.exe"
+				OutputFile="vc_x64_mswu\htlbox.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\htlbox.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\htlbox.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\htlbox_vc8.bsc"
+				OutputFile="vc_x64_mswu\htlbox_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\htlbox"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\htlbox"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\htlbox\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\htlbox.pdb"
+				ObjectFile="vc_x64_mswuddll\htlbox\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\htlbox.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\htlbox.exe"
+				OutputFile="vc_x64_mswuddll\htlbox.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\htlbox.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\htlbox.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\htlbox_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\htlbox_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\htlbox"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\htlbox"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\htlbox\"
-				ProgramDataBaseFileName="vc_mswudll_x64\htlbox.pdb"
+				ObjectFile="vc_x64_mswudll\htlbox\"
+				ProgramDataBaseFileName="vc_x64_mswudll\htlbox.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\htlbox.exe"
+				OutputFile="vc_x64_mswudll\htlbox.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\htlbox.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\htlbox.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\htlbox_vc8.bsc"
+				OutputFile="vc_x64_mswudll\htlbox_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/htlbox/htlbox_vc9.vcproj b/samples/htlbox/htlbox_vc9.vcproj
index 2a2843536b..201ae63815 100644
--- a/samples/htlbox/htlbox_vc9.vcproj
+++ b/samples/htlbox/htlbox_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\htlbox"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\htlbox"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\htlbox\"
-				ProgramDataBaseFileName="vc_mswud_x64\htlbox.pdb"
+				ObjectFile="vc_x64_mswud\htlbox\"
+				ProgramDataBaseFileName="vc_x64_mswud\htlbox.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\htlbox.exe"
+				OutputFile="vc_x64_mswud\htlbox.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\htlbox.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\htlbox.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\htlbox_vc9.bsc"
+				OutputFile="vc_x64_mswud\htlbox_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\htlbox"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\htlbox"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\htlbox\"
-				ProgramDataBaseFileName="vc_mswu_x64\htlbox.pdb"
+				ObjectFile="vc_x64_mswu\htlbox\"
+				ProgramDataBaseFileName="vc_x64_mswu\htlbox.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\htlbox.exe"
+				OutputFile="vc_x64_mswu\htlbox.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\htlbox.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\htlbox.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\htlbox_vc9.bsc"
+				OutputFile="vc_x64_mswu\htlbox_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\htlbox"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\htlbox"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\htlbox\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\htlbox.pdb"
+				ObjectFile="vc_x64_mswuddll\htlbox\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\htlbox.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\htlbox.exe"
+				OutputFile="vc_x64_mswuddll\htlbox.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\htlbox.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\htlbox.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\htlbox_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\htlbox_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\htlbox"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\htlbox"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\htlbox\"
-				ProgramDataBaseFileName="vc_mswudll_x64\htlbox.pdb"
+				ObjectFile="vc_x64_mswudll\htlbox\"
+				ProgramDataBaseFileName="vc_x64_mswudll\htlbox.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\htlbox.exe"
+				OutputFile="vc_x64_mswudll\htlbox.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\htlbox.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\htlbox.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\htlbox_vc9.bsc"
+				OutputFile="vc_x64_mswudll\htlbox_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/htlbox/makefile.vc b/samples/htlbox/makefile.vc
index a1c0726b6c..8f183ed731 100644
--- a/samples/htlbox/makefile.vc
+++ b/samples/htlbox/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/html/about/about_vc8.vcproj b/samples/html/about/about_vc8.vcproj
index befb7e7310..ac7df53746 100644
--- a/samples/html/about/about_vc8.vcproj
+++ b/samples/html/about/about_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\about"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\about"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\about\"
-				ProgramDataBaseFileName="vc_mswud_x64\about.pdb"
+				ObjectFile="vc_x64_mswud\about\"
+				ProgramDataBaseFileName="vc_x64_mswud\about.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\about.exe"
+				OutputFile="vc_x64_mswud\about.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\about.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\about.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\about_vc8.bsc"
+				OutputFile="vc_x64_mswud\about_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\about"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\about"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\about\"
-				ProgramDataBaseFileName="vc_mswu_x64\about.pdb"
+				ObjectFile="vc_x64_mswu\about\"
+				ProgramDataBaseFileName="vc_x64_mswu\about.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\about.exe"
+				OutputFile="vc_x64_mswu\about.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\about.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\about.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\about_vc8.bsc"
+				OutputFile="vc_x64_mswu\about_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\about"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\about"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\about\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\about.pdb"
+				ObjectFile="vc_x64_mswuddll\about\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\about.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\about.exe"
+				OutputFile="vc_x64_mswuddll\about.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\about.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\about.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\about_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\about_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\about"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\about"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\about\"
-				ProgramDataBaseFileName="vc_mswudll_x64\about.pdb"
+				ObjectFile="vc_x64_mswudll\about\"
+				ProgramDataBaseFileName="vc_x64_mswudll\about.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\about.exe"
+				OutputFile="vc_x64_mswudll\about.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\about.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\about.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\about_vc8.bsc"
+				OutputFile="vc_x64_mswudll\about_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/html/about/about_vc9.vcproj b/samples/html/about/about_vc9.vcproj
index 95e86ba739..f750e8965a 100644
--- a/samples/html/about/about_vc9.vcproj
+++ b/samples/html/about/about_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\about"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\about"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\about\"
-				ProgramDataBaseFileName="vc_mswud_x64\about.pdb"
+				ObjectFile="vc_x64_mswud\about\"
+				ProgramDataBaseFileName="vc_x64_mswud\about.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\about.exe"
+				OutputFile="vc_x64_mswud\about.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\about.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\about.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\about_vc9.bsc"
+				OutputFile="vc_x64_mswud\about_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\about"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\about"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\about\"
-				ProgramDataBaseFileName="vc_mswu_x64\about.pdb"
+				ObjectFile="vc_x64_mswu\about\"
+				ProgramDataBaseFileName="vc_x64_mswu\about.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\about.exe"
+				OutputFile="vc_x64_mswu\about.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\about.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\about.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\about_vc9.bsc"
+				OutputFile="vc_x64_mswu\about_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\about"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\about"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\about\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\about.pdb"
+				ObjectFile="vc_x64_mswuddll\about\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\about.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\about.exe"
+				OutputFile="vc_x64_mswuddll\about.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\about.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\about.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\about_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\about_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\about"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\about"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\about\"
-				ProgramDataBaseFileName="vc_mswudll_x64\about.pdb"
+				ObjectFile="vc_x64_mswudll\about\"
+				ProgramDataBaseFileName="vc_x64_mswudll\about.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\about.exe"
+				OutputFile="vc_x64_mswudll\about.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\about.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\about.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\about_vc9.bsc"
+				OutputFile="vc_x64_mswudll\about_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/html/about/makefile.vc b/samples/html/about/makefile.vc
index 39cd0dfd4f..45111fb257 100644
--- a/samples/html/about/makefile.vc
+++ b/samples/html/about/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/html/help/help_vc8.vcproj b/samples/html/help/help_vc8.vcproj
index 6ce7788dd9..f64bc63837 100644
--- a/samples/html/help/help_vc8.vcproj
+++ b/samples/html/help/help_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\htmlhelp"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\htmlhelp"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\htmlhelp\"
-				ProgramDataBaseFileName="vc_mswud_x64\htmlhelp.pdb"
+				ObjectFile="vc_x64_mswud\htmlhelp\"
+				ProgramDataBaseFileName="vc_x64_mswud\htmlhelp.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\htmlhelp.exe"
+				OutputFile="vc_x64_mswud\htmlhelp.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\htmlhelp.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\htmlhelp.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\help_vc8.bsc"
+				OutputFile="vc_x64_mswud\help_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\htmlhelp"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\htmlhelp"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\htmlhelp\"
-				ProgramDataBaseFileName="vc_mswu_x64\htmlhelp.pdb"
+				ObjectFile="vc_x64_mswu\htmlhelp\"
+				ProgramDataBaseFileName="vc_x64_mswu\htmlhelp.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\htmlhelp.exe"
+				OutputFile="vc_x64_mswu\htmlhelp.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\htmlhelp.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\htmlhelp.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\help_vc8.bsc"
+				OutputFile="vc_x64_mswu\help_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\htmlhelp"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\htmlhelp"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\htmlhelp\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\htmlhelp.pdb"
+				ObjectFile="vc_x64_mswuddll\htmlhelp\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\htmlhelp.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\htmlhelp.exe"
+				OutputFile="vc_x64_mswuddll\htmlhelp.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\htmlhelp.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\htmlhelp.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\help_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\help_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\htmlhelp"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\htmlhelp"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\htmlhelp\"
-				ProgramDataBaseFileName="vc_mswudll_x64\htmlhelp.pdb"
+				ObjectFile="vc_x64_mswudll\htmlhelp\"
+				ProgramDataBaseFileName="vc_x64_mswudll\htmlhelp.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\htmlhelp.exe"
+				OutputFile="vc_x64_mswudll\htmlhelp.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\htmlhelp.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\htmlhelp.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\help_vc8.bsc"
+				OutputFile="vc_x64_mswudll\help_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/html/help/help_vc9.vcproj b/samples/html/help/help_vc9.vcproj
index 9cad6061b9..e018d8b5c6 100644
--- a/samples/html/help/help_vc9.vcproj
+++ b/samples/html/help/help_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\htmlhelp"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\htmlhelp"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\htmlhelp\"
-				ProgramDataBaseFileName="vc_mswud_x64\htmlhelp.pdb"
+				ObjectFile="vc_x64_mswud\htmlhelp\"
+				ProgramDataBaseFileName="vc_x64_mswud\htmlhelp.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\htmlhelp.exe"
+				OutputFile="vc_x64_mswud\htmlhelp.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\htmlhelp.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\htmlhelp.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\help_vc9.bsc"
+				OutputFile="vc_x64_mswud\help_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\htmlhelp"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\htmlhelp"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\htmlhelp\"
-				ProgramDataBaseFileName="vc_mswu_x64\htmlhelp.pdb"
+				ObjectFile="vc_x64_mswu\htmlhelp\"
+				ProgramDataBaseFileName="vc_x64_mswu\htmlhelp.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\htmlhelp.exe"
+				OutputFile="vc_x64_mswu\htmlhelp.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\htmlhelp.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\htmlhelp.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\help_vc9.bsc"
+				OutputFile="vc_x64_mswu\help_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\htmlhelp"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\htmlhelp"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\htmlhelp\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\htmlhelp.pdb"
+				ObjectFile="vc_x64_mswuddll\htmlhelp\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\htmlhelp.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\htmlhelp.exe"
+				OutputFile="vc_x64_mswuddll\htmlhelp.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\htmlhelp.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\htmlhelp.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\help_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\help_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\htmlhelp"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\htmlhelp"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\htmlhelp\"
-				ProgramDataBaseFileName="vc_mswudll_x64\htmlhelp.pdb"
+				ObjectFile="vc_x64_mswudll\htmlhelp\"
+				ProgramDataBaseFileName="vc_x64_mswudll\htmlhelp.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\htmlhelp.exe"
+				OutputFile="vc_x64_mswudll\htmlhelp.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\htmlhelp.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\htmlhelp.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\help_vc9.bsc"
+				OutputFile="vc_x64_mswudll\help_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/html/help/makefile.vc b/samples/html/help/makefile.vc
index 8a7fb8ec97..1d17b0f9c5 100644
--- a/samples/html/help/makefile.vc
+++ b/samples/html/help/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/html/helpview/helpview_vc8.vcproj b/samples/html/helpview/helpview_vc8.vcproj
index faa0aa6408..4892a323bf 100644
--- a/samples/html/helpview/helpview_vc8.vcproj
+++ b/samples/html/helpview/helpview_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\helpview"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\helpview"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\helpview\"
-				ProgramDataBaseFileName="vc_mswud_x64\helpview.pdb"
+				ObjectFile="vc_x64_mswud\helpview\"
+				ProgramDataBaseFileName="vc_x64_mswud\helpview.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\helpview.exe"
+				OutputFile="vc_x64_mswud\helpview.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\helpview.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\helpview.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\helpview_vc8.bsc"
+				OutputFile="vc_x64_mswud\helpview_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\helpview"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\helpview"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\helpview\"
-				ProgramDataBaseFileName="vc_mswu_x64\helpview.pdb"
+				ObjectFile="vc_x64_mswu\helpview\"
+				ProgramDataBaseFileName="vc_x64_mswu\helpview.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\helpview.exe"
+				OutputFile="vc_x64_mswu\helpview.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\helpview.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\helpview.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\helpview_vc8.bsc"
+				OutputFile="vc_x64_mswu\helpview_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\helpview"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\helpview"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\helpview\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\helpview.pdb"
+				ObjectFile="vc_x64_mswuddll\helpview\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\helpview.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\helpview.exe"
+				OutputFile="vc_x64_mswuddll\helpview.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\helpview.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\helpview.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\helpview_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\helpview_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\helpview"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\helpview"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\helpview\"
-				ProgramDataBaseFileName="vc_mswudll_x64\helpview.pdb"
+				ObjectFile="vc_x64_mswudll\helpview\"
+				ProgramDataBaseFileName="vc_x64_mswudll\helpview.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\helpview.exe"
+				OutputFile="vc_x64_mswudll\helpview.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\helpview.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\helpview.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\helpview_vc8.bsc"
+				OutputFile="vc_x64_mswudll\helpview_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/html/helpview/helpview_vc9.vcproj b/samples/html/helpview/helpview_vc9.vcproj
index 5c7dd66242..ad5a702ed8 100644
--- a/samples/html/helpview/helpview_vc9.vcproj
+++ b/samples/html/helpview/helpview_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\helpview"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\helpview"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\helpview\"
-				ProgramDataBaseFileName="vc_mswud_x64\helpview.pdb"
+				ObjectFile="vc_x64_mswud\helpview\"
+				ProgramDataBaseFileName="vc_x64_mswud\helpview.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\helpview.exe"
+				OutputFile="vc_x64_mswud\helpview.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\helpview.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\helpview.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\helpview_vc9.bsc"
+				OutputFile="vc_x64_mswud\helpview_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\helpview"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\helpview"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\helpview\"
-				ProgramDataBaseFileName="vc_mswu_x64\helpview.pdb"
+				ObjectFile="vc_x64_mswu\helpview\"
+				ProgramDataBaseFileName="vc_x64_mswu\helpview.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\helpview.exe"
+				OutputFile="vc_x64_mswu\helpview.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\helpview.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\helpview.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\helpview_vc9.bsc"
+				OutputFile="vc_x64_mswu\helpview_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\helpview"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\helpview"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\helpview\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\helpview.pdb"
+				ObjectFile="vc_x64_mswuddll\helpview\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\helpview.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\helpview.exe"
+				OutputFile="vc_x64_mswuddll\helpview.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\helpview.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\helpview.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\helpview_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\helpview_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\helpview"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\helpview"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\helpview\"
-				ProgramDataBaseFileName="vc_mswudll_x64\helpview.pdb"
+				ObjectFile="vc_x64_mswudll\helpview\"
+				ProgramDataBaseFileName="vc_x64_mswudll\helpview.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\helpview.exe"
+				OutputFile="vc_x64_mswudll\helpview.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\helpview.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\helpview.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\helpview_vc9.bsc"
+				OutputFile="vc_x64_mswudll\helpview_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/html/helpview/makefile.vc b/samples/html/helpview/makefile.vc
index f43ef7690f..f1406c2d9c 100644
--- a/samples/html/helpview/makefile.vc
+++ b/samples/html/helpview/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/html/printing/makefile.vc b/samples/html/printing/makefile.vc
index 88c116c15c..3e8691077f 100644
--- a/samples/html/printing/makefile.vc
+++ b/samples/html/printing/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/html/printing/printing_vc8.vcproj b/samples/html/printing/printing_vc8.vcproj
index f627adc694..e8da5ed7ba 100644
--- a/samples/html/printing/printing_vc8.vcproj
+++ b/samples/html/printing/printing_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\htmlprinting"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\htmlprinting"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\htmlprinting\"
-				ProgramDataBaseFileName="vc_mswud_x64\htmlprinting.pdb"
+				ObjectFile="vc_x64_mswud\htmlprinting\"
+				ProgramDataBaseFileName="vc_x64_mswud\htmlprinting.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\htmlprinting.exe"
+				OutputFile="vc_x64_mswud\htmlprinting.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\htmlprinting.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\htmlprinting.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\printing_vc8.bsc"
+				OutputFile="vc_x64_mswud\printing_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\htmlprinting"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\htmlprinting"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\htmlprinting\"
-				ProgramDataBaseFileName="vc_mswu_x64\htmlprinting.pdb"
+				ObjectFile="vc_x64_mswu\htmlprinting\"
+				ProgramDataBaseFileName="vc_x64_mswu\htmlprinting.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\htmlprinting.exe"
+				OutputFile="vc_x64_mswu\htmlprinting.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\htmlprinting.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\htmlprinting.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\printing_vc8.bsc"
+				OutputFile="vc_x64_mswu\printing_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\htmlprinting"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\htmlprinting"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\htmlprinting\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\htmlprinting.pdb"
+				ObjectFile="vc_x64_mswuddll\htmlprinting\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\htmlprinting.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\htmlprinting.exe"
+				OutputFile="vc_x64_mswuddll\htmlprinting.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\htmlprinting.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\htmlprinting.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\printing_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\printing_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\htmlprinting"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\htmlprinting"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\htmlprinting\"
-				ProgramDataBaseFileName="vc_mswudll_x64\htmlprinting.pdb"
+				ObjectFile="vc_x64_mswudll\htmlprinting\"
+				ProgramDataBaseFileName="vc_x64_mswudll\htmlprinting.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\htmlprinting.exe"
+				OutputFile="vc_x64_mswudll\htmlprinting.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\htmlprinting.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\htmlprinting.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\printing_vc8.bsc"
+				OutputFile="vc_x64_mswudll\printing_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/html/printing/printing_vc9.vcproj b/samples/html/printing/printing_vc9.vcproj
index 8cd3964a68..2b27f9a9e1 100644
--- a/samples/html/printing/printing_vc9.vcproj
+++ b/samples/html/printing/printing_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\htmlprinting"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\htmlprinting"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\htmlprinting\"
-				ProgramDataBaseFileName="vc_mswud_x64\htmlprinting.pdb"
+				ObjectFile="vc_x64_mswud\htmlprinting\"
+				ProgramDataBaseFileName="vc_x64_mswud\htmlprinting.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\htmlprinting.exe"
+				OutputFile="vc_x64_mswud\htmlprinting.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\htmlprinting.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\htmlprinting.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\printing_vc9.bsc"
+				OutputFile="vc_x64_mswud\printing_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\htmlprinting"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\htmlprinting"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\htmlprinting\"
-				ProgramDataBaseFileName="vc_mswu_x64\htmlprinting.pdb"
+				ObjectFile="vc_x64_mswu\htmlprinting\"
+				ProgramDataBaseFileName="vc_x64_mswu\htmlprinting.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\htmlprinting.exe"
+				OutputFile="vc_x64_mswu\htmlprinting.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\htmlprinting.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\htmlprinting.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\printing_vc9.bsc"
+				OutputFile="vc_x64_mswu\printing_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\htmlprinting"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\htmlprinting"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\htmlprinting\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\htmlprinting.pdb"
+				ObjectFile="vc_x64_mswuddll\htmlprinting\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\htmlprinting.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\htmlprinting.exe"
+				OutputFile="vc_x64_mswuddll\htmlprinting.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\htmlprinting.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\htmlprinting.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\printing_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\printing_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\htmlprinting"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\htmlprinting"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\htmlprinting\"
-				ProgramDataBaseFileName="vc_mswudll_x64\htmlprinting.pdb"
+				ObjectFile="vc_x64_mswudll\htmlprinting\"
+				ProgramDataBaseFileName="vc_x64_mswudll\htmlprinting.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\htmlprinting.exe"
+				OutputFile="vc_x64_mswudll\htmlprinting.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\htmlprinting.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\htmlprinting.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\printing_vc9.bsc"
+				OutputFile="vc_x64_mswudll\printing_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/html/test/makefile.vc b/samples/html/test/makefile.vc
index 9f7e23be06..af377e7713 100644
--- a/samples/html/test/makefile.vc
+++ b/samples/html/test/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/html/test/test_vc8.vcproj b/samples/html/test/test_vc8.vcproj
index a281a4320a..d7ad9ba82d 100644
--- a/samples/html/test/test_vc8.vcproj
+++ b/samples/html/test/test_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\test"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\test"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\test\"
-				ProgramDataBaseFileName="vc_mswud_x64\test.pdb"
+				ObjectFile="vc_x64_mswud\test\"
+				ProgramDataBaseFileName="vc_x64_mswud\test.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\test.exe"
+				OutputFile="vc_x64_mswud\test.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\test.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\test.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\test_vc8.bsc"
+				OutputFile="vc_x64_mswud\test_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\test"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\test"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\test\"
-				ProgramDataBaseFileName="vc_mswu_x64\test.pdb"
+				ObjectFile="vc_x64_mswu\test\"
+				ProgramDataBaseFileName="vc_x64_mswu\test.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\test.exe"
+				OutputFile="vc_x64_mswu\test.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\test.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\test.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\test_vc8.bsc"
+				OutputFile="vc_x64_mswu\test_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\test"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\test"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\test\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\test.pdb"
+				ObjectFile="vc_x64_mswuddll\test\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\test.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\test.exe"
+				OutputFile="vc_x64_mswuddll\test.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\test.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\test.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\test_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\test_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\test"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\test"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\test\"
-				ProgramDataBaseFileName="vc_mswudll_x64\test.pdb"
+				ObjectFile="vc_x64_mswudll\test\"
+				ProgramDataBaseFileName="vc_x64_mswudll\test.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\test.exe"
+				OutputFile="vc_x64_mswudll\test.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\test.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\test.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\test_vc8.bsc"
+				OutputFile="vc_x64_mswudll\test_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/html/test/test_vc9.vcproj b/samples/html/test/test_vc9.vcproj
index 56fb11eb86..f722926353 100644
--- a/samples/html/test/test_vc9.vcproj
+++ b/samples/html/test/test_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\test"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\test"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\test\"
-				ProgramDataBaseFileName="vc_mswud_x64\test.pdb"
+				ObjectFile="vc_x64_mswud\test\"
+				ProgramDataBaseFileName="vc_x64_mswud\test.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\test.exe"
+				OutputFile="vc_x64_mswud\test.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\test.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\test.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\test_vc9.bsc"
+				OutputFile="vc_x64_mswud\test_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\test"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\test"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\test\"
-				ProgramDataBaseFileName="vc_mswu_x64\test.pdb"
+				ObjectFile="vc_x64_mswu\test\"
+				ProgramDataBaseFileName="vc_x64_mswu\test.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\test.exe"
+				OutputFile="vc_x64_mswu\test.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\test.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\test.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\test_vc9.bsc"
+				OutputFile="vc_x64_mswu\test_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\test"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\test"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\test\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\test.pdb"
+				ObjectFile="vc_x64_mswuddll\test\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\test.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\test.exe"
+				OutputFile="vc_x64_mswuddll\test.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\test.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\test.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\test_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\test_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\test"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\test"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\test\"
-				ProgramDataBaseFileName="vc_mswudll_x64\test.pdb"
+				ObjectFile="vc_x64_mswudll\test\"
+				ProgramDataBaseFileName="vc_x64_mswudll\test.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\test.exe"
+				OutputFile="vc_x64_mswudll\test.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\test.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\test.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\test_vc9.bsc"
+				OutputFile="vc_x64_mswudll\test_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/html/virtual/makefile.vc b/samples/html/virtual/makefile.vc
index 6b9af3eb08..ebe87e1d23 100644
--- a/samples/html/virtual/makefile.vc
+++ b/samples/html/virtual/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/html/virtual/virtual_vc8.vcproj b/samples/html/virtual/virtual_vc8.vcproj
index f6e53afc35..a38bf61c80 100644
--- a/samples/html/virtual/virtual_vc8.vcproj
+++ b/samples/html/virtual/virtual_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\virtual"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\virtual"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\virtual\"
-				ProgramDataBaseFileName="vc_mswud_x64\virtual.pdb"
+				ObjectFile="vc_x64_mswud\virtual\"
+				ProgramDataBaseFileName="vc_x64_mswud\virtual.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\virtual.exe"
+				OutputFile="vc_x64_mswud\virtual.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\virtual.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\virtual.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\virtual_vc8.bsc"
+				OutputFile="vc_x64_mswud\virtual_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\virtual"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\virtual"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\virtual\"
-				ProgramDataBaseFileName="vc_mswu_x64\virtual.pdb"
+				ObjectFile="vc_x64_mswu\virtual\"
+				ProgramDataBaseFileName="vc_x64_mswu\virtual.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\virtual.exe"
+				OutputFile="vc_x64_mswu\virtual.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\virtual.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\virtual.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\virtual_vc8.bsc"
+				OutputFile="vc_x64_mswu\virtual_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\virtual"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\virtual"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\virtual\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\virtual.pdb"
+				ObjectFile="vc_x64_mswuddll\virtual\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\virtual.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\virtual.exe"
+				OutputFile="vc_x64_mswuddll\virtual.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\virtual.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\virtual.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\virtual_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\virtual_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\virtual"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\virtual"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\virtual\"
-				ProgramDataBaseFileName="vc_mswudll_x64\virtual.pdb"
+				ObjectFile="vc_x64_mswudll\virtual\"
+				ProgramDataBaseFileName="vc_x64_mswudll\virtual.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\virtual.exe"
+				OutputFile="vc_x64_mswudll\virtual.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\virtual.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\virtual.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\virtual_vc8.bsc"
+				OutputFile="vc_x64_mswudll\virtual_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/html/virtual/virtual_vc9.vcproj b/samples/html/virtual/virtual_vc9.vcproj
index 6248a7fecf..4922985190 100644
--- a/samples/html/virtual/virtual_vc9.vcproj
+++ b/samples/html/virtual/virtual_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\virtual"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\virtual"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\virtual\"
-				ProgramDataBaseFileName="vc_mswud_x64\virtual.pdb"
+				ObjectFile="vc_x64_mswud\virtual\"
+				ProgramDataBaseFileName="vc_x64_mswud\virtual.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\virtual.exe"
+				OutputFile="vc_x64_mswud\virtual.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\virtual.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\virtual.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\virtual_vc9.bsc"
+				OutputFile="vc_x64_mswud\virtual_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\virtual"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\virtual"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\virtual\"
-				ProgramDataBaseFileName="vc_mswu_x64\virtual.pdb"
+				ObjectFile="vc_x64_mswu\virtual\"
+				ProgramDataBaseFileName="vc_x64_mswu\virtual.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\virtual.exe"
+				OutputFile="vc_x64_mswu\virtual.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\virtual.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\virtual.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\virtual_vc9.bsc"
+				OutputFile="vc_x64_mswu\virtual_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\virtual"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\virtual"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\virtual\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\virtual.pdb"
+				ObjectFile="vc_x64_mswuddll\virtual\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\virtual.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\virtual.exe"
+				OutputFile="vc_x64_mswuddll\virtual.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\virtual.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\virtual.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\virtual_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\virtual_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\virtual"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\virtual"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\virtual\"
-				ProgramDataBaseFileName="vc_mswudll_x64\virtual.pdb"
+				ObjectFile="vc_x64_mswudll\virtual\"
+				ProgramDataBaseFileName="vc_x64_mswudll\virtual.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\virtual.exe"
+				OutputFile="vc_x64_mswudll\virtual.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\virtual.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\virtual.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\virtual_vc9.bsc"
+				OutputFile="vc_x64_mswudll\virtual_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/html/widget/makefile.vc b/samples/html/widget/makefile.vc
index 5cecada2ac..9b05af7585 100644
--- a/samples/html/widget/makefile.vc
+++ b/samples/html/widget/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/html/widget/widget_vc8.vcproj b/samples/html/widget/widget_vc8.vcproj
index b7708991f4..a9f99a8f2c 100644
--- a/samples/html/widget/widget_vc8.vcproj
+++ b/samples/html/widget/widget_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\widget"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\widget"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\widget\"
-				ProgramDataBaseFileName="vc_mswud_x64\widget.pdb"
+				ObjectFile="vc_x64_mswud\widget\"
+				ProgramDataBaseFileName="vc_x64_mswud\widget.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\widget.exe"
+				OutputFile="vc_x64_mswud\widget.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\widget.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\widget.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\widget_vc8.bsc"
+				OutputFile="vc_x64_mswud\widget_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\widget"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\widget"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\widget\"
-				ProgramDataBaseFileName="vc_mswu_x64\widget.pdb"
+				ObjectFile="vc_x64_mswu\widget\"
+				ProgramDataBaseFileName="vc_x64_mswu\widget.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\widget.exe"
+				OutputFile="vc_x64_mswu\widget.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\widget.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\widget.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\widget_vc8.bsc"
+				OutputFile="vc_x64_mswu\widget_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\widget"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\widget"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\widget\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\widget.pdb"
+				ObjectFile="vc_x64_mswuddll\widget\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\widget.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\widget.exe"
+				OutputFile="vc_x64_mswuddll\widget.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\widget.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\widget.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\widget_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\widget_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\widget"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\widget"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\widget\"
-				ProgramDataBaseFileName="vc_mswudll_x64\widget.pdb"
+				ObjectFile="vc_x64_mswudll\widget\"
+				ProgramDataBaseFileName="vc_x64_mswudll\widget.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\widget.exe"
+				OutputFile="vc_x64_mswudll\widget.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\widget.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\widget.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\widget_vc8.bsc"
+				OutputFile="vc_x64_mswudll\widget_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/html/widget/widget_vc9.vcproj b/samples/html/widget/widget_vc9.vcproj
index 8a9a2289e6..e7744a4db1 100644
--- a/samples/html/widget/widget_vc9.vcproj
+++ b/samples/html/widget/widget_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\widget"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\widget"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\widget\"
-				ProgramDataBaseFileName="vc_mswud_x64\widget.pdb"
+				ObjectFile="vc_x64_mswud\widget\"
+				ProgramDataBaseFileName="vc_x64_mswud\widget.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\widget.exe"
+				OutputFile="vc_x64_mswud\widget.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\widget.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\widget.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\widget_vc9.bsc"
+				OutputFile="vc_x64_mswud\widget_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\widget"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\widget"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\widget\"
-				ProgramDataBaseFileName="vc_mswu_x64\widget.pdb"
+				ObjectFile="vc_x64_mswu\widget\"
+				ProgramDataBaseFileName="vc_x64_mswu\widget.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\widget.exe"
+				OutputFile="vc_x64_mswu\widget.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\widget.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\widget.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\widget_vc9.bsc"
+				OutputFile="vc_x64_mswu\widget_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\widget"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\widget"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\widget\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\widget.pdb"
+				ObjectFile="vc_x64_mswuddll\widget\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\widget.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\widget.exe"
+				OutputFile="vc_x64_mswuddll\widget.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\widget.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\widget.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\widget_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\widget_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\widget"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\widget"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\widget\"
-				ProgramDataBaseFileName="vc_mswudll_x64\widget.pdb"
+				ObjectFile="vc_x64_mswudll\widget\"
+				ProgramDataBaseFileName="vc_x64_mswudll\widget.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\widget.exe"
+				OutputFile="vc_x64_mswudll\widget.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\widget.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\widget.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\widget_vc9.bsc"
+				OutputFile="vc_x64_mswudll\widget_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/html/zip/makefile.vc b/samples/html/zip/makefile.vc
index 1d46ec0894..70100f87a2 100644
--- a/samples/html/zip/makefile.vc
+++ b/samples/html/zip/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/html/zip/zip_vc8.vcproj b/samples/html/zip/zip_vc8.vcproj
index 5d0c57d64b..03b1c12fcb 100644
--- a/samples/html/zip/zip_vc8.vcproj
+++ b/samples/html/zip/zip_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\zip"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\zip"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\zip\"
-				ProgramDataBaseFileName="vc_mswud_x64\zip.pdb"
+				ObjectFile="vc_x64_mswud\zip\"
+				ProgramDataBaseFileName="vc_x64_mswud\zip.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\zip.exe"
+				OutputFile="vc_x64_mswud\zip.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\zip.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\zip.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\zip_vc8.bsc"
+				OutputFile="vc_x64_mswud\zip_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\zip"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\zip"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\zip\"
-				ProgramDataBaseFileName="vc_mswu_x64\zip.pdb"
+				ObjectFile="vc_x64_mswu\zip\"
+				ProgramDataBaseFileName="vc_x64_mswu\zip.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\zip.exe"
+				OutputFile="vc_x64_mswu\zip.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\zip.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\zip.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\zip_vc8.bsc"
+				OutputFile="vc_x64_mswu\zip_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\zip"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\zip"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\zip\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\zip.pdb"
+				ObjectFile="vc_x64_mswuddll\zip\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\zip.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\zip.exe"
+				OutputFile="vc_x64_mswuddll\zip.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\zip.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\zip.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\zip_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\zip_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\zip"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\zip"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\zip\"
-				ProgramDataBaseFileName="vc_mswudll_x64\zip.pdb"
+				ObjectFile="vc_x64_mswudll\zip\"
+				ProgramDataBaseFileName="vc_x64_mswudll\zip.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\zip.exe"
+				OutputFile="vc_x64_mswudll\zip.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\zip.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\zip.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\zip_vc8.bsc"
+				OutputFile="vc_x64_mswudll\zip_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/html/zip/zip_vc9.vcproj b/samples/html/zip/zip_vc9.vcproj
index eb93d53ff1..14b4e2a553 100644
--- a/samples/html/zip/zip_vc9.vcproj
+++ b/samples/html/zip/zip_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\zip"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\zip"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\zip\"
-				ProgramDataBaseFileName="vc_mswud_x64\zip.pdb"
+				ObjectFile="vc_x64_mswud\zip\"
+				ProgramDataBaseFileName="vc_x64_mswud\zip.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\zip.exe"
+				OutputFile="vc_x64_mswud\zip.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\zip.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\zip.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\zip_vc9.bsc"
+				OutputFile="vc_x64_mswud\zip_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\zip"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\zip"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\zip\"
-				ProgramDataBaseFileName="vc_mswu_x64\zip.pdb"
+				ObjectFile="vc_x64_mswu\zip\"
+				ProgramDataBaseFileName="vc_x64_mswu\zip.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\zip.exe"
+				OutputFile="vc_x64_mswu\zip.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\zip.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\zip.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\zip_vc9.bsc"
+				OutputFile="vc_x64_mswu\zip_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\zip"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\zip"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\zip\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\zip.pdb"
+				ObjectFile="vc_x64_mswuddll\zip\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\zip.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\zip.exe"
+				OutputFile="vc_x64_mswuddll\zip.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\zip.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\zip.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\zip_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\zip_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\zip"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\zip"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\zip\"
-				ProgramDataBaseFileName="vc_mswudll_x64\zip.pdb"
+				ObjectFile="vc_x64_mswudll\zip\"
+				ProgramDataBaseFileName="vc_x64_mswudll\zip.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\zip.exe"
+				OutputFile="vc_x64_mswudll\zip.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\zip.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\zip.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\zip_vc9.bsc"
+				OutputFile="vc_x64_mswudll\zip_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/image/image_vc8.vcproj b/samples/image/image_vc8.vcproj
index cefa754e5b..984a14f9da 100644
--- a/samples/image/image_vc8.vcproj
+++ b/samples/image/image_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\image"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\image"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\image\"
-				ProgramDataBaseFileName="vc_mswud_x64\image.pdb"
+				ObjectFile="vc_x64_mswud\image\"
+				ProgramDataBaseFileName="vc_x64_mswud\image.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\image.exe"
+				OutputFile="vc_x64_mswud\image.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\image.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\image.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\image_vc8.bsc"
+				OutputFile="vc_x64_mswud\image_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\image"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\image"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\image\"
-				ProgramDataBaseFileName="vc_mswu_x64\image.pdb"
+				ObjectFile="vc_x64_mswu\image\"
+				ProgramDataBaseFileName="vc_x64_mswu\image.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\image.exe"
+				OutputFile="vc_x64_mswu\image.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\image.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\image.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\image_vc8.bsc"
+				OutputFile="vc_x64_mswu\image_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\image"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\image"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\image\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\image.pdb"
+				ObjectFile="vc_x64_mswuddll\image\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\image.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\image.exe"
+				OutputFile="vc_x64_mswuddll\image.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\image.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\image.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\image_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\image_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\image"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\image"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\image\"
-				ProgramDataBaseFileName="vc_mswudll_x64\image.pdb"
+				ObjectFile="vc_x64_mswudll\image\"
+				ProgramDataBaseFileName="vc_x64_mswudll\image.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\image.exe"
+				OutputFile="vc_x64_mswudll\image.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\image.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\image.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\image_vc8.bsc"
+				OutputFile="vc_x64_mswudll\image_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/image/image_vc9.vcproj b/samples/image/image_vc9.vcproj
index 14d3326d7b..ee62c48bdb 100644
--- a/samples/image/image_vc9.vcproj
+++ b/samples/image/image_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\image"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\image"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\image\"
-				ProgramDataBaseFileName="vc_mswud_x64\image.pdb"
+				ObjectFile="vc_x64_mswud\image\"
+				ProgramDataBaseFileName="vc_x64_mswud\image.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\image.exe"
+				OutputFile="vc_x64_mswud\image.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\image.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\image.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\image_vc9.bsc"
+				OutputFile="vc_x64_mswud\image_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\image"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\image"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\image\"
-				ProgramDataBaseFileName="vc_mswu_x64\image.pdb"
+				ObjectFile="vc_x64_mswu\image\"
+				ProgramDataBaseFileName="vc_x64_mswu\image.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\image.exe"
+				OutputFile="vc_x64_mswu\image.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\image.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\image.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\image_vc9.bsc"
+				OutputFile="vc_x64_mswu\image_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\image"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\image"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\image\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\image.pdb"
+				ObjectFile="vc_x64_mswuddll\image\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\image.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\image.exe"
+				OutputFile="vc_x64_mswuddll\image.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\image.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\image.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\image_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\image_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\image"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\image"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\image\"
-				ProgramDataBaseFileName="vc_mswudll_x64\image.pdb"
+				ObjectFile="vc_x64_mswudll\image\"
+				ProgramDataBaseFileName="vc_x64_mswudll\image.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\image.exe"
+				OutputFile="vc_x64_mswudll\image.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\image.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\image.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\image_vc9.bsc"
+				OutputFile="vc_x64_mswudll\image_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/image/makefile.vc b/samples/image/makefile.vc
index b3c55d48c3..ebea4d430a 100644
--- a/samples/image/makefile.vc
+++ b/samples/image/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/internat/internat_vc8.vcproj b/samples/internat/internat_vc8.vcproj
index e58af2be42..e1cc2c3172 100644
--- a/samples/internat/internat_vc8.vcproj
+++ b/samples/internat/internat_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\internat"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\internat"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\internat\"
-				ProgramDataBaseFileName="vc_mswud_x64\internat.pdb"
+				ObjectFile="vc_x64_mswud\internat\"
+				ProgramDataBaseFileName="vc_x64_mswud\internat.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\internat.exe"
+				OutputFile="vc_x64_mswud\internat.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\internat.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\internat.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\internat_vc8.bsc"
+				OutputFile="vc_x64_mswud\internat_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\internat"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\internat"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\internat\"
-				ProgramDataBaseFileName="vc_mswu_x64\internat.pdb"
+				ObjectFile="vc_x64_mswu\internat\"
+				ProgramDataBaseFileName="vc_x64_mswu\internat.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\internat.exe"
+				OutputFile="vc_x64_mswu\internat.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\internat.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\internat.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\internat_vc8.bsc"
+				OutputFile="vc_x64_mswu\internat_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\internat"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\internat"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\internat\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\internat.pdb"
+				ObjectFile="vc_x64_mswuddll\internat\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\internat.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\internat.exe"
+				OutputFile="vc_x64_mswuddll\internat.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\internat.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\internat.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\internat_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\internat_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\internat"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\internat"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\internat\"
-				ProgramDataBaseFileName="vc_mswudll_x64\internat.pdb"
+				ObjectFile="vc_x64_mswudll\internat\"
+				ProgramDataBaseFileName="vc_x64_mswudll\internat.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\internat.exe"
+				OutputFile="vc_x64_mswudll\internat.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\internat.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\internat.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\internat_vc8.bsc"
+				OutputFile="vc_x64_mswudll\internat_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/internat/internat_vc9.vcproj b/samples/internat/internat_vc9.vcproj
index 9f4fb0d3d3..abb228b3a6 100644
--- a/samples/internat/internat_vc9.vcproj
+++ b/samples/internat/internat_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\internat"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\internat"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\internat\"
-				ProgramDataBaseFileName="vc_mswud_x64\internat.pdb"
+				ObjectFile="vc_x64_mswud\internat\"
+				ProgramDataBaseFileName="vc_x64_mswud\internat.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\internat.exe"
+				OutputFile="vc_x64_mswud\internat.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\internat.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\internat.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\internat_vc9.bsc"
+				OutputFile="vc_x64_mswud\internat_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\internat"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\internat"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\internat\"
-				ProgramDataBaseFileName="vc_mswu_x64\internat.pdb"
+				ObjectFile="vc_x64_mswu\internat\"
+				ProgramDataBaseFileName="vc_x64_mswu\internat.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\internat.exe"
+				OutputFile="vc_x64_mswu\internat.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\internat.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\internat.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\internat_vc9.bsc"
+				OutputFile="vc_x64_mswu\internat_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\internat"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\internat"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\internat\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\internat.pdb"
+				ObjectFile="vc_x64_mswuddll\internat\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\internat.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\internat.exe"
+				OutputFile="vc_x64_mswuddll\internat.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\internat.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\internat.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\internat_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\internat_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\internat"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\internat"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\internat\"
-				ProgramDataBaseFileName="vc_mswudll_x64\internat.pdb"
+				ObjectFile="vc_x64_mswudll\internat\"
+				ProgramDataBaseFileName="vc_x64_mswudll\internat.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\internat.exe"
+				OutputFile="vc_x64_mswudll\internat.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\internat.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\internat.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\internat_vc9.bsc"
+				OutputFile="vc_x64_mswudll\internat_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/internat/makefile.vc b/samples/internat/makefile.vc
index 38dc32b0ad..67fed4db69 100644
--- a/samples/internat/makefile.vc
+++ b/samples/internat/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/ipc/ipc_vc8_baseipcclient.vcproj b/samples/ipc/ipc_vc8_baseipcclient.vcproj
index afa571e512..b7f35fda09 100644
--- a/samples/ipc/ipc_vc8_baseipcclient.vcproj
+++ b/samples/ipc/ipc_vc8_baseipcclient.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\baseipcclient"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\baseipcclient"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\baseipcclient\"
-				ProgramDataBaseFileName="vc_mswud_x64\baseipcclient.pdb"
+				ObjectFile="vc_x64_mswud\baseipcclient\"
+				ProgramDataBaseFileName="vc_x64_mswud\baseipcclient.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud_net.lib  wxbase31ud.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\baseipcclient.exe"
+				OutputFile="vc_x64_mswud\baseipcclient.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\baseipcclient.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\baseipcclient.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\ipc_vc8_baseipcclient.bsc"
+				OutputFile="vc_x64_mswud\ipc_vc8_baseipcclient.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\baseipcclient"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\baseipcclient"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\baseipcclient\"
-				ProgramDataBaseFileName="vc_mswu_x64\baseipcclient.pdb"
+				ObjectFile="vc_x64_mswu\baseipcclient\"
+				ProgramDataBaseFileName="vc_x64_mswu\baseipcclient.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u_net.lib  wxbase31u.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\baseipcclient.exe"
+				OutputFile="vc_x64_mswu\baseipcclient.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\baseipcclient.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\baseipcclient.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\ipc_vc8_baseipcclient.bsc"
+				OutputFile="vc_x64_mswu\ipc_vc8_baseipcclient.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\baseipcclient"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\baseipcclient"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\baseipcclient\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\baseipcclient.pdb"
+				ObjectFile="vc_x64_mswuddll\baseipcclient\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\baseipcclient.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud_net.lib  wxbase31ud.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\baseipcclient.exe"
+				OutputFile="vc_x64_mswuddll\baseipcclient.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\baseipcclient.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\baseipcclient.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\ipc_vc8_baseipcclient.bsc"
+				OutputFile="vc_x64_mswuddll\ipc_vc8_baseipcclient.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\baseipcclient"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\baseipcclient"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\baseipcclient\"
-				ProgramDataBaseFileName="vc_mswudll_x64\baseipcclient.pdb"
+				ObjectFile="vc_x64_mswudll\baseipcclient\"
+				ProgramDataBaseFileName="vc_x64_mswudll\baseipcclient.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u_net.lib  wxbase31u.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\baseipcclient.exe"
+				OutputFile="vc_x64_mswudll\baseipcclient.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\baseipcclient.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\baseipcclient.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\ipc_vc8_baseipcclient.bsc"
+				OutputFile="vc_x64_mswudll\ipc_vc8_baseipcclient.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/ipc/ipc_vc8_baseipcserver.vcproj b/samples/ipc/ipc_vc8_baseipcserver.vcproj
index c3b1fb33ec..88e4cdac7c 100644
--- a/samples/ipc/ipc_vc8_baseipcserver.vcproj
+++ b/samples/ipc/ipc_vc8_baseipcserver.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\baseipcserver"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\baseipcserver"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\baseipcserver\"
-				ProgramDataBaseFileName="vc_mswud_x64\baseipcserver.pdb"
+				ObjectFile="vc_x64_mswud\baseipcserver\"
+				ProgramDataBaseFileName="vc_x64_mswud\baseipcserver.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud_net.lib  wxbase31ud.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\baseipcserver.exe"
+				OutputFile="vc_x64_mswud\baseipcserver.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\baseipcserver.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\baseipcserver.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\ipc_vc8_baseipcserver.bsc"
+				OutputFile="vc_x64_mswud\ipc_vc8_baseipcserver.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\baseipcserver"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\baseipcserver"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\baseipcserver\"
-				ProgramDataBaseFileName="vc_mswu_x64\baseipcserver.pdb"
+				ObjectFile="vc_x64_mswu\baseipcserver\"
+				ProgramDataBaseFileName="vc_x64_mswu\baseipcserver.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u_net.lib  wxbase31u.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\baseipcserver.exe"
+				OutputFile="vc_x64_mswu\baseipcserver.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\baseipcserver.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\baseipcserver.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\ipc_vc8_baseipcserver.bsc"
+				OutputFile="vc_x64_mswu\ipc_vc8_baseipcserver.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\baseipcserver"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\baseipcserver"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\baseipcserver\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\baseipcserver.pdb"
+				ObjectFile="vc_x64_mswuddll\baseipcserver\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\baseipcserver.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud_net.lib  wxbase31ud.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\baseipcserver.exe"
+				OutputFile="vc_x64_mswuddll\baseipcserver.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\baseipcserver.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\baseipcserver.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\ipc_vc8_baseipcserver.bsc"
+				OutputFile="vc_x64_mswuddll\ipc_vc8_baseipcserver.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\baseipcserver"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\baseipcserver"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\baseipcserver\"
-				ProgramDataBaseFileName="vc_mswudll_x64\baseipcserver.pdb"
+				ObjectFile="vc_x64_mswudll\baseipcserver\"
+				ProgramDataBaseFileName="vc_x64_mswudll\baseipcserver.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u_net.lib  wxbase31u.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\baseipcserver.exe"
+				OutputFile="vc_x64_mswudll\baseipcserver.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\baseipcserver.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\baseipcserver.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\ipc_vc8_baseipcserver.bsc"
+				OutputFile="vc_x64_mswudll\ipc_vc8_baseipcserver.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/ipc/ipc_vc8_ipcclient.vcproj b/samples/ipc/ipc_vc8_ipcclient.vcproj
index a9145b0b15..e46403ac7b 100644
--- a/samples/ipc/ipc_vc8_ipcclient.vcproj
+++ b/samples/ipc/ipc_vc8_ipcclient.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\ipcclient"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\ipcclient"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\ipcclient\"
-				ProgramDataBaseFileName="vc_mswud_x64\ipcclient.pdb"
+				ObjectFile="vc_x64_mswud\ipcclient\"
+				ProgramDataBaseFileName="vc_x64_mswud\ipcclient.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\ipcclient.exe"
+				OutputFile="vc_x64_mswud\ipcclient.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\ipcclient.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\ipcclient.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\ipc_vc8_ipcclient.bsc"
+				OutputFile="vc_x64_mswud\ipc_vc8_ipcclient.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\ipcclient"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\ipcclient"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\ipcclient\"
-				ProgramDataBaseFileName="vc_mswu_x64\ipcclient.pdb"
+				ObjectFile="vc_x64_mswu\ipcclient\"
+				ProgramDataBaseFileName="vc_x64_mswu\ipcclient.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\ipcclient.exe"
+				OutputFile="vc_x64_mswu\ipcclient.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\ipcclient.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\ipcclient.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\ipc_vc8_ipcclient.bsc"
+				OutputFile="vc_x64_mswu\ipc_vc8_ipcclient.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\ipcclient"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\ipcclient"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\ipcclient\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\ipcclient.pdb"
+				ObjectFile="vc_x64_mswuddll\ipcclient\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\ipcclient.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\ipcclient.exe"
+				OutputFile="vc_x64_mswuddll\ipcclient.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\ipcclient.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\ipcclient.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\ipc_vc8_ipcclient.bsc"
+				OutputFile="vc_x64_mswuddll\ipc_vc8_ipcclient.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\ipcclient"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\ipcclient"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\ipcclient\"
-				ProgramDataBaseFileName="vc_mswudll_x64\ipcclient.pdb"
+				ObjectFile="vc_x64_mswudll\ipcclient\"
+				ProgramDataBaseFileName="vc_x64_mswudll\ipcclient.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\ipcclient.exe"
+				OutputFile="vc_x64_mswudll\ipcclient.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\ipcclient.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\ipcclient.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\ipc_vc8_ipcclient.bsc"
+				OutputFile="vc_x64_mswudll\ipc_vc8_ipcclient.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/ipc/ipc_vc8_ipcserver.vcproj b/samples/ipc/ipc_vc8_ipcserver.vcproj
index 665f742f08..d5b2291351 100644
--- a/samples/ipc/ipc_vc8_ipcserver.vcproj
+++ b/samples/ipc/ipc_vc8_ipcserver.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\ipcserver"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\ipcserver"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\ipcserver\"
-				ProgramDataBaseFileName="vc_mswud_x64\ipcserver.pdb"
+				ObjectFile="vc_x64_mswud\ipcserver\"
+				ProgramDataBaseFileName="vc_x64_mswud\ipcserver.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\ipcserver.exe"
+				OutputFile="vc_x64_mswud\ipcserver.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\ipcserver.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\ipcserver.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\ipc_vc8_ipcserver.bsc"
+				OutputFile="vc_x64_mswud\ipc_vc8_ipcserver.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\ipcserver"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\ipcserver"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\ipcserver\"
-				ProgramDataBaseFileName="vc_mswu_x64\ipcserver.pdb"
+				ObjectFile="vc_x64_mswu\ipcserver\"
+				ProgramDataBaseFileName="vc_x64_mswu\ipcserver.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\ipcserver.exe"
+				OutputFile="vc_x64_mswu\ipcserver.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\ipcserver.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\ipcserver.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\ipc_vc8_ipcserver.bsc"
+				OutputFile="vc_x64_mswu\ipc_vc8_ipcserver.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\ipcserver"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\ipcserver"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\ipcserver\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\ipcserver.pdb"
+				ObjectFile="vc_x64_mswuddll\ipcserver\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\ipcserver.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\ipcserver.exe"
+				OutputFile="vc_x64_mswuddll\ipcserver.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\ipcserver.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\ipcserver.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\ipc_vc8_ipcserver.bsc"
+				OutputFile="vc_x64_mswuddll\ipc_vc8_ipcserver.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\ipcserver"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\ipcserver"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\ipcserver\"
-				ProgramDataBaseFileName="vc_mswudll_x64\ipcserver.pdb"
+				ObjectFile="vc_x64_mswudll\ipcserver\"
+				ProgramDataBaseFileName="vc_x64_mswudll\ipcserver.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\ipcserver.exe"
+				OutputFile="vc_x64_mswudll\ipcserver.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\ipcserver.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\ipcserver.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\ipc_vc8_ipcserver.bsc"
+				OutputFile="vc_x64_mswudll\ipc_vc8_ipcserver.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/ipc/ipc_vc9_baseipcclient.vcproj b/samples/ipc/ipc_vc9_baseipcclient.vcproj
index 287b069df0..8974d9a607 100644
--- a/samples/ipc/ipc_vc9_baseipcclient.vcproj
+++ b/samples/ipc/ipc_vc9_baseipcclient.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\baseipcclient"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\baseipcclient"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\baseipcclient\"
-				ProgramDataBaseFileName="vc_mswud_x64\baseipcclient.pdb"
+				ObjectFile="vc_x64_mswud\baseipcclient\"
+				ProgramDataBaseFileName="vc_x64_mswud\baseipcclient.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud_net.lib  wxbase31ud.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\baseipcclient.exe"
+				OutputFile="vc_x64_mswud\baseipcclient.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\baseipcclient.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\baseipcclient.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\ipc_vc9_baseipcclient.bsc"
+				OutputFile="vc_x64_mswud\ipc_vc9_baseipcclient.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\baseipcclient"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\baseipcclient"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\baseipcclient\"
-				ProgramDataBaseFileName="vc_mswu_x64\baseipcclient.pdb"
+				ObjectFile="vc_x64_mswu\baseipcclient\"
+				ProgramDataBaseFileName="vc_x64_mswu\baseipcclient.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u_net.lib  wxbase31u.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\baseipcclient.exe"
+				OutputFile="vc_x64_mswu\baseipcclient.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\baseipcclient.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\baseipcclient.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\ipc_vc9_baseipcclient.bsc"
+				OutputFile="vc_x64_mswu\ipc_vc9_baseipcclient.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\baseipcclient"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\baseipcclient"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\baseipcclient\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\baseipcclient.pdb"
+				ObjectFile="vc_x64_mswuddll\baseipcclient\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\baseipcclient.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud_net.lib  wxbase31ud.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\baseipcclient.exe"
+				OutputFile="vc_x64_mswuddll\baseipcclient.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\baseipcclient.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\baseipcclient.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\ipc_vc9_baseipcclient.bsc"
+				OutputFile="vc_x64_mswuddll\ipc_vc9_baseipcclient.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\baseipcclient"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\baseipcclient"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\baseipcclient\"
-				ProgramDataBaseFileName="vc_mswudll_x64\baseipcclient.pdb"
+				ObjectFile="vc_x64_mswudll\baseipcclient\"
+				ProgramDataBaseFileName="vc_x64_mswudll\baseipcclient.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u_net.lib  wxbase31u.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\baseipcclient.exe"
+				OutputFile="vc_x64_mswudll\baseipcclient.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\baseipcclient.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\baseipcclient.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\ipc_vc9_baseipcclient.bsc"
+				OutputFile="vc_x64_mswudll\ipc_vc9_baseipcclient.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/ipc/ipc_vc9_baseipcserver.vcproj b/samples/ipc/ipc_vc9_baseipcserver.vcproj
index 66f5168afe..c55c168d40 100644
--- a/samples/ipc/ipc_vc9_baseipcserver.vcproj
+++ b/samples/ipc/ipc_vc9_baseipcserver.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\baseipcserver"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\baseipcserver"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\baseipcserver\"
-				ProgramDataBaseFileName="vc_mswud_x64\baseipcserver.pdb"
+				ObjectFile="vc_x64_mswud\baseipcserver\"
+				ProgramDataBaseFileName="vc_x64_mswud\baseipcserver.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud_net.lib  wxbase31ud.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\baseipcserver.exe"
+				OutputFile="vc_x64_mswud\baseipcserver.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\baseipcserver.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\baseipcserver.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\ipc_vc9_baseipcserver.bsc"
+				OutputFile="vc_x64_mswud\ipc_vc9_baseipcserver.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\baseipcserver"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\baseipcserver"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\baseipcserver\"
-				ProgramDataBaseFileName="vc_mswu_x64\baseipcserver.pdb"
+				ObjectFile="vc_x64_mswu\baseipcserver\"
+				ProgramDataBaseFileName="vc_x64_mswu\baseipcserver.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u_net.lib  wxbase31u.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\baseipcserver.exe"
+				OutputFile="vc_x64_mswu\baseipcserver.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\baseipcserver.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\baseipcserver.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\ipc_vc9_baseipcserver.bsc"
+				OutputFile="vc_x64_mswu\ipc_vc9_baseipcserver.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\baseipcserver"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\baseipcserver"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\baseipcserver\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\baseipcserver.pdb"
+				ObjectFile="vc_x64_mswuddll\baseipcserver\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\baseipcserver.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud_net.lib  wxbase31ud.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\baseipcserver.exe"
+				OutputFile="vc_x64_mswuddll\baseipcserver.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\baseipcserver.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\baseipcserver.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\ipc_vc9_baseipcserver.bsc"
+				OutputFile="vc_x64_mswuddll\ipc_vc9_baseipcserver.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\baseipcserver"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\baseipcserver"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\baseipcserver\"
-				ProgramDataBaseFileName="vc_mswudll_x64\baseipcserver.pdb"
+				ObjectFile="vc_x64_mswudll\baseipcserver\"
+				ProgramDataBaseFileName="vc_x64_mswudll\baseipcserver.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u_net.lib  wxbase31u.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\baseipcserver.exe"
+				OutputFile="vc_x64_mswudll\baseipcserver.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\baseipcserver.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\baseipcserver.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\ipc_vc9_baseipcserver.bsc"
+				OutputFile="vc_x64_mswudll\ipc_vc9_baseipcserver.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/ipc/ipc_vc9_ipcclient.vcproj b/samples/ipc/ipc_vc9_ipcclient.vcproj
index 8fa97912e9..bb1cfce35c 100644
--- a/samples/ipc/ipc_vc9_ipcclient.vcproj
+++ b/samples/ipc/ipc_vc9_ipcclient.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\ipcclient"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\ipcclient"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\ipcclient\"
-				ProgramDataBaseFileName="vc_mswud_x64\ipcclient.pdb"
+				ObjectFile="vc_x64_mswud\ipcclient\"
+				ProgramDataBaseFileName="vc_x64_mswud\ipcclient.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\ipcclient.exe"
+				OutputFile="vc_x64_mswud\ipcclient.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\ipcclient.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\ipcclient.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\ipc_vc9_ipcclient.bsc"
+				OutputFile="vc_x64_mswud\ipc_vc9_ipcclient.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\ipcclient"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\ipcclient"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\ipcclient\"
-				ProgramDataBaseFileName="vc_mswu_x64\ipcclient.pdb"
+				ObjectFile="vc_x64_mswu\ipcclient\"
+				ProgramDataBaseFileName="vc_x64_mswu\ipcclient.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\ipcclient.exe"
+				OutputFile="vc_x64_mswu\ipcclient.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\ipcclient.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\ipcclient.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\ipc_vc9_ipcclient.bsc"
+				OutputFile="vc_x64_mswu\ipc_vc9_ipcclient.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\ipcclient"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\ipcclient"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\ipcclient\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\ipcclient.pdb"
+				ObjectFile="vc_x64_mswuddll\ipcclient\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\ipcclient.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\ipcclient.exe"
+				OutputFile="vc_x64_mswuddll\ipcclient.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\ipcclient.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\ipcclient.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\ipc_vc9_ipcclient.bsc"
+				OutputFile="vc_x64_mswuddll\ipc_vc9_ipcclient.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\ipcclient"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\ipcclient"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\ipcclient\"
-				ProgramDataBaseFileName="vc_mswudll_x64\ipcclient.pdb"
+				ObjectFile="vc_x64_mswudll\ipcclient\"
+				ProgramDataBaseFileName="vc_x64_mswudll\ipcclient.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\ipcclient.exe"
+				OutputFile="vc_x64_mswudll\ipcclient.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\ipcclient.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\ipcclient.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\ipc_vc9_ipcclient.bsc"
+				OutputFile="vc_x64_mswudll\ipc_vc9_ipcclient.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/ipc/ipc_vc9_ipcserver.vcproj b/samples/ipc/ipc_vc9_ipcserver.vcproj
index 086d386b96..8ded06eb55 100644
--- a/samples/ipc/ipc_vc9_ipcserver.vcproj
+++ b/samples/ipc/ipc_vc9_ipcserver.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\ipcserver"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\ipcserver"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\ipcserver\"
-				ProgramDataBaseFileName="vc_mswud_x64\ipcserver.pdb"
+				ObjectFile="vc_x64_mswud\ipcserver\"
+				ProgramDataBaseFileName="vc_x64_mswud\ipcserver.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\ipcserver.exe"
+				OutputFile="vc_x64_mswud\ipcserver.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\ipcserver.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\ipcserver.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\ipc_vc9_ipcserver.bsc"
+				OutputFile="vc_x64_mswud\ipc_vc9_ipcserver.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\ipcserver"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\ipcserver"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\ipcserver\"
-				ProgramDataBaseFileName="vc_mswu_x64\ipcserver.pdb"
+				ObjectFile="vc_x64_mswu\ipcserver\"
+				ProgramDataBaseFileName="vc_x64_mswu\ipcserver.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\ipcserver.exe"
+				OutputFile="vc_x64_mswu\ipcserver.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\ipcserver.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\ipcserver.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\ipc_vc9_ipcserver.bsc"
+				OutputFile="vc_x64_mswu\ipc_vc9_ipcserver.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\ipcserver"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\ipcserver"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\ipcserver\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\ipcserver.pdb"
+				ObjectFile="vc_x64_mswuddll\ipcserver\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\ipcserver.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\ipcserver.exe"
+				OutputFile="vc_x64_mswuddll\ipcserver.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\ipcserver.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\ipcserver.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\ipc_vc9_ipcserver.bsc"
+				OutputFile="vc_x64_mswuddll\ipc_vc9_ipcserver.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\ipcserver"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\ipcserver"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\ipcserver\"
-				ProgramDataBaseFileName="vc_mswudll_x64\ipcserver.pdb"
+				ObjectFile="vc_x64_mswudll\ipcserver\"
+				ProgramDataBaseFileName="vc_x64_mswudll\ipcserver.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\ipcserver.exe"
+				OutputFile="vc_x64_mswudll\ipcserver.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\ipcserver.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\ipcserver.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\ipc_vc9_ipcserver.bsc"
+				OutputFile="vc_x64_mswudll\ipc_vc9_ipcserver.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/ipc/makefile.vc b/samples/ipc/makefile.vc
index eff624a4db..88a1f28398 100644
--- a/samples/ipc/makefile.vc
+++ b/samples/ipc/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/joytest/joytest_vc8.vcproj b/samples/joytest/joytest_vc8.vcproj
index a026dc0e9c..78319be478 100644
--- a/samples/joytest/joytest_vc8.vcproj
+++ b/samples/joytest/joytest_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\joytest"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\joytest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\joytest\"
-				ProgramDataBaseFileName="vc_mswud_x64\joytest.pdb"
+				ObjectFile="vc_x64_mswud\joytest\"
+				ProgramDataBaseFileName="vc_x64_mswud\joytest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\joytest.exe"
+				OutputFile="vc_x64_mswud\joytest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\joytest.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\joytest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\joytest_vc8.bsc"
+				OutputFile="vc_x64_mswud\joytest_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\joytest"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\joytest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\joytest\"
-				ProgramDataBaseFileName="vc_mswu_x64\joytest.pdb"
+				ObjectFile="vc_x64_mswu\joytest\"
+				ProgramDataBaseFileName="vc_x64_mswu\joytest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\joytest.exe"
+				OutputFile="vc_x64_mswu\joytest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\joytest.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\joytest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\joytest_vc8.bsc"
+				OutputFile="vc_x64_mswu\joytest_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\joytest"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\joytest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\joytest\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\joytest.pdb"
+				ObjectFile="vc_x64_mswuddll\joytest\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\joytest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\joytest.exe"
+				OutputFile="vc_x64_mswuddll\joytest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\joytest.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\joytest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\joytest_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\joytest_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\joytest"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\joytest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\joytest\"
-				ProgramDataBaseFileName="vc_mswudll_x64\joytest.pdb"
+				ObjectFile="vc_x64_mswudll\joytest\"
+				ProgramDataBaseFileName="vc_x64_mswudll\joytest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\joytest.exe"
+				OutputFile="vc_x64_mswudll\joytest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\joytest.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\joytest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\joytest_vc8.bsc"
+				OutputFile="vc_x64_mswudll\joytest_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/joytest/joytest_vc9.vcproj b/samples/joytest/joytest_vc9.vcproj
index 676e2d3bd2..2cbc0327f7 100644
--- a/samples/joytest/joytest_vc9.vcproj
+++ b/samples/joytest/joytest_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\joytest"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\joytest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\joytest\"
-				ProgramDataBaseFileName="vc_mswud_x64\joytest.pdb"
+				ObjectFile="vc_x64_mswud\joytest\"
+				ProgramDataBaseFileName="vc_x64_mswud\joytest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\joytest.exe"
+				OutputFile="vc_x64_mswud\joytest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\joytest.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\joytest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\joytest_vc9.bsc"
+				OutputFile="vc_x64_mswud\joytest_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\joytest"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\joytest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\joytest\"
-				ProgramDataBaseFileName="vc_mswu_x64\joytest.pdb"
+				ObjectFile="vc_x64_mswu\joytest\"
+				ProgramDataBaseFileName="vc_x64_mswu\joytest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\joytest.exe"
+				OutputFile="vc_x64_mswu\joytest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\joytest.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\joytest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\joytest_vc9.bsc"
+				OutputFile="vc_x64_mswu\joytest_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\joytest"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\joytest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\joytest\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\joytest.pdb"
+				ObjectFile="vc_x64_mswuddll\joytest\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\joytest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\joytest.exe"
+				OutputFile="vc_x64_mswuddll\joytest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\joytest.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\joytest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\joytest_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\joytest_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\joytest"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\joytest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\joytest\"
-				ProgramDataBaseFileName="vc_mswudll_x64\joytest.pdb"
+				ObjectFile="vc_x64_mswudll\joytest\"
+				ProgramDataBaseFileName="vc_x64_mswudll\joytest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\joytest.exe"
+				OutputFile="vc_x64_mswudll\joytest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\joytest.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\joytest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\joytest_vc9.bsc"
+				OutputFile="vc_x64_mswudll\joytest_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/joytest/makefile.vc b/samples/joytest/makefile.vc
index 395970bc4d..352564c498 100644
--- a/samples/joytest/makefile.vc
+++ b/samples/joytest/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/keyboard/keyboard_vc8.vcproj b/samples/keyboard/keyboard_vc8.vcproj
index acc220e9eb..146862f6e9 100644
--- a/samples/keyboard/keyboard_vc8.vcproj
+++ b/samples/keyboard/keyboard_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\keyboard"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\keyboard"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\keyboard\"
-				ProgramDataBaseFileName="vc_mswud_x64\keyboard.pdb"
+				ObjectFile="vc_x64_mswud\keyboard\"
+				ProgramDataBaseFileName="vc_x64_mswud\keyboard.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\keyboard.exe"
+				OutputFile="vc_x64_mswud\keyboard.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\keyboard.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\keyboard.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\keyboard_vc8.bsc"
+				OutputFile="vc_x64_mswud\keyboard_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\keyboard"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\keyboard"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\keyboard\"
-				ProgramDataBaseFileName="vc_mswu_x64\keyboard.pdb"
+				ObjectFile="vc_x64_mswu\keyboard\"
+				ProgramDataBaseFileName="vc_x64_mswu\keyboard.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\keyboard.exe"
+				OutputFile="vc_x64_mswu\keyboard.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\keyboard.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\keyboard.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\keyboard_vc8.bsc"
+				OutputFile="vc_x64_mswu\keyboard_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\keyboard"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\keyboard"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\keyboard\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\keyboard.pdb"
+				ObjectFile="vc_x64_mswuddll\keyboard\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\keyboard.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\keyboard.exe"
+				OutputFile="vc_x64_mswuddll\keyboard.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\keyboard.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\keyboard.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\keyboard_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\keyboard_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\keyboard"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\keyboard"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\keyboard\"
-				ProgramDataBaseFileName="vc_mswudll_x64\keyboard.pdb"
+				ObjectFile="vc_x64_mswudll\keyboard\"
+				ProgramDataBaseFileName="vc_x64_mswudll\keyboard.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\keyboard.exe"
+				OutputFile="vc_x64_mswudll\keyboard.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\keyboard.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\keyboard.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\keyboard_vc8.bsc"
+				OutputFile="vc_x64_mswudll\keyboard_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/keyboard/keyboard_vc9.vcproj b/samples/keyboard/keyboard_vc9.vcproj
index 835c40255a..ab097d4b54 100644
--- a/samples/keyboard/keyboard_vc9.vcproj
+++ b/samples/keyboard/keyboard_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\keyboard"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\keyboard"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\keyboard\"
-				ProgramDataBaseFileName="vc_mswud_x64\keyboard.pdb"
+				ObjectFile="vc_x64_mswud\keyboard\"
+				ProgramDataBaseFileName="vc_x64_mswud\keyboard.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\keyboard.exe"
+				OutputFile="vc_x64_mswud\keyboard.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\keyboard.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\keyboard.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\keyboard_vc9.bsc"
+				OutputFile="vc_x64_mswud\keyboard_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\keyboard"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\keyboard"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\keyboard\"
-				ProgramDataBaseFileName="vc_mswu_x64\keyboard.pdb"
+				ObjectFile="vc_x64_mswu\keyboard\"
+				ProgramDataBaseFileName="vc_x64_mswu\keyboard.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\keyboard.exe"
+				OutputFile="vc_x64_mswu\keyboard.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\keyboard.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\keyboard.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\keyboard_vc9.bsc"
+				OutputFile="vc_x64_mswu\keyboard_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\keyboard"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\keyboard"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\keyboard\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\keyboard.pdb"
+				ObjectFile="vc_x64_mswuddll\keyboard\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\keyboard.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\keyboard.exe"
+				OutputFile="vc_x64_mswuddll\keyboard.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\keyboard.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\keyboard.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\keyboard_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\keyboard_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\keyboard"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\keyboard"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\keyboard\"
-				ProgramDataBaseFileName="vc_mswudll_x64\keyboard.pdb"
+				ObjectFile="vc_x64_mswudll\keyboard\"
+				ProgramDataBaseFileName="vc_x64_mswudll\keyboard.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\keyboard.exe"
+				OutputFile="vc_x64_mswudll\keyboard.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\keyboard.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\keyboard.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\keyboard_vc9.bsc"
+				OutputFile="vc_x64_mswudll\keyboard_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/keyboard/makefile.vc b/samples/keyboard/makefile.vc
index 86d9b140d0..57759efd23 100644
--- a/samples/keyboard/makefile.vc
+++ b/samples/keyboard/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/layout/layout_vc8.vcproj b/samples/layout/layout_vc8.vcproj
index b89a1908c8..bf79d1904c 100644
--- a/samples/layout/layout_vc8.vcproj
+++ b/samples/layout/layout_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\layout"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\layout"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\layout\"
-				ProgramDataBaseFileName="vc_mswud_x64\layout.pdb"
+				ObjectFile="vc_x64_mswud\layout\"
+				ProgramDataBaseFileName="vc_x64_mswud\layout.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\layout.exe"
+				OutputFile="vc_x64_mswud\layout.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\layout.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\layout.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\layout_vc8.bsc"
+				OutputFile="vc_x64_mswud\layout_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\layout"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\layout"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\layout\"
-				ProgramDataBaseFileName="vc_mswu_x64\layout.pdb"
+				ObjectFile="vc_x64_mswu\layout\"
+				ProgramDataBaseFileName="vc_x64_mswu\layout.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\layout.exe"
+				OutputFile="vc_x64_mswu\layout.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\layout.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\layout.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\layout_vc8.bsc"
+				OutputFile="vc_x64_mswu\layout_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\layout"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\layout"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\layout\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\layout.pdb"
+				ObjectFile="vc_x64_mswuddll\layout\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\layout.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\layout.exe"
+				OutputFile="vc_x64_mswuddll\layout.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\layout.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\layout.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\layout_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\layout_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\layout"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\layout"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\layout\"
-				ProgramDataBaseFileName="vc_mswudll_x64\layout.pdb"
+				ObjectFile="vc_x64_mswudll\layout\"
+				ProgramDataBaseFileName="vc_x64_mswudll\layout.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\layout.exe"
+				OutputFile="vc_x64_mswudll\layout.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\layout.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\layout.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\layout_vc8.bsc"
+				OutputFile="vc_x64_mswudll\layout_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/layout/layout_vc9.vcproj b/samples/layout/layout_vc9.vcproj
index f51334a3df..9d2763b5e5 100644
--- a/samples/layout/layout_vc9.vcproj
+++ b/samples/layout/layout_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\layout"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\layout"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\layout\"
-				ProgramDataBaseFileName="vc_mswud_x64\layout.pdb"
+				ObjectFile="vc_x64_mswud\layout\"
+				ProgramDataBaseFileName="vc_x64_mswud\layout.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\layout.exe"
+				OutputFile="vc_x64_mswud\layout.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\layout.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\layout.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\layout_vc9.bsc"
+				OutputFile="vc_x64_mswud\layout_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\layout"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\layout"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\layout\"
-				ProgramDataBaseFileName="vc_mswu_x64\layout.pdb"
+				ObjectFile="vc_x64_mswu\layout\"
+				ProgramDataBaseFileName="vc_x64_mswu\layout.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\layout.exe"
+				OutputFile="vc_x64_mswu\layout.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\layout.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\layout.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\layout_vc9.bsc"
+				OutputFile="vc_x64_mswu\layout_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\layout"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\layout"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\layout\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\layout.pdb"
+				ObjectFile="vc_x64_mswuddll\layout\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\layout.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\layout.exe"
+				OutputFile="vc_x64_mswuddll\layout.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\layout.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\layout.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\layout_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\layout_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\layout"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\layout"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\layout\"
-				ProgramDataBaseFileName="vc_mswudll_x64\layout.pdb"
+				ObjectFile="vc_x64_mswudll\layout\"
+				ProgramDataBaseFileName="vc_x64_mswudll\layout.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\layout.exe"
+				OutputFile="vc_x64_mswudll\layout.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\layout.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\layout.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\layout_vc9.bsc"
+				OutputFile="vc_x64_mswudll\layout_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/layout/makefile.vc b/samples/layout/makefile.vc
index 3c08dbba95..070cb28052 100644
--- a/samples/layout/makefile.vc
+++ b/samples/layout/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/listctrl/listctrl_vc8.vcproj b/samples/listctrl/listctrl_vc8.vcproj
index e80421e1df..ca56967767 100644
--- a/samples/listctrl/listctrl_vc8.vcproj
+++ b/samples/listctrl/listctrl_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\listctrl"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\listctrl"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\listctrl\"
-				ProgramDataBaseFileName="vc_mswud_x64\listctrl.pdb"
+				ObjectFile="vc_x64_mswud\listctrl\"
+				ProgramDataBaseFileName="vc_x64_mswud\listctrl.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\listctrl.exe"
+				OutputFile="vc_x64_mswud\listctrl.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\listctrl.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\listctrl.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\listctrl_vc8.bsc"
+				OutputFile="vc_x64_mswud\listctrl_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\listctrl"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\listctrl"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\listctrl\"
-				ProgramDataBaseFileName="vc_mswu_x64\listctrl.pdb"
+				ObjectFile="vc_x64_mswu\listctrl\"
+				ProgramDataBaseFileName="vc_x64_mswu\listctrl.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\listctrl.exe"
+				OutputFile="vc_x64_mswu\listctrl.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\listctrl.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\listctrl.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\listctrl_vc8.bsc"
+				OutputFile="vc_x64_mswu\listctrl_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\listctrl"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\listctrl"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\listctrl\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\listctrl.pdb"
+				ObjectFile="vc_x64_mswuddll\listctrl\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\listctrl.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\listctrl.exe"
+				OutputFile="vc_x64_mswuddll\listctrl.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\listctrl.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\listctrl.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\listctrl_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\listctrl_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\listctrl"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\listctrl"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\listctrl\"
-				ProgramDataBaseFileName="vc_mswudll_x64\listctrl.pdb"
+				ObjectFile="vc_x64_mswudll\listctrl\"
+				ProgramDataBaseFileName="vc_x64_mswudll\listctrl.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\listctrl.exe"
+				OutputFile="vc_x64_mswudll\listctrl.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\listctrl.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\listctrl.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\listctrl_vc8.bsc"
+				OutputFile="vc_x64_mswudll\listctrl_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/listctrl/listctrl_vc9.vcproj b/samples/listctrl/listctrl_vc9.vcproj
index e5080a049c..5d8178b96f 100644
--- a/samples/listctrl/listctrl_vc9.vcproj
+++ b/samples/listctrl/listctrl_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\listctrl"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\listctrl"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\listctrl\"
-				ProgramDataBaseFileName="vc_mswud_x64\listctrl.pdb"
+				ObjectFile="vc_x64_mswud\listctrl\"
+				ProgramDataBaseFileName="vc_x64_mswud\listctrl.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\listctrl.exe"
+				OutputFile="vc_x64_mswud\listctrl.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\listctrl.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\listctrl.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\listctrl_vc9.bsc"
+				OutputFile="vc_x64_mswud\listctrl_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\listctrl"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\listctrl"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\listctrl\"
-				ProgramDataBaseFileName="vc_mswu_x64\listctrl.pdb"
+				ObjectFile="vc_x64_mswu\listctrl\"
+				ProgramDataBaseFileName="vc_x64_mswu\listctrl.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\listctrl.exe"
+				OutputFile="vc_x64_mswu\listctrl.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\listctrl.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\listctrl.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\listctrl_vc9.bsc"
+				OutputFile="vc_x64_mswu\listctrl_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\listctrl"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\listctrl"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\listctrl\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\listctrl.pdb"
+				ObjectFile="vc_x64_mswuddll\listctrl\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\listctrl.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\listctrl.exe"
+				OutputFile="vc_x64_mswuddll\listctrl.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\listctrl.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\listctrl.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\listctrl_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\listctrl_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\listctrl"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\listctrl"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\listctrl\"
-				ProgramDataBaseFileName="vc_mswudll_x64\listctrl.pdb"
+				ObjectFile="vc_x64_mswudll\listctrl\"
+				ProgramDataBaseFileName="vc_x64_mswudll\listctrl.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\listctrl.exe"
+				OutputFile="vc_x64_mswudll\listctrl.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\listctrl.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\listctrl.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\listctrl_vc9.bsc"
+				OutputFile="vc_x64_mswudll\listctrl_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/listctrl/makefile.vc b/samples/listctrl/makefile.vc
index 98d55771f9..4c3e51d0f2 100644
--- a/samples/listctrl/makefile.vc
+++ b/samples/listctrl/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/mdi/makefile.vc b/samples/mdi/makefile.vc
index 42d7ea9c4e..2097f09ed4 100644
--- a/samples/mdi/makefile.vc
+++ b/samples/mdi/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/mdi/mdi_vc8.vcproj b/samples/mdi/mdi_vc8.vcproj
index 1a9ce9b0b8..58a00c36ae 100644
--- a/samples/mdi/mdi_vc8.vcproj
+++ b/samples/mdi/mdi_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\mdi"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\mdi"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\mdi\"
-				ProgramDataBaseFileName="vc_mswud_x64\mdi.pdb"
+				ObjectFile="vc_x64_mswud\mdi\"
+				ProgramDataBaseFileName="vc_x64_mswud\mdi.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\mdi.exe"
+				OutputFile="vc_x64_mswud\mdi.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\mdi.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\mdi.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\mdi_vc8.bsc"
+				OutputFile="vc_x64_mswud\mdi_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\mdi"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\mdi"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\mdi\"
-				ProgramDataBaseFileName="vc_mswu_x64\mdi.pdb"
+				ObjectFile="vc_x64_mswu\mdi\"
+				ProgramDataBaseFileName="vc_x64_mswu\mdi.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\mdi.exe"
+				OutputFile="vc_x64_mswu\mdi.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\mdi.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\mdi.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\mdi_vc8.bsc"
+				OutputFile="vc_x64_mswu\mdi_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\mdi"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\mdi"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\mdi\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\mdi.pdb"
+				ObjectFile="vc_x64_mswuddll\mdi\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\mdi.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\mdi.exe"
+				OutputFile="vc_x64_mswuddll\mdi.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\mdi.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\mdi.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\mdi_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\mdi_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\mdi"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\mdi"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\mdi\"
-				ProgramDataBaseFileName="vc_mswudll_x64\mdi.pdb"
+				ObjectFile="vc_x64_mswudll\mdi\"
+				ProgramDataBaseFileName="vc_x64_mswudll\mdi.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\mdi.exe"
+				OutputFile="vc_x64_mswudll\mdi.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\mdi.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\mdi.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\mdi_vc8.bsc"
+				OutputFile="vc_x64_mswudll\mdi_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/mdi/mdi_vc9.vcproj b/samples/mdi/mdi_vc9.vcproj
index cb0228239d..5e0158a331 100644
--- a/samples/mdi/mdi_vc9.vcproj
+++ b/samples/mdi/mdi_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\mdi"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\mdi"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\mdi\"
-				ProgramDataBaseFileName="vc_mswud_x64\mdi.pdb"
+				ObjectFile="vc_x64_mswud\mdi\"
+				ProgramDataBaseFileName="vc_x64_mswud\mdi.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\mdi.exe"
+				OutputFile="vc_x64_mswud\mdi.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\mdi.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\mdi.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\mdi_vc9.bsc"
+				OutputFile="vc_x64_mswud\mdi_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\mdi"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\mdi"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\mdi\"
-				ProgramDataBaseFileName="vc_mswu_x64\mdi.pdb"
+				ObjectFile="vc_x64_mswu\mdi\"
+				ProgramDataBaseFileName="vc_x64_mswu\mdi.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\mdi.exe"
+				OutputFile="vc_x64_mswu\mdi.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\mdi.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\mdi.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\mdi_vc9.bsc"
+				OutputFile="vc_x64_mswu\mdi_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\mdi"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\mdi"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\mdi\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\mdi.pdb"
+				ObjectFile="vc_x64_mswuddll\mdi\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\mdi.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\mdi.exe"
+				OutputFile="vc_x64_mswuddll\mdi.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\mdi.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\mdi.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\mdi_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\mdi_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\mdi"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\mdi"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\mdi\"
-				ProgramDataBaseFileName="vc_mswudll_x64\mdi.pdb"
+				ObjectFile="vc_x64_mswudll\mdi\"
+				ProgramDataBaseFileName="vc_x64_mswudll\mdi.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\mdi.exe"
+				OutputFile="vc_x64_mswudll\mdi.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\mdi.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\mdi.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\mdi_vc9.bsc"
+				OutputFile="vc_x64_mswudll\mdi_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/mediaplayer/makefile.vc b/samples/mediaplayer/makefile.vc
index 6160426fab..797ce718f0 100644
--- a/samples/mediaplayer/makefile.vc
+++ b/samples/mediaplayer/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/mediaplayer/mediaplayer_vc8.vcproj b/samples/mediaplayer/mediaplayer_vc8.vcproj
index b0993a35d0..8e235e89b2 100644
--- a/samples/mediaplayer/mediaplayer_vc8.vcproj
+++ b/samples/mediaplayer/mediaplayer_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\mediaplayer"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\mediaplayer"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\mediaplayer\"
-				ProgramDataBaseFileName="vc_mswud_x64\mediaplayer.pdb"
+				ObjectFile="vc_x64_mswud\mediaplayer\"
+				ProgramDataBaseFileName="vc_x64_mswud\mediaplayer.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_media.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\mediaplayer.exe"
+				OutputFile="vc_x64_mswud\mediaplayer.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\mediaplayer.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\mediaplayer.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\mediaplayer_vc8.bsc"
+				OutputFile="vc_x64_mswud\mediaplayer_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\mediaplayer"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\mediaplayer"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\mediaplayer\"
-				ProgramDataBaseFileName="vc_mswu_x64\mediaplayer.pdb"
+				ObjectFile="vc_x64_mswu\mediaplayer\"
+				ProgramDataBaseFileName="vc_x64_mswu\mediaplayer.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_media.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\mediaplayer.exe"
+				OutputFile="vc_x64_mswu\mediaplayer.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\mediaplayer.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\mediaplayer.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\mediaplayer_vc8.bsc"
+				OutputFile="vc_x64_mswu\mediaplayer_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\mediaplayer"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\mediaplayer"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\mediaplayer\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\mediaplayer.pdb"
+				ObjectFile="vc_x64_mswuddll\mediaplayer\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\mediaplayer.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_media.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\mediaplayer.exe"
+				OutputFile="vc_x64_mswuddll\mediaplayer.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\mediaplayer.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\mediaplayer.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\mediaplayer_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\mediaplayer_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\mediaplayer"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\mediaplayer"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\mediaplayer\"
-				ProgramDataBaseFileName="vc_mswudll_x64\mediaplayer.pdb"
+				ObjectFile="vc_x64_mswudll\mediaplayer\"
+				ProgramDataBaseFileName="vc_x64_mswudll\mediaplayer.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_media.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\mediaplayer.exe"
+				OutputFile="vc_x64_mswudll\mediaplayer.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\mediaplayer.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\mediaplayer.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\mediaplayer_vc8.bsc"
+				OutputFile="vc_x64_mswudll\mediaplayer_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/mediaplayer/mediaplayer_vc9.vcproj b/samples/mediaplayer/mediaplayer_vc9.vcproj
index 238ffecad0..9caf74e25f 100644
--- a/samples/mediaplayer/mediaplayer_vc9.vcproj
+++ b/samples/mediaplayer/mediaplayer_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\mediaplayer"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\mediaplayer"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\mediaplayer\"
-				ProgramDataBaseFileName="vc_mswud_x64\mediaplayer.pdb"
+				ObjectFile="vc_x64_mswud\mediaplayer\"
+				ProgramDataBaseFileName="vc_x64_mswud\mediaplayer.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_media.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\mediaplayer.exe"
+				OutputFile="vc_x64_mswud\mediaplayer.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\mediaplayer.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\mediaplayer.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\mediaplayer_vc9.bsc"
+				OutputFile="vc_x64_mswud\mediaplayer_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\mediaplayer"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\mediaplayer"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\mediaplayer\"
-				ProgramDataBaseFileName="vc_mswu_x64\mediaplayer.pdb"
+				ObjectFile="vc_x64_mswu\mediaplayer\"
+				ProgramDataBaseFileName="vc_x64_mswu\mediaplayer.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_media.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\mediaplayer.exe"
+				OutputFile="vc_x64_mswu\mediaplayer.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\mediaplayer.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\mediaplayer.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\mediaplayer_vc9.bsc"
+				OutputFile="vc_x64_mswu\mediaplayer_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\mediaplayer"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\mediaplayer"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\mediaplayer\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\mediaplayer.pdb"
+				ObjectFile="vc_x64_mswuddll\mediaplayer\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\mediaplayer.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_media.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\mediaplayer.exe"
+				OutputFile="vc_x64_mswuddll\mediaplayer.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\mediaplayer.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\mediaplayer.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\mediaplayer_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\mediaplayer_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\mediaplayer"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\mediaplayer"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\mediaplayer\"
-				ProgramDataBaseFileName="vc_mswudll_x64\mediaplayer.pdb"
+				ObjectFile="vc_x64_mswudll\mediaplayer\"
+				ProgramDataBaseFileName="vc_x64_mswudll\mediaplayer.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_media.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\mediaplayer.exe"
+				OutputFile="vc_x64_mswudll\mediaplayer.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\mediaplayer.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\mediaplayer.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\mediaplayer_vc9.bsc"
+				OutputFile="vc_x64_mswudll\mediaplayer_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/memcheck/makefile.vc b/samples/memcheck/makefile.vc
index 6a808d73a0..e0fd198506 100644
--- a/samples/memcheck/makefile.vc
+++ b/samples/memcheck/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/memcheck/memcheck_vc8.vcproj b/samples/memcheck/memcheck_vc8.vcproj
index 7eb789190e..7de6f8976b 100644
--- a/samples/memcheck/memcheck_vc8.vcproj
+++ b/samples/memcheck/memcheck_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\memcheck"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\memcheck"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\memcheck\"
-				ProgramDataBaseFileName="vc_mswud_x64\memcheck.pdb"
+				ObjectFile="vc_x64_mswud\memcheck\"
+				ProgramDataBaseFileName="vc_x64_mswud\memcheck.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\memcheck.exe"
+				OutputFile="vc_x64_mswud\memcheck.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\memcheck.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\memcheck.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\memcheck_vc8.bsc"
+				OutputFile="vc_x64_mswud\memcheck_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\memcheck"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\memcheck"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\memcheck\"
-				ProgramDataBaseFileName="vc_mswu_x64\memcheck.pdb"
+				ObjectFile="vc_x64_mswu\memcheck\"
+				ProgramDataBaseFileName="vc_x64_mswu\memcheck.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\memcheck.exe"
+				OutputFile="vc_x64_mswu\memcheck.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\memcheck.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\memcheck.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\memcheck_vc8.bsc"
+				OutputFile="vc_x64_mswu\memcheck_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\memcheck"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\memcheck"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\memcheck\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\memcheck.pdb"
+				ObjectFile="vc_x64_mswuddll\memcheck\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\memcheck.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\memcheck.exe"
+				OutputFile="vc_x64_mswuddll\memcheck.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\memcheck.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\memcheck.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\memcheck_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\memcheck_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\memcheck"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\memcheck"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\memcheck\"
-				ProgramDataBaseFileName="vc_mswudll_x64\memcheck.pdb"
+				ObjectFile="vc_x64_mswudll\memcheck\"
+				ProgramDataBaseFileName="vc_x64_mswudll\memcheck.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\memcheck.exe"
+				OutputFile="vc_x64_mswudll\memcheck.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\memcheck.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\memcheck.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\memcheck_vc8.bsc"
+				OutputFile="vc_x64_mswudll\memcheck_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/memcheck/memcheck_vc9.vcproj b/samples/memcheck/memcheck_vc9.vcproj
index 9697f7b49f..630579a4c3 100644
--- a/samples/memcheck/memcheck_vc9.vcproj
+++ b/samples/memcheck/memcheck_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\memcheck"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\memcheck"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\memcheck\"
-				ProgramDataBaseFileName="vc_mswud_x64\memcheck.pdb"
+				ObjectFile="vc_x64_mswud\memcheck\"
+				ProgramDataBaseFileName="vc_x64_mswud\memcheck.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\memcheck.exe"
+				OutputFile="vc_x64_mswud\memcheck.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\memcheck.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\memcheck.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\memcheck_vc9.bsc"
+				OutputFile="vc_x64_mswud\memcheck_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\memcheck"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\memcheck"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\memcheck\"
-				ProgramDataBaseFileName="vc_mswu_x64\memcheck.pdb"
+				ObjectFile="vc_x64_mswu\memcheck\"
+				ProgramDataBaseFileName="vc_x64_mswu\memcheck.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\memcheck.exe"
+				OutputFile="vc_x64_mswu\memcheck.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\memcheck.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\memcheck.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\memcheck_vc9.bsc"
+				OutputFile="vc_x64_mswu\memcheck_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\memcheck"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\memcheck"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\memcheck\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\memcheck.pdb"
+				ObjectFile="vc_x64_mswuddll\memcheck\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\memcheck.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\memcheck.exe"
+				OutputFile="vc_x64_mswuddll\memcheck.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\memcheck.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\memcheck.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\memcheck_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\memcheck_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\memcheck"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\memcheck"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\memcheck\"
-				ProgramDataBaseFileName="vc_mswudll_x64\memcheck.pdb"
+				ObjectFile="vc_x64_mswudll\memcheck\"
+				ProgramDataBaseFileName="vc_x64_mswudll\memcheck.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\memcheck.exe"
+				OutputFile="vc_x64_mswudll\memcheck.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\memcheck.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\memcheck.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\memcheck_vc9.bsc"
+				OutputFile="vc_x64_mswudll\memcheck_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/menu/makefile.vc b/samples/menu/makefile.vc
index 29d6c738e7..4230eedec9 100644
--- a/samples/menu/makefile.vc
+++ b/samples/menu/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/menu/menu_vc8.vcproj b/samples/menu/menu_vc8.vcproj
index 4b03225808..c5930a1835 100644
--- a/samples/menu/menu_vc8.vcproj
+++ b/samples/menu/menu_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\menu"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\menu"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\menu\"
-				ProgramDataBaseFileName="vc_mswud_x64\menu.pdb"
+				ObjectFile="vc_x64_mswud\menu\"
+				ProgramDataBaseFileName="vc_x64_mswud\menu.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\menu.exe"
+				OutputFile="vc_x64_mswud\menu.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\menu.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\menu.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\menu_vc8.bsc"
+				OutputFile="vc_x64_mswud\menu_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\menu"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\menu"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\menu\"
-				ProgramDataBaseFileName="vc_mswu_x64\menu.pdb"
+				ObjectFile="vc_x64_mswu\menu\"
+				ProgramDataBaseFileName="vc_x64_mswu\menu.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\menu.exe"
+				OutputFile="vc_x64_mswu\menu.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\menu.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\menu.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\menu_vc8.bsc"
+				OutputFile="vc_x64_mswu\menu_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\menu"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\menu"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\menu\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\menu.pdb"
+				ObjectFile="vc_x64_mswuddll\menu\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\menu.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\menu.exe"
+				OutputFile="vc_x64_mswuddll\menu.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\menu.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\menu.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\menu_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\menu_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\menu"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\menu"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\menu\"
-				ProgramDataBaseFileName="vc_mswudll_x64\menu.pdb"
+				ObjectFile="vc_x64_mswudll\menu\"
+				ProgramDataBaseFileName="vc_x64_mswudll\menu.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\menu.exe"
+				OutputFile="vc_x64_mswudll\menu.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\menu.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\menu.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\menu_vc8.bsc"
+				OutputFile="vc_x64_mswudll\menu_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/menu/menu_vc9.vcproj b/samples/menu/menu_vc9.vcproj
index 5a80346020..15d84a970e 100644
--- a/samples/menu/menu_vc9.vcproj
+++ b/samples/menu/menu_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\menu"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\menu"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\menu\"
-				ProgramDataBaseFileName="vc_mswud_x64\menu.pdb"
+				ObjectFile="vc_x64_mswud\menu\"
+				ProgramDataBaseFileName="vc_x64_mswud\menu.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\menu.exe"
+				OutputFile="vc_x64_mswud\menu.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\menu.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\menu.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\menu_vc9.bsc"
+				OutputFile="vc_x64_mswud\menu_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\menu"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\menu"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\menu\"
-				ProgramDataBaseFileName="vc_mswu_x64\menu.pdb"
+				ObjectFile="vc_x64_mswu\menu\"
+				ProgramDataBaseFileName="vc_x64_mswu\menu.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\menu.exe"
+				OutputFile="vc_x64_mswu\menu.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\menu.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\menu.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\menu_vc9.bsc"
+				OutputFile="vc_x64_mswu\menu_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\menu"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\menu"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\menu\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\menu.pdb"
+				ObjectFile="vc_x64_mswuddll\menu\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\menu.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\menu.exe"
+				OutputFile="vc_x64_mswuddll\menu.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\menu.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\menu.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\menu_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\menu_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\menu"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\menu"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\menu\"
-				ProgramDataBaseFileName="vc_mswudll_x64\menu.pdb"
+				ObjectFile="vc_x64_mswudll\menu\"
+				ProgramDataBaseFileName="vc_x64_mswudll\menu.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\menu.exe"
+				OutputFile="vc_x64_mswudll\menu.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\menu.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\menu.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\menu_vc9.bsc"
+				OutputFile="vc_x64_mswudll\menu_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/mfc/makefile.vc b/samples/mfc/makefile.vc
index 22a7829025..832d617e25 100644
--- a/samples/mfc/makefile.vc
+++ b/samples/mfc/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/mfc/mfc_vc8.vcproj b/samples/mfc/mfc_vc8.vcproj
index df5280416b..638fedd0e6 100644
--- a/samples/mfc/mfc_vc8.vcproj
+++ b/samples/mfc/mfc_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\mfctest"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\mfctest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\mfctest\"
-				ProgramDataBaseFileName="vc_mswud_x64\mfctest.pdb"
+				ObjectFile="vc_x64_mswud\mfctest\"
+				ProgramDataBaseFileName="vc_x64_mswud\mfctest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\mfctest.exe"
+				OutputFile="vc_x64_mswud\mfctest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\mfctest.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\mfctest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\mfc_vc8.bsc"
+				OutputFile="vc_x64_mswud\mfc_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\mfctest"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\mfctest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\mfctest\"
-				ProgramDataBaseFileName="vc_mswu_x64\mfctest.pdb"
+				ObjectFile="vc_x64_mswu\mfctest\"
+				ProgramDataBaseFileName="vc_x64_mswu\mfctest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\mfctest.exe"
+				OutputFile="vc_x64_mswu\mfctest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\mfctest.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\mfctest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\mfc_vc8.bsc"
+				OutputFile="vc_x64_mswu\mfc_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\mfctest"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\mfctest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\mfctest\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\mfctest.pdb"
+				ObjectFile="vc_x64_mswuddll\mfctest\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\mfctest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\mfctest.exe"
+				OutputFile="vc_x64_mswuddll\mfctest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\mfctest.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\mfctest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\mfc_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\mfc_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\mfctest"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\mfctest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\mfctest\"
-				ProgramDataBaseFileName="vc_mswudll_x64\mfctest.pdb"
+				ObjectFile="vc_x64_mswudll\mfctest\"
+				ProgramDataBaseFileName="vc_x64_mswudll\mfctest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\mfctest.exe"
+				OutputFile="vc_x64_mswudll\mfctest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\mfctest.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\mfctest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\mfc_vc8.bsc"
+				OutputFile="vc_x64_mswudll\mfc_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/mfc/mfc_vc9.vcproj b/samples/mfc/mfc_vc9.vcproj
index b88724d378..9dab001dd2 100644
--- a/samples/mfc/mfc_vc9.vcproj
+++ b/samples/mfc/mfc_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\mfctest"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\mfctest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\mfctest\"
-				ProgramDataBaseFileName="vc_mswud_x64\mfctest.pdb"
+				ObjectFile="vc_x64_mswud\mfctest\"
+				ProgramDataBaseFileName="vc_x64_mswud\mfctest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\mfctest.exe"
+				OutputFile="vc_x64_mswud\mfctest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\mfctest.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\mfctest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\mfc_vc9.bsc"
+				OutputFile="vc_x64_mswud\mfc_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\mfctest"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\mfctest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\mfctest\"
-				ProgramDataBaseFileName="vc_mswu_x64\mfctest.pdb"
+				ObjectFile="vc_x64_mswu\mfctest\"
+				ProgramDataBaseFileName="vc_x64_mswu\mfctest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\mfctest.exe"
+				OutputFile="vc_x64_mswu\mfctest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\mfctest.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\mfctest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\mfc_vc9.bsc"
+				OutputFile="vc_x64_mswu\mfc_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\mfctest"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\mfctest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\mfctest\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\mfctest.pdb"
+				ObjectFile="vc_x64_mswuddll\mfctest\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\mfctest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\mfctest.exe"
+				OutputFile="vc_x64_mswuddll\mfctest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\mfctest.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\mfctest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\mfc_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\mfc_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\mfctest"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\mfctest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\mfctest\"
-				ProgramDataBaseFileName="vc_mswudll_x64\mfctest.pdb"
+				ObjectFile="vc_x64_mswudll\mfctest\"
+				ProgramDataBaseFileName="vc_x64_mswudll\mfctest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\mfctest.exe"
+				OutputFile="vc_x64_mswudll\mfctest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\mfctest.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\mfctest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\mfc_vc9.bsc"
+				OutputFile="vc_x64_mswudll\mfc_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/minimal/makefile.vc b/samples/minimal/makefile.vc
index fe3067e50d..2e865a46b9 100644
--- a/samples/minimal/makefile.vc
+++ b/samples/minimal/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/minimal/minimal_vc8.vcproj b/samples/minimal/minimal_vc8.vcproj
index 772e0a203f..b3a5193a93 100644
--- a/samples/minimal/minimal_vc8.vcproj
+++ b/samples/minimal/minimal_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\minimal"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\minimal"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\minimal\"
-				ProgramDataBaseFileName="vc_mswud_x64\minimal.pdb"
+				ObjectFile="vc_x64_mswud\minimal\"
+				ProgramDataBaseFileName="vc_x64_mswud\minimal.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\minimal.exe"
+				OutputFile="vc_x64_mswud\minimal.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\minimal.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\minimal.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\minimal_vc8.bsc"
+				OutputFile="vc_x64_mswud\minimal_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\minimal"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\minimal"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\minimal\"
-				ProgramDataBaseFileName="vc_mswu_x64\minimal.pdb"
+				ObjectFile="vc_x64_mswu\minimal\"
+				ProgramDataBaseFileName="vc_x64_mswu\minimal.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\minimal.exe"
+				OutputFile="vc_x64_mswu\minimal.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\minimal.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\minimal.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\minimal_vc8.bsc"
+				OutputFile="vc_x64_mswu\minimal_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\minimal"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\minimal"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\minimal\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\minimal.pdb"
+				ObjectFile="vc_x64_mswuddll\minimal\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\minimal.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\minimal.exe"
+				OutputFile="vc_x64_mswuddll\minimal.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\minimal.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\minimal.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\minimal_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\minimal_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\minimal"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\minimal"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\minimal\"
-				ProgramDataBaseFileName="vc_mswudll_x64\minimal.pdb"
+				ObjectFile="vc_x64_mswudll\minimal\"
+				ProgramDataBaseFileName="vc_x64_mswudll\minimal.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\minimal.exe"
+				OutputFile="vc_x64_mswudll\minimal.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\minimal.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\minimal.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\minimal_vc8.bsc"
+				OutputFile="vc_x64_mswudll\minimal_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/minimal/minimal_vc9.vcproj b/samples/minimal/minimal_vc9.vcproj
index 13bff2be9b..4de2b98c7c 100644
--- a/samples/minimal/minimal_vc9.vcproj
+++ b/samples/minimal/minimal_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\minimal"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\minimal"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\minimal\"
-				ProgramDataBaseFileName="vc_mswud_x64\minimal.pdb"
+				ObjectFile="vc_x64_mswud\minimal\"
+				ProgramDataBaseFileName="vc_x64_mswud\minimal.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\minimal.exe"
+				OutputFile="vc_x64_mswud\minimal.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\minimal.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\minimal.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\minimal_vc9.bsc"
+				OutputFile="vc_x64_mswud\minimal_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\minimal"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\minimal"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\minimal\"
-				ProgramDataBaseFileName="vc_mswu_x64\minimal.pdb"
+				ObjectFile="vc_x64_mswu\minimal\"
+				ProgramDataBaseFileName="vc_x64_mswu\minimal.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\minimal.exe"
+				OutputFile="vc_x64_mswu\minimal.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\minimal.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\minimal.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\minimal_vc9.bsc"
+				OutputFile="vc_x64_mswu\minimal_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\minimal"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\minimal"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\minimal\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\minimal.pdb"
+				ObjectFile="vc_x64_mswuddll\minimal\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\minimal.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\minimal.exe"
+				OutputFile="vc_x64_mswuddll\minimal.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\minimal.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\minimal.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\minimal_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\minimal_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\minimal"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\minimal"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\minimal\"
-				ProgramDataBaseFileName="vc_mswudll_x64\minimal.pdb"
+				ObjectFile="vc_x64_mswudll\minimal\"
+				ProgramDataBaseFileName="vc_x64_mswudll\minimal.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\minimal.exe"
+				OutputFile="vc_x64_mswudll\minimal.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\minimal.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\minimal.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\minimal_vc9.bsc"
+				OutputFile="vc_x64_mswudll\minimal_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/nativdlg/makefile.vc b/samples/nativdlg/makefile.vc
index 035e62ff12..5ca8644ea9 100644
--- a/samples/nativdlg/makefile.vc
+++ b/samples/nativdlg/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/nativdlg/nativdlg_vc8.vcproj b/samples/nativdlg/nativdlg_vc8.vcproj
index 67ea6e242d..d12c2d1897 100644
--- a/samples/nativdlg/nativdlg_vc8.vcproj
+++ b/samples/nativdlg/nativdlg_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\nativdlg"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\nativdlg"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\nativdlg\"
-				ProgramDataBaseFileName="vc_mswud_x64\nativdlg.pdb"
+				ObjectFile="vc_x64_mswud\nativdlg\"
+				ProgramDataBaseFileName="vc_x64_mswud\nativdlg.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\nativdlg.exe"
+				OutputFile="vc_x64_mswud\nativdlg.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\nativdlg.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\nativdlg.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\nativdlg_vc8.bsc"
+				OutputFile="vc_x64_mswud\nativdlg_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\nativdlg"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\nativdlg"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\nativdlg\"
-				ProgramDataBaseFileName="vc_mswu_x64\nativdlg.pdb"
+				ObjectFile="vc_x64_mswu\nativdlg\"
+				ProgramDataBaseFileName="vc_x64_mswu\nativdlg.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\nativdlg.exe"
+				OutputFile="vc_x64_mswu\nativdlg.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\nativdlg.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\nativdlg.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\nativdlg_vc8.bsc"
+				OutputFile="vc_x64_mswu\nativdlg_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\nativdlg"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\nativdlg"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\nativdlg\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\nativdlg.pdb"
+				ObjectFile="vc_x64_mswuddll\nativdlg\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\nativdlg.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\nativdlg.exe"
+				OutputFile="vc_x64_mswuddll\nativdlg.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\nativdlg.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\nativdlg.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\nativdlg_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\nativdlg_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\nativdlg"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\nativdlg"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\nativdlg\"
-				ProgramDataBaseFileName="vc_mswudll_x64\nativdlg.pdb"
+				ObjectFile="vc_x64_mswudll\nativdlg\"
+				ProgramDataBaseFileName="vc_x64_mswudll\nativdlg.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\nativdlg.exe"
+				OutputFile="vc_x64_mswudll\nativdlg.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\nativdlg.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\nativdlg.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\nativdlg_vc8.bsc"
+				OutputFile="vc_x64_mswudll\nativdlg_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/nativdlg/nativdlg_vc9.vcproj b/samples/nativdlg/nativdlg_vc9.vcproj
index 13fa898a6c..8dfb4d3c83 100644
--- a/samples/nativdlg/nativdlg_vc9.vcproj
+++ b/samples/nativdlg/nativdlg_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\nativdlg"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\nativdlg"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\nativdlg\"
-				ProgramDataBaseFileName="vc_mswud_x64\nativdlg.pdb"
+				ObjectFile="vc_x64_mswud\nativdlg\"
+				ProgramDataBaseFileName="vc_x64_mswud\nativdlg.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\nativdlg.exe"
+				OutputFile="vc_x64_mswud\nativdlg.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\nativdlg.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\nativdlg.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\nativdlg_vc9.bsc"
+				OutputFile="vc_x64_mswud\nativdlg_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\nativdlg"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\nativdlg"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\nativdlg\"
-				ProgramDataBaseFileName="vc_mswu_x64\nativdlg.pdb"
+				ObjectFile="vc_x64_mswu\nativdlg\"
+				ProgramDataBaseFileName="vc_x64_mswu\nativdlg.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\nativdlg.exe"
+				OutputFile="vc_x64_mswu\nativdlg.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\nativdlg.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\nativdlg.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\nativdlg_vc9.bsc"
+				OutputFile="vc_x64_mswu\nativdlg_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\nativdlg"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\nativdlg"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\nativdlg\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\nativdlg.pdb"
+				ObjectFile="vc_x64_mswuddll\nativdlg\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\nativdlg.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\nativdlg.exe"
+				OutputFile="vc_x64_mswuddll\nativdlg.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\nativdlg.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\nativdlg.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\nativdlg_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\nativdlg_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\nativdlg"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\nativdlg"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\nativdlg\"
-				ProgramDataBaseFileName="vc_mswudll_x64\nativdlg.pdb"
+				ObjectFile="vc_x64_mswudll\nativdlg\"
+				ProgramDataBaseFileName="vc_x64_mswudll\nativdlg.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\nativdlg.exe"
+				OutputFile="vc_x64_mswudll\nativdlg.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\nativdlg.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\nativdlg.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\nativdlg_vc9.bsc"
+				OutputFile="vc_x64_mswudll\nativdlg_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/notebook/makefile.vc b/samples/notebook/makefile.vc
index 7eb1d44dea..6911a5e4b3 100644
--- a/samples/notebook/makefile.vc
+++ b/samples/notebook/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/notebook/notebook_vc8.vcproj b/samples/notebook/notebook_vc8.vcproj
index bfaa7a28c7..9b89bee070 100644
--- a/samples/notebook/notebook_vc8.vcproj
+++ b/samples/notebook/notebook_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\notebook"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\notebook"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\notebook\"
-				ProgramDataBaseFileName="vc_mswud_x64\notebook.pdb"
+				ObjectFile="vc_x64_mswud\notebook\"
+				ProgramDataBaseFileName="vc_x64_mswud\notebook.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_aui.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\notebook.exe"
+				OutputFile="vc_x64_mswud\notebook.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\notebook.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\notebook.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\notebook_vc8.bsc"
+				OutputFile="vc_x64_mswud\notebook_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\notebook"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\notebook"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\notebook\"
-				ProgramDataBaseFileName="vc_mswu_x64\notebook.pdb"
+				ObjectFile="vc_x64_mswu\notebook\"
+				ProgramDataBaseFileName="vc_x64_mswu\notebook.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_aui.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\notebook.exe"
+				OutputFile="vc_x64_mswu\notebook.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\notebook.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\notebook.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\notebook_vc8.bsc"
+				OutputFile="vc_x64_mswu\notebook_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\notebook"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\notebook"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\notebook\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\notebook.pdb"
+				ObjectFile="vc_x64_mswuddll\notebook\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\notebook.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_aui.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\notebook.exe"
+				OutputFile="vc_x64_mswuddll\notebook.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\notebook.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\notebook.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\notebook_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\notebook_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\notebook"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\notebook"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\notebook\"
-				ProgramDataBaseFileName="vc_mswudll_x64\notebook.pdb"
+				ObjectFile="vc_x64_mswudll\notebook\"
+				ProgramDataBaseFileName="vc_x64_mswudll\notebook.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_aui.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\notebook.exe"
+				OutputFile="vc_x64_mswudll\notebook.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\notebook.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\notebook.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\notebook_vc8.bsc"
+				OutputFile="vc_x64_mswudll\notebook_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/notebook/notebook_vc9.vcproj b/samples/notebook/notebook_vc9.vcproj
index ead8b525ae..cee3257ec7 100644
--- a/samples/notebook/notebook_vc9.vcproj
+++ b/samples/notebook/notebook_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\notebook"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\notebook"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\notebook\"
-				ProgramDataBaseFileName="vc_mswud_x64\notebook.pdb"
+				ObjectFile="vc_x64_mswud\notebook\"
+				ProgramDataBaseFileName="vc_x64_mswud\notebook.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_aui.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\notebook.exe"
+				OutputFile="vc_x64_mswud\notebook.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\notebook.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\notebook.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\notebook_vc9.bsc"
+				OutputFile="vc_x64_mswud\notebook_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\notebook"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\notebook"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\notebook\"
-				ProgramDataBaseFileName="vc_mswu_x64\notebook.pdb"
+				ObjectFile="vc_x64_mswu\notebook\"
+				ProgramDataBaseFileName="vc_x64_mswu\notebook.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_aui.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\notebook.exe"
+				OutputFile="vc_x64_mswu\notebook.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\notebook.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\notebook.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\notebook_vc9.bsc"
+				OutputFile="vc_x64_mswu\notebook_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\notebook"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\notebook"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\notebook\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\notebook.pdb"
+				ObjectFile="vc_x64_mswuddll\notebook\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\notebook.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_aui.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\notebook.exe"
+				OutputFile="vc_x64_mswuddll\notebook.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\notebook.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\notebook.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\notebook_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\notebook_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\notebook"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\notebook"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\notebook\"
-				ProgramDataBaseFileName="vc_mswudll_x64\notebook.pdb"
+				ObjectFile="vc_x64_mswudll\notebook\"
+				ProgramDataBaseFileName="vc_x64_mswudll\notebook.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_aui.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\notebook.exe"
+				OutputFile="vc_x64_mswudll\notebook.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\notebook.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\notebook.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\notebook_vc9.bsc"
+				OutputFile="vc_x64_mswudll\notebook_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/oleauto/makefile.vc b/samples/oleauto/makefile.vc
index c110cb06b7..8201f71556 100644
--- a/samples/oleauto/makefile.vc
+++ b/samples/oleauto/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/oleauto/oleauto_vc8.vcproj b/samples/oleauto/oleauto_vc8.vcproj
index 8d2c100665..38d8310e64 100644
--- a/samples/oleauto/oleauto_vc8.vcproj
+++ b/samples/oleauto/oleauto_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\oleauto"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\oleauto"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\oleauto\"
-				ProgramDataBaseFileName="vc_mswud_x64\oleauto.pdb"
+				ObjectFile="vc_x64_mswud\oleauto\"
+				ProgramDataBaseFileName="vc_x64_mswud\oleauto.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\oleauto.exe"
+				OutputFile="vc_x64_mswud\oleauto.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\oleauto.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\oleauto.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\oleauto_vc8.bsc"
+				OutputFile="vc_x64_mswud\oleauto_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\oleauto"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\oleauto"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\oleauto\"
-				ProgramDataBaseFileName="vc_mswu_x64\oleauto.pdb"
+				ObjectFile="vc_x64_mswu\oleauto\"
+				ProgramDataBaseFileName="vc_x64_mswu\oleauto.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\oleauto.exe"
+				OutputFile="vc_x64_mswu\oleauto.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\oleauto.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\oleauto.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\oleauto_vc8.bsc"
+				OutputFile="vc_x64_mswu\oleauto_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\oleauto"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\oleauto"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\oleauto\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\oleauto.pdb"
+				ObjectFile="vc_x64_mswuddll\oleauto\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\oleauto.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\oleauto.exe"
+				OutputFile="vc_x64_mswuddll\oleauto.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\oleauto.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\oleauto.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\oleauto_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\oleauto_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\oleauto"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\oleauto"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\oleauto\"
-				ProgramDataBaseFileName="vc_mswudll_x64\oleauto.pdb"
+				ObjectFile="vc_x64_mswudll\oleauto\"
+				ProgramDataBaseFileName="vc_x64_mswudll\oleauto.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\oleauto.exe"
+				OutputFile="vc_x64_mswudll\oleauto.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\oleauto.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\oleauto.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\oleauto_vc8.bsc"
+				OutputFile="vc_x64_mswudll\oleauto_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/oleauto/oleauto_vc9.vcproj b/samples/oleauto/oleauto_vc9.vcproj
index 2a678154cc..7e21b7f63e 100644
--- a/samples/oleauto/oleauto_vc9.vcproj
+++ b/samples/oleauto/oleauto_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\oleauto"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\oleauto"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\oleauto\"
-				ProgramDataBaseFileName="vc_mswud_x64\oleauto.pdb"
+				ObjectFile="vc_x64_mswud\oleauto\"
+				ProgramDataBaseFileName="vc_x64_mswud\oleauto.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\oleauto.exe"
+				OutputFile="vc_x64_mswud\oleauto.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\oleauto.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\oleauto.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\oleauto_vc9.bsc"
+				OutputFile="vc_x64_mswud\oleauto_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\oleauto"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\oleauto"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\oleauto\"
-				ProgramDataBaseFileName="vc_mswu_x64\oleauto.pdb"
+				ObjectFile="vc_x64_mswu\oleauto\"
+				ProgramDataBaseFileName="vc_x64_mswu\oleauto.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\oleauto.exe"
+				OutputFile="vc_x64_mswu\oleauto.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\oleauto.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\oleauto.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\oleauto_vc9.bsc"
+				OutputFile="vc_x64_mswu\oleauto_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\oleauto"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\oleauto"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\oleauto\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\oleauto.pdb"
+				ObjectFile="vc_x64_mswuddll\oleauto\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\oleauto.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\oleauto.exe"
+				OutputFile="vc_x64_mswuddll\oleauto.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\oleauto.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\oleauto.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\oleauto_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\oleauto_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\oleauto"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\oleauto"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\oleauto\"
-				ProgramDataBaseFileName="vc_mswudll_x64\oleauto.pdb"
+				ObjectFile="vc_x64_mswudll\oleauto\"
+				ProgramDataBaseFileName="vc_x64_mswudll\oleauto.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\oleauto.exe"
+				OutputFile="vc_x64_mswudll\oleauto.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\oleauto.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\oleauto.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\oleauto_vc9.bsc"
+				OutputFile="vc_x64_mswudll\oleauto_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/opengl/cube/cube_vc8.vcproj b/samples/opengl/cube/cube_vc8.vcproj
index 1ece75a780..4d036e1a2b 100644
--- a/samples/opengl/cube/cube_vc8.vcproj
+++ b/samples/opengl/cube/cube_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\cube"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\cube"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\cube\"
-				ProgramDataBaseFileName="vc_mswud_x64\cube.pdb"
+				ObjectFile="vc_x64_mswud\cube\"
+				ProgramDataBaseFileName="vc_x64_mswud\cube.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_gl.lib opengl32.lib glu32.lib wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\cube.exe"
+				OutputFile="vc_x64_mswud\cube.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\cube.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\cube.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\cube_vc8.bsc"
+				OutputFile="vc_x64_mswud\cube_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\cube"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\cube"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\cube\"
-				ProgramDataBaseFileName="vc_mswu_x64\cube.pdb"
+				ObjectFile="vc_x64_mswu\cube\"
+				ProgramDataBaseFileName="vc_x64_mswu\cube.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_gl.lib opengl32.lib glu32.lib wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\cube.exe"
+				OutputFile="vc_x64_mswu\cube.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\cube.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\cube.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\cube_vc8.bsc"
+				OutputFile="vc_x64_mswu\cube_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\cube"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\cube"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\cube\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\cube.pdb"
+				ObjectFile="vc_x64_mswuddll\cube\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\cube.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_gl.lib opengl32.lib glu32.lib wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\cube.exe"
+				OutputFile="vc_x64_mswuddll\cube.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\cube.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\cube.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\cube_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\cube_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\cube"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\cube"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\cube\"
-				ProgramDataBaseFileName="vc_mswudll_x64\cube.pdb"
+				ObjectFile="vc_x64_mswudll\cube\"
+				ProgramDataBaseFileName="vc_x64_mswudll\cube.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_gl.lib opengl32.lib glu32.lib wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\cube.exe"
+				OutputFile="vc_x64_mswudll\cube.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\cube.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\cube.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\cube_vc8.bsc"
+				OutputFile="vc_x64_mswudll\cube_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/opengl/cube/cube_vc9.vcproj b/samples/opengl/cube/cube_vc9.vcproj
index 9b185a3488..00c3a2a810 100644
--- a/samples/opengl/cube/cube_vc9.vcproj
+++ b/samples/opengl/cube/cube_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\cube"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\cube"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\cube\"
-				ProgramDataBaseFileName="vc_mswud_x64\cube.pdb"
+				ObjectFile="vc_x64_mswud\cube\"
+				ProgramDataBaseFileName="vc_x64_mswud\cube.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_gl.lib opengl32.lib glu32.lib wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\cube.exe"
+				OutputFile="vc_x64_mswud\cube.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\cube.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\cube.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\cube_vc9.bsc"
+				OutputFile="vc_x64_mswud\cube_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\cube"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\cube"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\cube\"
-				ProgramDataBaseFileName="vc_mswu_x64\cube.pdb"
+				ObjectFile="vc_x64_mswu\cube\"
+				ProgramDataBaseFileName="vc_x64_mswu\cube.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_gl.lib opengl32.lib glu32.lib wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\cube.exe"
+				OutputFile="vc_x64_mswu\cube.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\cube.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\cube.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\cube_vc9.bsc"
+				OutputFile="vc_x64_mswu\cube_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\cube"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\cube"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\cube\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\cube.pdb"
+				ObjectFile="vc_x64_mswuddll\cube\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\cube.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_gl.lib opengl32.lib glu32.lib wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\cube.exe"
+				OutputFile="vc_x64_mswuddll\cube.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\cube.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\cube.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\cube_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\cube_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\cube"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\cube"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\cube\"
-				ProgramDataBaseFileName="vc_mswudll_x64\cube.pdb"
+				ObjectFile="vc_x64_mswudll\cube\"
+				ProgramDataBaseFileName="vc_x64_mswudll\cube.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_gl.lib opengl32.lib glu32.lib wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\cube.exe"
+				OutputFile="vc_x64_mswudll\cube.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\cube.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\cube.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\cube_vc9.bsc"
+				OutputFile="vc_x64_mswudll\cube_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/opengl/cube/makefile.vc b/samples/opengl/cube/makefile.vc
index 883455d0bd..005a068daa 100644
--- a/samples/opengl/cube/makefile.vc
+++ b/samples/opengl/cube/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/opengl/isosurf/isosurf_vc8.vcproj b/samples/opengl/isosurf/isosurf_vc8.vcproj
index e0855b77ae..5569aece20 100644
--- a/samples/opengl/isosurf/isosurf_vc8.vcproj
+++ b/samples/opengl/isosurf/isosurf_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\isosurf"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\isosurf"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\isosurf\"
-				ProgramDataBaseFileName="vc_mswud_x64\isosurf.pdb"
+				ObjectFile="vc_x64_mswud\isosurf\"
+				ProgramDataBaseFileName="vc_x64_mswud\isosurf.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_gl.lib opengl32.lib glu32.lib wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\isosurf.exe"
+				OutputFile="vc_x64_mswud\isosurf.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\isosurf.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\isosurf.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\isosurf_vc8.bsc"
+				OutputFile="vc_x64_mswud\isosurf_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\isosurf"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\isosurf"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\isosurf\"
-				ProgramDataBaseFileName="vc_mswu_x64\isosurf.pdb"
+				ObjectFile="vc_x64_mswu\isosurf\"
+				ProgramDataBaseFileName="vc_x64_mswu\isosurf.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_gl.lib opengl32.lib glu32.lib wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\isosurf.exe"
+				OutputFile="vc_x64_mswu\isosurf.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\isosurf.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\isosurf.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\isosurf_vc8.bsc"
+				OutputFile="vc_x64_mswu\isosurf_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\isosurf"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\isosurf"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\isosurf\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\isosurf.pdb"
+				ObjectFile="vc_x64_mswuddll\isosurf\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\isosurf.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_gl.lib opengl32.lib glu32.lib wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\isosurf.exe"
+				OutputFile="vc_x64_mswuddll\isosurf.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\isosurf.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\isosurf.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\isosurf_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\isosurf_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\isosurf"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\isosurf"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\isosurf\"
-				ProgramDataBaseFileName="vc_mswudll_x64\isosurf.pdb"
+				ObjectFile="vc_x64_mswudll\isosurf\"
+				ProgramDataBaseFileName="vc_x64_mswudll\isosurf.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_gl.lib opengl32.lib glu32.lib wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\isosurf.exe"
+				OutputFile="vc_x64_mswudll\isosurf.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\isosurf.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\isosurf.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\isosurf_vc8.bsc"
+				OutputFile="vc_x64_mswudll\isosurf_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/opengl/isosurf/isosurf_vc9.vcproj b/samples/opengl/isosurf/isosurf_vc9.vcproj
index 7d447ac286..0a52361528 100644
--- a/samples/opengl/isosurf/isosurf_vc9.vcproj
+++ b/samples/opengl/isosurf/isosurf_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\isosurf"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\isosurf"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\isosurf\"
-				ProgramDataBaseFileName="vc_mswud_x64\isosurf.pdb"
+				ObjectFile="vc_x64_mswud\isosurf\"
+				ProgramDataBaseFileName="vc_x64_mswud\isosurf.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_gl.lib opengl32.lib glu32.lib wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\isosurf.exe"
+				OutputFile="vc_x64_mswud\isosurf.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\isosurf.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\isosurf.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\isosurf_vc9.bsc"
+				OutputFile="vc_x64_mswud\isosurf_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\isosurf"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\isosurf"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\isosurf\"
-				ProgramDataBaseFileName="vc_mswu_x64\isosurf.pdb"
+				ObjectFile="vc_x64_mswu\isosurf\"
+				ProgramDataBaseFileName="vc_x64_mswu\isosurf.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_gl.lib opengl32.lib glu32.lib wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\isosurf.exe"
+				OutputFile="vc_x64_mswu\isosurf.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\isosurf.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\isosurf.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\isosurf_vc9.bsc"
+				OutputFile="vc_x64_mswu\isosurf_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\isosurf"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\isosurf"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\isosurf\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\isosurf.pdb"
+				ObjectFile="vc_x64_mswuddll\isosurf\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\isosurf.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_gl.lib opengl32.lib glu32.lib wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\isosurf.exe"
+				OutputFile="vc_x64_mswuddll\isosurf.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\isosurf.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\isosurf.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\isosurf_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\isosurf_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\isosurf"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\isosurf"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\isosurf\"
-				ProgramDataBaseFileName="vc_mswudll_x64\isosurf.pdb"
+				ObjectFile="vc_x64_mswudll\isosurf\"
+				ProgramDataBaseFileName="vc_x64_mswudll\isosurf.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_gl.lib opengl32.lib glu32.lib wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\isosurf.exe"
+				OutputFile="vc_x64_mswudll\isosurf.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\isosurf.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\isosurf.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\isosurf_vc9.bsc"
+				OutputFile="vc_x64_mswudll\isosurf_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/opengl/isosurf/makefile.vc b/samples/opengl/isosurf/makefile.vc
index 8395a18dbd..fdf6f8efec 100644
--- a/samples/opengl/isosurf/makefile.vc
+++ b/samples/opengl/isosurf/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/opengl/penguin/makefile.vc b/samples/opengl/penguin/makefile.vc
index ba4f4df22d..73429362c3 100644
--- a/samples/opengl/penguin/makefile.vc
+++ b/samples/opengl/penguin/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/opengl/penguin/penguin_vc8.vcproj b/samples/opengl/penguin/penguin_vc8.vcproj
index a56d82220f..5a35d8017a 100644
--- a/samples/opengl/penguin/penguin_vc8.vcproj
+++ b/samples/opengl/penguin/penguin_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\penguin"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\penguin"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\penguin\"
-				ProgramDataBaseFileName="vc_mswud_x64\penguin.pdb"
+				ObjectFile="vc_x64_mswud\penguin\"
+				ProgramDataBaseFileName="vc_x64_mswud\penguin.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_gl.lib opengl32.lib glu32.lib wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\penguin.exe"
+				OutputFile="vc_x64_mswud\penguin.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\penguin.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\penguin.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\penguin_vc8.bsc"
+				OutputFile="vc_x64_mswud\penguin_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\penguin"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\penguin"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\penguin\"
-				ProgramDataBaseFileName="vc_mswu_x64\penguin.pdb"
+				ObjectFile="vc_x64_mswu\penguin\"
+				ProgramDataBaseFileName="vc_x64_mswu\penguin.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_gl.lib opengl32.lib glu32.lib wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\penguin.exe"
+				OutputFile="vc_x64_mswu\penguin.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\penguin.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\penguin.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\penguin_vc8.bsc"
+				OutputFile="vc_x64_mswu\penguin_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\penguin"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\penguin"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\penguin\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\penguin.pdb"
+				ObjectFile="vc_x64_mswuddll\penguin\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\penguin.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_gl.lib opengl32.lib glu32.lib wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\penguin.exe"
+				OutputFile="vc_x64_mswuddll\penguin.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\penguin.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\penguin.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\penguin_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\penguin_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\penguin"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\penguin"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\penguin\"
-				ProgramDataBaseFileName="vc_mswudll_x64\penguin.pdb"
+				ObjectFile="vc_x64_mswudll\penguin\"
+				ProgramDataBaseFileName="vc_x64_mswudll\penguin.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_gl.lib opengl32.lib glu32.lib wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\penguin.exe"
+				OutputFile="vc_x64_mswudll\penguin.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\penguin.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\penguin.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\penguin_vc8.bsc"
+				OutputFile="vc_x64_mswudll\penguin_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/opengl/penguin/penguin_vc9.vcproj b/samples/opengl/penguin/penguin_vc9.vcproj
index ea7f5efce1..9d66c566a9 100644
--- a/samples/opengl/penguin/penguin_vc9.vcproj
+++ b/samples/opengl/penguin/penguin_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\penguin"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\penguin"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\penguin\"
-				ProgramDataBaseFileName="vc_mswud_x64\penguin.pdb"
+				ObjectFile="vc_x64_mswud\penguin\"
+				ProgramDataBaseFileName="vc_x64_mswud\penguin.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_gl.lib opengl32.lib glu32.lib wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\penguin.exe"
+				OutputFile="vc_x64_mswud\penguin.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\penguin.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\penguin.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\penguin_vc9.bsc"
+				OutputFile="vc_x64_mswud\penguin_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\penguin"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\penguin"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\penguin\"
-				ProgramDataBaseFileName="vc_mswu_x64\penguin.pdb"
+				ObjectFile="vc_x64_mswu\penguin\"
+				ProgramDataBaseFileName="vc_x64_mswu\penguin.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_gl.lib opengl32.lib glu32.lib wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\penguin.exe"
+				OutputFile="vc_x64_mswu\penguin.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\penguin.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\penguin.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\penguin_vc9.bsc"
+				OutputFile="vc_x64_mswu\penguin_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\penguin"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\penguin"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\penguin\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\penguin.pdb"
+				ObjectFile="vc_x64_mswuddll\penguin\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\penguin.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_gl.lib opengl32.lib glu32.lib wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\penguin.exe"
+				OutputFile="vc_x64_mswuddll\penguin.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\penguin.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\penguin.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\penguin_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\penguin_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\penguin"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\penguin"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\penguin\"
-				ProgramDataBaseFileName="vc_mswudll_x64\penguin.pdb"
+				ObjectFile="vc_x64_mswudll\penguin\"
+				ProgramDataBaseFileName="vc_x64_mswudll\penguin.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_gl.lib opengl32.lib glu32.lib wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\penguin.exe"
+				OutputFile="vc_x64_mswudll\penguin.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\penguin.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\penguin.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\penguin_vc9.bsc"
+				OutputFile="vc_x64_mswudll\penguin_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/opengl/pyramid/makefile.vc b/samples/opengl/pyramid/makefile.vc
index 473c96d73b..4707b0853c 100644
--- a/samples/opengl/pyramid/makefile.vc
+++ b/samples/opengl/pyramid/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/opengl/pyramid/pyramid_vc8.vcproj b/samples/opengl/pyramid/pyramid_vc8.vcproj
index b23acff4b2..8d6195a0b4 100644
--- a/samples/opengl/pyramid/pyramid_vc8.vcproj
+++ b/samples/opengl/pyramid/pyramid_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\pyramid"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\pyramid"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\pyramid\"
-				ProgramDataBaseFileName="vc_mswud_x64\pyramid.pdb"
+				ObjectFile="vc_x64_mswud\pyramid\"
+				ProgramDataBaseFileName="vc_x64_mswud\pyramid.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_gl.lib opengl32.lib glu32.lib wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\pyramid.exe"
+				OutputFile="vc_x64_mswud\pyramid.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\pyramid.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\pyramid.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\pyramid_vc8.bsc"
+				OutputFile="vc_x64_mswud\pyramid_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\pyramid"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\pyramid"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\pyramid\"
-				ProgramDataBaseFileName="vc_mswu_x64\pyramid.pdb"
+				ObjectFile="vc_x64_mswu\pyramid\"
+				ProgramDataBaseFileName="vc_x64_mswu\pyramid.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_gl.lib opengl32.lib glu32.lib wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\pyramid.exe"
+				OutputFile="vc_x64_mswu\pyramid.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\pyramid.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\pyramid.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\pyramid_vc8.bsc"
+				OutputFile="vc_x64_mswu\pyramid_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\pyramid"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\pyramid"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\pyramid\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\pyramid.pdb"
+				ObjectFile="vc_x64_mswuddll\pyramid\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\pyramid.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_gl.lib opengl32.lib glu32.lib wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\pyramid.exe"
+				OutputFile="vc_x64_mswuddll\pyramid.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\pyramid.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\pyramid.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\pyramid_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\pyramid_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\pyramid"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\pyramid"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\pyramid\"
-				ProgramDataBaseFileName="vc_mswudll_x64\pyramid.pdb"
+				ObjectFile="vc_x64_mswudll\pyramid\"
+				ProgramDataBaseFileName="vc_x64_mswudll\pyramid.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_gl.lib opengl32.lib glu32.lib wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\pyramid.exe"
+				OutputFile="vc_x64_mswudll\pyramid.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\pyramid.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\pyramid.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\pyramid_vc8.bsc"
+				OutputFile="vc_x64_mswudll\pyramid_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/opengl/pyramid/pyramid_vc9.vcproj b/samples/opengl/pyramid/pyramid_vc9.vcproj
index 293528062d..ee8cd3c343 100644
--- a/samples/opengl/pyramid/pyramid_vc9.vcproj
+++ b/samples/opengl/pyramid/pyramid_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\pyramid"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\pyramid"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\pyramid\"
-				ProgramDataBaseFileName="vc_mswud_x64\pyramid.pdb"
+				ObjectFile="vc_x64_mswud\pyramid\"
+				ProgramDataBaseFileName="vc_x64_mswud\pyramid.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_gl.lib opengl32.lib glu32.lib wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\pyramid.exe"
+				OutputFile="vc_x64_mswud\pyramid.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\pyramid.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\pyramid.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\pyramid_vc9.bsc"
+				OutputFile="vc_x64_mswud\pyramid_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\pyramid"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\pyramid"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\pyramid\"
-				ProgramDataBaseFileName="vc_mswu_x64\pyramid.pdb"
+				ObjectFile="vc_x64_mswu\pyramid\"
+				ProgramDataBaseFileName="vc_x64_mswu\pyramid.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_gl.lib opengl32.lib glu32.lib wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\pyramid.exe"
+				OutputFile="vc_x64_mswu\pyramid.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\pyramid.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\pyramid.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\pyramid_vc9.bsc"
+				OutputFile="vc_x64_mswu\pyramid_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\pyramid"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\pyramid"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\pyramid\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\pyramid.pdb"
+				ObjectFile="vc_x64_mswuddll\pyramid\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\pyramid.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_gl.lib opengl32.lib glu32.lib wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\pyramid.exe"
+				OutputFile="vc_x64_mswuddll\pyramid.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\pyramid.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\pyramid.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\pyramid_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\pyramid_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\pyramid"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\pyramid"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\pyramid\"
-				ProgramDataBaseFileName="vc_mswudll_x64\pyramid.pdb"
+				ObjectFile="vc_x64_mswudll\pyramid\"
+				ProgramDataBaseFileName="vc_x64_mswudll\pyramid.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_gl.lib opengl32.lib glu32.lib wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\pyramid.exe"
+				OutputFile="vc_x64_mswudll\pyramid.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\pyramid.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\pyramid.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\pyramid_vc9.bsc"
+				OutputFile="vc_x64_mswudll\pyramid_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/ownerdrw/makefile.vc b/samples/ownerdrw/makefile.vc
index 1741f63a6c..2560488061 100644
--- a/samples/ownerdrw/makefile.vc
+++ b/samples/ownerdrw/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/ownerdrw/ownerdrw_vc8.vcproj b/samples/ownerdrw/ownerdrw_vc8.vcproj
index c521f0aa20..8c9143a169 100644
--- a/samples/ownerdrw/ownerdrw_vc8.vcproj
+++ b/samples/ownerdrw/ownerdrw_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\ownerdrw"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\ownerdrw"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\ownerdrw\"
-				ProgramDataBaseFileName="vc_mswud_x64\ownerdrw.pdb"
+				ObjectFile="vc_x64_mswud\ownerdrw\"
+				ProgramDataBaseFileName="vc_x64_mswud\ownerdrw.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\ownerdrw.exe"
+				OutputFile="vc_x64_mswud\ownerdrw.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\ownerdrw.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\ownerdrw.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\ownerdrw_vc8.bsc"
+				OutputFile="vc_x64_mswud\ownerdrw_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\ownerdrw"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\ownerdrw"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\ownerdrw\"
-				ProgramDataBaseFileName="vc_mswu_x64\ownerdrw.pdb"
+				ObjectFile="vc_x64_mswu\ownerdrw\"
+				ProgramDataBaseFileName="vc_x64_mswu\ownerdrw.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\ownerdrw.exe"
+				OutputFile="vc_x64_mswu\ownerdrw.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\ownerdrw.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\ownerdrw.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\ownerdrw_vc8.bsc"
+				OutputFile="vc_x64_mswu\ownerdrw_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\ownerdrw"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\ownerdrw"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\ownerdrw\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\ownerdrw.pdb"
+				ObjectFile="vc_x64_mswuddll\ownerdrw\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\ownerdrw.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\ownerdrw.exe"
+				OutputFile="vc_x64_mswuddll\ownerdrw.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\ownerdrw.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\ownerdrw.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\ownerdrw_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\ownerdrw_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\ownerdrw"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\ownerdrw"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\ownerdrw\"
-				ProgramDataBaseFileName="vc_mswudll_x64\ownerdrw.pdb"
+				ObjectFile="vc_x64_mswudll\ownerdrw\"
+				ProgramDataBaseFileName="vc_x64_mswudll\ownerdrw.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\ownerdrw.exe"
+				OutputFile="vc_x64_mswudll\ownerdrw.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\ownerdrw.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\ownerdrw.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\ownerdrw_vc8.bsc"
+				OutputFile="vc_x64_mswudll\ownerdrw_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/ownerdrw/ownerdrw_vc9.vcproj b/samples/ownerdrw/ownerdrw_vc9.vcproj
index d1048f8c31..4cda55f1de 100644
--- a/samples/ownerdrw/ownerdrw_vc9.vcproj
+++ b/samples/ownerdrw/ownerdrw_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\ownerdrw"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\ownerdrw"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\ownerdrw\"
-				ProgramDataBaseFileName="vc_mswud_x64\ownerdrw.pdb"
+				ObjectFile="vc_x64_mswud\ownerdrw\"
+				ProgramDataBaseFileName="vc_x64_mswud\ownerdrw.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\ownerdrw.exe"
+				OutputFile="vc_x64_mswud\ownerdrw.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\ownerdrw.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\ownerdrw.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\ownerdrw_vc9.bsc"
+				OutputFile="vc_x64_mswud\ownerdrw_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\ownerdrw"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\ownerdrw"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\ownerdrw\"
-				ProgramDataBaseFileName="vc_mswu_x64\ownerdrw.pdb"
+				ObjectFile="vc_x64_mswu\ownerdrw\"
+				ProgramDataBaseFileName="vc_x64_mswu\ownerdrw.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\ownerdrw.exe"
+				OutputFile="vc_x64_mswu\ownerdrw.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\ownerdrw.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\ownerdrw.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\ownerdrw_vc9.bsc"
+				OutputFile="vc_x64_mswu\ownerdrw_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\ownerdrw"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\ownerdrw"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\ownerdrw\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\ownerdrw.pdb"
+				ObjectFile="vc_x64_mswuddll\ownerdrw\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\ownerdrw.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\ownerdrw.exe"
+				OutputFile="vc_x64_mswuddll\ownerdrw.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\ownerdrw.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\ownerdrw.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\ownerdrw_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\ownerdrw_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\ownerdrw"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\ownerdrw"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\ownerdrw\"
-				ProgramDataBaseFileName="vc_mswudll_x64\ownerdrw.pdb"
+				ObjectFile="vc_x64_mswudll\ownerdrw\"
+				ProgramDataBaseFileName="vc_x64_mswudll\ownerdrw.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\ownerdrw.exe"
+				OutputFile="vc_x64_mswudll\ownerdrw.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\ownerdrw.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\ownerdrw.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\ownerdrw_vc9.bsc"
+				OutputFile="vc_x64_mswudll\ownerdrw_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/popup/makefile.vc b/samples/popup/makefile.vc
index 78e7e3caaf..71fcf8a6a5 100644
--- a/samples/popup/makefile.vc
+++ b/samples/popup/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/popup/popup_vc8.vcproj b/samples/popup/popup_vc8.vcproj
index fb57fdfa48..21e8de9615 100644
--- a/samples/popup/popup_vc8.vcproj
+++ b/samples/popup/popup_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\popup"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\popup"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\popup\"
-				ProgramDataBaseFileName="vc_mswud_x64\popup.pdb"
+				ObjectFile="vc_x64_mswud\popup\"
+				ProgramDataBaseFileName="vc_x64_mswud\popup.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\popup.exe"
+				OutputFile="vc_x64_mswud\popup.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\popup.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\popup.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\popup_vc8.bsc"
+				OutputFile="vc_x64_mswud\popup_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\popup"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\popup"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\popup\"
-				ProgramDataBaseFileName="vc_mswu_x64\popup.pdb"
+				ObjectFile="vc_x64_mswu\popup\"
+				ProgramDataBaseFileName="vc_x64_mswu\popup.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\popup.exe"
+				OutputFile="vc_x64_mswu\popup.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\popup.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\popup.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\popup_vc8.bsc"
+				OutputFile="vc_x64_mswu\popup_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\popup"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\popup"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\popup\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\popup.pdb"
+				ObjectFile="vc_x64_mswuddll\popup\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\popup.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\popup.exe"
+				OutputFile="vc_x64_mswuddll\popup.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\popup.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\popup.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\popup_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\popup_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\popup"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\popup"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\popup\"
-				ProgramDataBaseFileName="vc_mswudll_x64\popup.pdb"
+				ObjectFile="vc_x64_mswudll\popup\"
+				ProgramDataBaseFileName="vc_x64_mswudll\popup.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\popup.exe"
+				OutputFile="vc_x64_mswudll\popup.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\popup.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\popup.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\popup_vc8.bsc"
+				OutputFile="vc_x64_mswudll\popup_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/popup/popup_vc9.vcproj b/samples/popup/popup_vc9.vcproj
index 0dd8964284..ef98712b0f 100644
--- a/samples/popup/popup_vc9.vcproj
+++ b/samples/popup/popup_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\popup"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\popup"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\popup\"
-				ProgramDataBaseFileName="vc_mswud_x64\popup.pdb"
+				ObjectFile="vc_x64_mswud\popup\"
+				ProgramDataBaseFileName="vc_x64_mswud\popup.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\popup.exe"
+				OutputFile="vc_x64_mswud\popup.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\popup.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\popup.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\popup_vc9.bsc"
+				OutputFile="vc_x64_mswud\popup_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\popup"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\popup"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\popup\"
-				ProgramDataBaseFileName="vc_mswu_x64\popup.pdb"
+				ObjectFile="vc_x64_mswu\popup\"
+				ProgramDataBaseFileName="vc_x64_mswu\popup.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\popup.exe"
+				OutputFile="vc_x64_mswu\popup.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\popup.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\popup.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\popup_vc9.bsc"
+				OutputFile="vc_x64_mswu\popup_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\popup"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\popup"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\popup\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\popup.pdb"
+				ObjectFile="vc_x64_mswuddll\popup\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\popup.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\popup.exe"
+				OutputFile="vc_x64_mswuddll\popup.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\popup.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\popup.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\popup_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\popup_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\popup"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\popup"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\popup\"
-				ProgramDataBaseFileName="vc_mswudll_x64\popup.pdb"
+				ObjectFile="vc_x64_mswudll\popup\"
+				ProgramDataBaseFileName="vc_x64_mswudll\popup.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\popup.exe"
+				OutputFile="vc_x64_mswudll\popup.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\popup.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\popup.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\popup_vc9.bsc"
+				OutputFile="vc_x64_mswudll\popup_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/power/makefile.vc b/samples/power/makefile.vc
index 401a6a12cc..8069a3c450 100644
--- a/samples/power/makefile.vc
+++ b/samples/power/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/power/power_vc8.vcproj b/samples/power/power_vc8.vcproj
index c26d1a8745..374545b814 100644
--- a/samples/power/power_vc8.vcproj
+++ b/samples/power/power_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\power"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\power"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\power\"
-				ProgramDataBaseFileName="vc_mswud_x64\power.pdb"
+				ObjectFile="vc_x64_mswud\power\"
+				ProgramDataBaseFileName="vc_x64_mswud\power.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\power.exe"
+				OutputFile="vc_x64_mswud\power.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\power.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\power.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\power_vc8.bsc"
+				OutputFile="vc_x64_mswud\power_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\power"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\power"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\power\"
-				ProgramDataBaseFileName="vc_mswu_x64\power.pdb"
+				ObjectFile="vc_x64_mswu\power\"
+				ProgramDataBaseFileName="vc_x64_mswu\power.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\power.exe"
+				OutputFile="vc_x64_mswu\power.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\power.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\power.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\power_vc8.bsc"
+				OutputFile="vc_x64_mswu\power_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\power"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\power"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\power\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\power.pdb"
+				ObjectFile="vc_x64_mswuddll\power\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\power.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\power.exe"
+				OutputFile="vc_x64_mswuddll\power.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\power.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\power.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\power_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\power_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\power"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\power"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\power\"
-				ProgramDataBaseFileName="vc_mswudll_x64\power.pdb"
+				ObjectFile="vc_x64_mswudll\power\"
+				ProgramDataBaseFileName="vc_x64_mswudll\power.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\power.exe"
+				OutputFile="vc_x64_mswudll\power.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\power.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\power.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\power_vc8.bsc"
+				OutputFile="vc_x64_mswudll\power_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/power/power_vc9.vcproj b/samples/power/power_vc9.vcproj
index 07b985da93..32db34967b 100644
--- a/samples/power/power_vc9.vcproj
+++ b/samples/power/power_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\power"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\power"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\power\"
-				ProgramDataBaseFileName="vc_mswud_x64\power.pdb"
+				ObjectFile="vc_x64_mswud\power\"
+				ProgramDataBaseFileName="vc_x64_mswud\power.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\power.exe"
+				OutputFile="vc_x64_mswud\power.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\power.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\power.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\power_vc9.bsc"
+				OutputFile="vc_x64_mswud\power_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\power"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\power"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\power\"
-				ProgramDataBaseFileName="vc_mswu_x64\power.pdb"
+				ObjectFile="vc_x64_mswu\power\"
+				ProgramDataBaseFileName="vc_x64_mswu\power.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\power.exe"
+				OutputFile="vc_x64_mswu\power.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\power.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\power.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\power_vc9.bsc"
+				OutputFile="vc_x64_mswu\power_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\power"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\power"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\power\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\power.pdb"
+				ObjectFile="vc_x64_mswuddll\power\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\power.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\power.exe"
+				OutputFile="vc_x64_mswuddll\power.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\power.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\power.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\power_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\power_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\power"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\power"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\power\"
-				ProgramDataBaseFileName="vc_mswudll_x64\power.pdb"
+				ObjectFile="vc_x64_mswudll\power\"
+				ProgramDataBaseFileName="vc_x64_mswudll\power.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\power.exe"
+				OutputFile="vc_x64_mswudll\power.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\power.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\power.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\power_vc9.bsc"
+				OutputFile="vc_x64_mswudll\power_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/preferences/makefile.vc b/samples/preferences/makefile.vc
index 133962e6f3..50b257bc8a 100644
--- a/samples/preferences/makefile.vc
+++ b/samples/preferences/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/preferences/preferences_vc8.vcproj b/samples/preferences/preferences_vc8.vcproj
index d039a1e4ac..f340af07b7 100644
--- a/samples/preferences/preferences_vc8.vcproj
+++ b/samples/preferences/preferences_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\preferences"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\preferences"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\preferences\"
-				ProgramDataBaseFileName="vc_mswud_x64\preferences.pdb"
+				ObjectFile="vc_x64_mswud\preferences\"
+				ProgramDataBaseFileName="vc_x64_mswud\preferences.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\preferences.exe"
+				OutputFile="vc_x64_mswud\preferences.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\preferences.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\preferences.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\preferences_vc8.bsc"
+				OutputFile="vc_x64_mswud\preferences_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\preferences"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\preferences"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\preferences\"
-				ProgramDataBaseFileName="vc_mswu_x64\preferences.pdb"
+				ObjectFile="vc_x64_mswu\preferences\"
+				ProgramDataBaseFileName="vc_x64_mswu\preferences.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\preferences.exe"
+				OutputFile="vc_x64_mswu\preferences.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\preferences.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\preferences.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\preferences_vc8.bsc"
+				OutputFile="vc_x64_mswu\preferences_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\preferences"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\preferences"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\preferences\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\preferences.pdb"
+				ObjectFile="vc_x64_mswuddll\preferences\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\preferences.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\preferences.exe"
+				OutputFile="vc_x64_mswuddll\preferences.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\preferences.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\preferences.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\preferences_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\preferences_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\preferences"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\preferences"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\preferences\"
-				ProgramDataBaseFileName="vc_mswudll_x64\preferences.pdb"
+				ObjectFile="vc_x64_mswudll\preferences\"
+				ProgramDataBaseFileName="vc_x64_mswudll\preferences.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\preferences.exe"
+				OutputFile="vc_x64_mswudll\preferences.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\preferences.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\preferences.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\preferences_vc8.bsc"
+				OutputFile="vc_x64_mswudll\preferences_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/preferences/preferences_vc9.vcproj b/samples/preferences/preferences_vc9.vcproj
index 5df291bfa6..33190d5fba 100644
--- a/samples/preferences/preferences_vc9.vcproj
+++ b/samples/preferences/preferences_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\preferences"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\preferences"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\preferences\"
-				ProgramDataBaseFileName="vc_mswud_x64\preferences.pdb"
+				ObjectFile="vc_x64_mswud\preferences\"
+				ProgramDataBaseFileName="vc_x64_mswud\preferences.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\preferences.exe"
+				OutputFile="vc_x64_mswud\preferences.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\preferences.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\preferences.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\preferences_vc9.bsc"
+				OutputFile="vc_x64_mswud\preferences_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\preferences"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\preferences"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\preferences\"
-				ProgramDataBaseFileName="vc_mswu_x64\preferences.pdb"
+				ObjectFile="vc_x64_mswu\preferences\"
+				ProgramDataBaseFileName="vc_x64_mswu\preferences.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\preferences.exe"
+				OutputFile="vc_x64_mswu\preferences.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\preferences.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\preferences.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\preferences_vc9.bsc"
+				OutputFile="vc_x64_mswu\preferences_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\preferences"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\preferences"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\preferences\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\preferences.pdb"
+				ObjectFile="vc_x64_mswuddll\preferences\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\preferences.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\preferences.exe"
+				OutputFile="vc_x64_mswuddll\preferences.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\preferences.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\preferences.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\preferences_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\preferences_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\preferences"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\preferences"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\preferences\"
-				ProgramDataBaseFileName="vc_mswudll_x64\preferences.pdb"
+				ObjectFile="vc_x64_mswudll\preferences\"
+				ProgramDataBaseFileName="vc_x64_mswudll\preferences.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\preferences.exe"
+				OutputFile="vc_x64_mswudll\preferences.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\preferences.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\preferences.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\preferences_vc9.bsc"
+				OutputFile="vc_x64_mswudll\preferences_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/printing/makefile.vc b/samples/printing/makefile.vc
index e5cf855919..e5653cedb6 100644
--- a/samples/printing/makefile.vc
+++ b/samples/printing/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/printing/printing_vc8.vcproj b/samples/printing/printing_vc8.vcproj
index 9194c8d3be..956ef1a8e8 100644
--- a/samples/printing/printing_vc8.vcproj
+++ b/samples/printing/printing_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\printing"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\printing"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\printing\"
-				ProgramDataBaseFileName="vc_mswud_x64\printing.pdb"
+				ObjectFile="vc_x64_mswud\printing\"
+				ProgramDataBaseFileName="vc_x64_mswud\printing.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\printing.exe"
+				OutputFile="vc_x64_mswud\printing.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\printing.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\printing.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\printing_vc8.bsc"
+				OutputFile="vc_x64_mswud\printing_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\printing"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\printing"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\printing\"
-				ProgramDataBaseFileName="vc_mswu_x64\printing.pdb"
+				ObjectFile="vc_x64_mswu\printing\"
+				ProgramDataBaseFileName="vc_x64_mswu\printing.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\printing.exe"
+				OutputFile="vc_x64_mswu\printing.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\printing.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\printing.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\printing_vc8.bsc"
+				OutputFile="vc_x64_mswu\printing_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\printing"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\printing"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\printing\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\printing.pdb"
+				ObjectFile="vc_x64_mswuddll\printing\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\printing.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\printing.exe"
+				OutputFile="vc_x64_mswuddll\printing.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\printing.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\printing.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\printing_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\printing_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\printing"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\printing"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\printing\"
-				ProgramDataBaseFileName="vc_mswudll_x64\printing.pdb"
+				ObjectFile="vc_x64_mswudll\printing\"
+				ProgramDataBaseFileName="vc_x64_mswudll\printing.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\printing.exe"
+				OutputFile="vc_x64_mswudll\printing.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\printing.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\printing.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\printing_vc8.bsc"
+				OutputFile="vc_x64_mswudll\printing_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/printing/printing_vc9.vcproj b/samples/printing/printing_vc9.vcproj
index 98f328e5b2..14f042dc7e 100644
--- a/samples/printing/printing_vc9.vcproj
+++ b/samples/printing/printing_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\printing"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\printing"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\printing\"
-				ProgramDataBaseFileName="vc_mswud_x64\printing.pdb"
+				ObjectFile="vc_x64_mswud\printing\"
+				ProgramDataBaseFileName="vc_x64_mswud\printing.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\printing.exe"
+				OutputFile="vc_x64_mswud\printing.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\printing.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\printing.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\printing_vc9.bsc"
+				OutputFile="vc_x64_mswud\printing_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\printing"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\printing"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\printing\"
-				ProgramDataBaseFileName="vc_mswu_x64\printing.pdb"
+				ObjectFile="vc_x64_mswu\printing\"
+				ProgramDataBaseFileName="vc_x64_mswu\printing.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\printing.exe"
+				OutputFile="vc_x64_mswu\printing.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\printing.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\printing.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\printing_vc9.bsc"
+				OutputFile="vc_x64_mswu\printing_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\printing"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\printing"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\printing\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\printing.pdb"
+				ObjectFile="vc_x64_mswuddll\printing\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\printing.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\printing.exe"
+				OutputFile="vc_x64_mswuddll\printing.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\printing.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\printing.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\printing_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\printing_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\printing"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\printing"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\printing\"
-				ProgramDataBaseFileName="vc_mswudll_x64\printing.pdb"
+				ObjectFile="vc_x64_mswudll\printing\"
+				ProgramDataBaseFileName="vc_x64_mswudll\printing.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\printing.exe"
+				OutputFile="vc_x64_mswudll\printing.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\printing.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\printing.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\printing_vc9.bsc"
+				OutputFile="vc_x64_mswudll\printing_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/propgrid/makefile.vc b/samples/propgrid/makefile.vc
index dc18c69d00..859175d421 100644
--- a/samples/propgrid/makefile.vc
+++ b/samples/propgrid/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/propgrid/propgrid_vc8.vcproj b/samples/propgrid/propgrid_vc8.vcproj
index 5ddd036fc1..5ed86ba151 100644
--- a/samples/propgrid/propgrid_vc8.vcproj
+++ b/samples/propgrid/propgrid_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\propgrid"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\propgrid"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\propgrid\"
-				ProgramDataBaseFileName="vc_mswud_x64\propgrid.pdb"
+				ObjectFile="vc_x64_mswud\propgrid\"
+				ProgramDataBaseFileName="vc_x64_mswud\propgrid.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_propgrid.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\propgrid.exe"
+				OutputFile="vc_x64_mswud\propgrid.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\propgrid.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\propgrid.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\propgrid_vc8.bsc"
+				OutputFile="vc_x64_mswud\propgrid_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\propgrid"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\propgrid"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\propgrid\"
-				ProgramDataBaseFileName="vc_mswu_x64\propgrid.pdb"
+				ObjectFile="vc_x64_mswu\propgrid\"
+				ProgramDataBaseFileName="vc_x64_mswu\propgrid.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_propgrid.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\propgrid.exe"
+				OutputFile="vc_x64_mswu\propgrid.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\propgrid.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\propgrid.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\propgrid_vc8.bsc"
+				OutputFile="vc_x64_mswu\propgrid_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\propgrid"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\propgrid"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\propgrid\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\propgrid.pdb"
+				ObjectFile="vc_x64_mswuddll\propgrid\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\propgrid.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_propgrid.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\propgrid.exe"
+				OutputFile="vc_x64_mswuddll\propgrid.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\propgrid.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\propgrid.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\propgrid_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\propgrid_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\propgrid"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\propgrid"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\propgrid\"
-				ProgramDataBaseFileName="vc_mswudll_x64\propgrid.pdb"
+				ObjectFile="vc_x64_mswudll\propgrid\"
+				ProgramDataBaseFileName="vc_x64_mswudll\propgrid.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_propgrid.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\propgrid.exe"
+				OutputFile="vc_x64_mswudll\propgrid.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\propgrid.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\propgrid.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\propgrid_vc8.bsc"
+				OutputFile="vc_x64_mswudll\propgrid_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/propgrid/propgrid_vc9.vcproj b/samples/propgrid/propgrid_vc9.vcproj
index d987731141..e62f774e67 100644
--- a/samples/propgrid/propgrid_vc9.vcproj
+++ b/samples/propgrid/propgrid_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\propgrid"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\propgrid"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\propgrid\"
-				ProgramDataBaseFileName="vc_mswud_x64\propgrid.pdb"
+				ObjectFile="vc_x64_mswud\propgrid\"
+				ProgramDataBaseFileName="vc_x64_mswud\propgrid.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_propgrid.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\propgrid.exe"
+				OutputFile="vc_x64_mswud\propgrid.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\propgrid.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\propgrid.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\propgrid_vc9.bsc"
+				OutputFile="vc_x64_mswud\propgrid_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\propgrid"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\propgrid"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\propgrid\"
-				ProgramDataBaseFileName="vc_mswu_x64\propgrid.pdb"
+				ObjectFile="vc_x64_mswu\propgrid\"
+				ProgramDataBaseFileName="vc_x64_mswu\propgrid.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_propgrid.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\propgrid.exe"
+				OutputFile="vc_x64_mswu\propgrid.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\propgrid.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\propgrid.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\propgrid_vc9.bsc"
+				OutputFile="vc_x64_mswu\propgrid_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\propgrid"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\propgrid"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\propgrid\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\propgrid.pdb"
+				ObjectFile="vc_x64_mswuddll\propgrid\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\propgrid.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_propgrid.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\propgrid.exe"
+				OutputFile="vc_x64_mswuddll\propgrid.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\propgrid.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\propgrid.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\propgrid_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\propgrid_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\propgrid"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\propgrid"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\propgrid\"
-				ProgramDataBaseFileName="vc_mswudll_x64\propgrid.pdb"
+				ObjectFile="vc_x64_mswudll\propgrid\"
+				ProgramDataBaseFileName="vc_x64_mswudll\propgrid.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_propgrid.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\propgrid.exe"
+				OutputFile="vc_x64_mswudll\propgrid.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\propgrid.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\propgrid.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\propgrid_vc9.bsc"
+				OutputFile="vc_x64_mswudll\propgrid_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/regtest/makefile.vc b/samples/regtest/makefile.vc
index bc6f0287ba..e9281be32f 100644
--- a/samples/regtest/makefile.vc
+++ b/samples/regtest/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/regtest/regtest_vc8.vcproj b/samples/regtest/regtest_vc8.vcproj
index 5fe2f8393d..f5ab44b4e1 100644
--- a/samples/regtest/regtest_vc8.vcproj
+++ b/samples/regtest/regtest_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\regtest"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\regtest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\regtest\"
-				ProgramDataBaseFileName="vc_mswud_x64\regtest.pdb"
+				ObjectFile="vc_x64_mswud\regtest\"
+				ProgramDataBaseFileName="vc_x64_mswud\regtest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\regtest.exe"
+				OutputFile="vc_x64_mswud\regtest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\regtest.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\regtest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\regtest_vc8.bsc"
+				OutputFile="vc_x64_mswud\regtest_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\regtest"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\regtest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\regtest\"
-				ProgramDataBaseFileName="vc_mswu_x64\regtest.pdb"
+				ObjectFile="vc_x64_mswu\regtest\"
+				ProgramDataBaseFileName="vc_x64_mswu\regtest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\regtest.exe"
+				OutputFile="vc_x64_mswu\regtest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\regtest.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\regtest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\regtest_vc8.bsc"
+				OutputFile="vc_x64_mswu\regtest_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\regtest"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\regtest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\regtest\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\regtest.pdb"
+				ObjectFile="vc_x64_mswuddll\regtest\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\regtest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\regtest.exe"
+				OutputFile="vc_x64_mswuddll\regtest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\regtest.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\regtest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\regtest_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\regtest_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\regtest"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\regtest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\regtest\"
-				ProgramDataBaseFileName="vc_mswudll_x64\regtest.pdb"
+				ObjectFile="vc_x64_mswudll\regtest\"
+				ProgramDataBaseFileName="vc_x64_mswudll\regtest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\regtest.exe"
+				OutputFile="vc_x64_mswudll\regtest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\regtest.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\regtest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\regtest_vc8.bsc"
+				OutputFile="vc_x64_mswudll\regtest_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/regtest/regtest_vc9.vcproj b/samples/regtest/regtest_vc9.vcproj
index c6e6c07ca3..a23956590d 100644
--- a/samples/regtest/regtest_vc9.vcproj
+++ b/samples/regtest/regtest_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\regtest"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\regtest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\regtest\"
-				ProgramDataBaseFileName="vc_mswud_x64\regtest.pdb"
+				ObjectFile="vc_x64_mswud\regtest\"
+				ProgramDataBaseFileName="vc_x64_mswud\regtest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\regtest.exe"
+				OutputFile="vc_x64_mswud\regtest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\regtest.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\regtest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\regtest_vc9.bsc"
+				OutputFile="vc_x64_mswud\regtest_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\regtest"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\regtest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\regtest\"
-				ProgramDataBaseFileName="vc_mswu_x64\regtest.pdb"
+				ObjectFile="vc_x64_mswu\regtest\"
+				ProgramDataBaseFileName="vc_x64_mswu\regtest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\regtest.exe"
+				OutputFile="vc_x64_mswu\regtest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\regtest.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\regtest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\regtest_vc9.bsc"
+				OutputFile="vc_x64_mswu\regtest_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\regtest"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\regtest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\regtest\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\regtest.pdb"
+				ObjectFile="vc_x64_mswuddll\regtest\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\regtest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\regtest.exe"
+				OutputFile="vc_x64_mswuddll\regtest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\regtest.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\regtest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\regtest_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\regtest_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\regtest"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\regtest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\regtest\"
-				ProgramDataBaseFileName="vc_mswudll_x64\regtest.pdb"
+				ObjectFile="vc_x64_mswudll\regtest\"
+				ProgramDataBaseFileName="vc_x64_mswudll\regtest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\regtest.exe"
+				OutputFile="vc_x64_mswudll\regtest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\regtest.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\regtest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\regtest_vc9.bsc"
+				OutputFile="vc_x64_mswudll\regtest_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/render/makefile.vc b/samples/render/makefile.vc
index 02bed7aad5..e2c2c13048 100644
--- a/samples/render/makefile.vc
+++ b/samples/render/makefile.vc
@@ -16,7 +16,7 @@ WX_RELEASE_NODOT = 31
 WX_VERSION_NODOT = $(WX_RELEASE_NODOT)6
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/render/render_vc8_renddll.vcproj b/samples/render/render_vc8_renddll.vcproj
index 088a3915d5..628bf97300 100644
--- a/samples/render/render_vc8_renddll.vcproj
+++ b/samples/render/render_vc8_renddll.vcproj
@@ -205,8 +205,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\renddll"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\renddll"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -240,8 +240,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\renddll\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\renddll_mswud316_vc.pdb"
+				ObjectFile="vc_x64_mswuddll\renddll\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\renddll_mswud316_vc.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -263,13 +263,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\renddll_mswud316_vc.dll"
+				OutputFile="vc_x64_mswuddll\renddll_mswud316_vc.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\renddll_mswud316_vc.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\renddll_mswud316_vc.pdb"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -283,7 +283,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\render_vc8_renddll.bsc"
+				OutputFile="vc_x64_mswuddll\render_vc8_renddll.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -295,8 +295,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\renddll"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\renddll"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -327,8 +327,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\renddll\"
-				ProgramDataBaseFileName="vc_mswudll_x64\renddll_mswu316_vc.pdb"
+				ObjectFile="vc_x64_mswudll\renddll\"
+				ProgramDataBaseFileName="vc_x64_mswudll\renddll_mswu316_vc.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -350,13 +350,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\renddll_mswu316_vc.dll"
+				OutputFile="vc_x64_mswudll\renddll_mswu316_vc.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\renddll_mswu316_vc.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\renddll_mswu316_vc.pdb"
 				TargetMachine="17"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -372,7 +372,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\render_vc8_renddll.bsc"
+				OutputFile="vc_x64_mswudll\render_vc8_renddll.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/render/render_vc8_render.vcproj b/samples/render/render_vc8_render.vcproj
index 935667d967..3fe3c30b13 100644
--- a/samples/render/render_vc8_render.vcproj
+++ b/samples/render/render_vc8_render.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\render"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\render"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\render\"
-				ProgramDataBaseFileName="vc_mswud_x64\render.pdb"
+				ObjectFile="vc_x64_mswud\render\"
+				ProgramDataBaseFileName="vc_x64_mswud\render.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\render.exe"
+				OutputFile="vc_x64_mswud\render.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\render.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\render.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\render_vc8_render.bsc"
+				OutputFile="vc_x64_mswud\render_vc8_render.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\render"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\render"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\render\"
-				ProgramDataBaseFileName="vc_mswu_x64\render.pdb"
+				ObjectFile="vc_x64_mswu\render\"
+				ProgramDataBaseFileName="vc_x64_mswu\render.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\render.exe"
+				OutputFile="vc_x64_mswu\render.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\render.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\render.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\render_vc8_render.bsc"
+				OutputFile="vc_x64_mswu\render_vc8_render.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\render"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\render"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\render\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\render.pdb"
+				ObjectFile="vc_x64_mswuddll\render\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\render.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\render.exe"
+				OutputFile="vc_x64_mswuddll\render.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\render.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\render.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\render_vc8_render.bsc"
+				OutputFile="vc_x64_mswuddll\render_vc8_render.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\render"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\render"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\render\"
-				ProgramDataBaseFileName="vc_mswudll_x64\render.pdb"
+				ObjectFile="vc_x64_mswudll\render\"
+				ProgramDataBaseFileName="vc_x64_mswudll\render.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\render.exe"
+				OutputFile="vc_x64_mswudll\render.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\render.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\render.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\render_vc8_render.bsc"
+				OutputFile="vc_x64_mswudll\render_vc8_render.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/render/render_vc9_renddll.vcproj b/samples/render/render_vc9_renddll.vcproj
index c88af2e387..3e351f3f81 100644
--- a/samples/render/render_vc9_renddll.vcproj
+++ b/samples/render/render_vc9_renddll.vcproj
@@ -204,8 +204,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\renddll"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\renddll"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -239,8 +239,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\renddll\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\renddll_mswud316_vc.pdb"
+				ObjectFile="vc_x64_mswuddll\renddll\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\renddll_mswud316_vc.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -261,13 +261,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\renddll_mswud316_vc.dll"
+				OutputFile="vc_x64_mswuddll\renddll_mswud316_vc.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\renddll_mswud316_vc.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\renddll_mswud316_vc.pdb"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -281,7 +281,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\render_vc9_renddll.bsc"
+				OutputFile="vc_x64_mswuddll\render_vc9_renddll.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -293,8 +293,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\renddll"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\renddll"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -326,8 +326,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\renddll\"
-				ProgramDataBaseFileName="vc_mswudll_x64\renddll_mswu316_vc.pdb"
+				ObjectFile="vc_x64_mswudll\renddll\"
+				ProgramDataBaseFileName="vc_x64_mswudll\renddll_mswu316_vc.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -348,13 +348,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\renddll_mswu316_vc.dll"
+				OutputFile="vc_x64_mswudll\renddll_mswu316_vc.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\renddll_mswu316_vc.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\renddll_mswu316_vc.pdb"
 				TargetMachine="17"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -370,7 +370,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\render_vc9_renddll.bsc"
+				OutputFile="vc_x64_mswudll\render_vc9_renddll.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/render/render_vc9_render.vcproj b/samples/render/render_vc9_render.vcproj
index 6e5a06d914..c165bdce64 100644
--- a/samples/render/render_vc9_render.vcproj
+++ b/samples/render/render_vc9_render.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\render"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\render"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\render\"
-				ProgramDataBaseFileName="vc_mswud_x64\render.pdb"
+				ObjectFile="vc_x64_mswud\render\"
+				ProgramDataBaseFileName="vc_x64_mswud\render.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\render.exe"
+				OutputFile="vc_x64_mswud\render.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\render.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\render.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\render_vc9_render.bsc"
+				OutputFile="vc_x64_mswud\render_vc9_render.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\render"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\render"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\render\"
-				ProgramDataBaseFileName="vc_mswu_x64\render.pdb"
+				ObjectFile="vc_x64_mswu\render\"
+				ProgramDataBaseFileName="vc_x64_mswu\render.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\render.exe"
+				OutputFile="vc_x64_mswu\render.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\render.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\render.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\render_vc9_render.bsc"
+				OutputFile="vc_x64_mswu\render_vc9_render.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\render"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\render"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\render\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\render.pdb"
+				ObjectFile="vc_x64_mswuddll\render\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\render.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\render.exe"
+				OutputFile="vc_x64_mswuddll\render.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\render.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\render.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\render_vc9_render.bsc"
+				OutputFile="vc_x64_mswuddll\render_vc9_render.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\render"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\render"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\render\"
-				ProgramDataBaseFileName="vc_mswudll_x64\render.pdb"
+				ObjectFile="vc_x64_mswudll\render\"
+				ProgramDataBaseFileName="vc_x64_mswudll\render.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\render.exe"
+				OutputFile="vc_x64_mswudll\render.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\render.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\render.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\render_vc9_render.bsc"
+				OutputFile="vc_x64_mswudll\render_vc9_render.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/ribbon/makefile.vc b/samples/ribbon/makefile.vc
index 396f6e20ba..da683a5465 100644
--- a/samples/ribbon/makefile.vc
+++ b/samples/ribbon/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/ribbon/ribbon_vc8.vcproj b/samples/ribbon/ribbon_vc8.vcproj
index c83654d9d3..255bec1be4 100644
--- a/samples/ribbon/ribbon_vc8.vcproj
+++ b/samples/ribbon/ribbon_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\ribbon"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\ribbon"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\ribbon\"
-				ProgramDataBaseFileName="vc_mswud_x64\ribbon.pdb"
+				ObjectFile="vc_x64_mswud\ribbon\"
+				ProgramDataBaseFileName="vc_x64_mswud\ribbon.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_ribbon.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\ribbon.exe"
+				OutputFile="vc_x64_mswud\ribbon.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\ribbon.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\ribbon.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\ribbon_vc8.bsc"
+				OutputFile="vc_x64_mswud\ribbon_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\ribbon"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\ribbon"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\ribbon\"
-				ProgramDataBaseFileName="vc_mswu_x64\ribbon.pdb"
+				ObjectFile="vc_x64_mswu\ribbon\"
+				ProgramDataBaseFileName="vc_x64_mswu\ribbon.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_ribbon.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\ribbon.exe"
+				OutputFile="vc_x64_mswu\ribbon.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\ribbon.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\ribbon.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\ribbon_vc8.bsc"
+				OutputFile="vc_x64_mswu\ribbon_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\ribbon"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\ribbon"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\ribbon\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\ribbon.pdb"
+				ObjectFile="vc_x64_mswuddll\ribbon\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\ribbon.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_ribbon.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\ribbon.exe"
+				OutputFile="vc_x64_mswuddll\ribbon.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\ribbon.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\ribbon.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\ribbon_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\ribbon_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\ribbon"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\ribbon"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\ribbon\"
-				ProgramDataBaseFileName="vc_mswudll_x64\ribbon.pdb"
+				ObjectFile="vc_x64_mswudll\ribbon\"
+				ProgramDataBaseFileName="vc_x64_mswudll\ribbon.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_ribbon.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\ribbon.exe"
+				OutputFile="vc_x64_mswudll\ribbon.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\ribbon.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\ribbon.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\ribbon_vc8.bsc"
+				OutputFile="vc_x64_mswudll\ribbon_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/ribbon/ribbon_vc9.vcproj b/samples/ribbon/ribbon_vc9.vcproj
index 3c8730a3a3..596da3212c 100644
--- a/samples/ribbon/ribbon_vc9.vcproj
+++ b/samples/ribbon/ribbon_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\ribbon"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\ribbon"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\ribbon\"
-				ProgramDataBaseFileName="vc_mswud_x64\ribbon.pdb"
+				ObjectFile="vc_x64_mswud\ribbon\"
+				ProgramDataBaseFileName="vc_x64_mswud\ribbon.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_ribbon.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\ribbon.exe"
+				OutputFile="vc_x64_mswud\ribbon.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\ribbon.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\ribbon.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\ribbon_vc9.bsc"
+				OutputFile="vc_x64_mswud\ribbon_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\ribbon"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\ribbon"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\ribbon\"
-				ProgramDataBaseFileName="vc_mswu_x64\ribbon.pdb"
+				ObjectFile="vc_x64_mswu\ribbon\"
+				ProgramDataBaseFileName="vc_x64_mswu\ribbon.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_ribbon.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\ribbon.exe"
+				OutputFile="vc_x64_mswu\ribbon.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\ribbon.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\ribbon.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\ribbon_vc9.bsc"
+				OutputFile="vc_x64_mswu\ribbon_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\ribbon"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\ribbon"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\ribbon\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\ribbon.pdb"
+				ObjectFile="vc_x64_mswuddll\ribbon\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\ribbon.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_ribbon.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\ribbon.exe"
+				OutputFile="vc_x64_mswuddll\ribbon.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\ribbon.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\ribbon.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\ribbon_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\ribbon_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\ribbon"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\ribbon"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\ribbon\"
-				ProgramDataBaseFileName="vc_mswudll_x64\ribbon.pdb"
+				ObjectFile="vc_x64_mswudll\ribbon\"
+				ProgramDataBaseFileName="vc_x64_mswudll\ribbon.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_ribbon.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\ribbon.exe"
+				OutputFile="vc_x64_mswudll\ribbon.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\ribbon.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\ribbon.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\ribbon_vc9.bsc"
+				OutputFile="vc_x64_mswudll\ribbon_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/richtext/makefile.vc b/samples/richtext/makefile.vc
index a79c34bc6d..e7156c6dd8 100644
--- a/samples/richtext/makefile.vc
+++ b/samples/richtext/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/richtext/richtext_vc8.vcproj b/samples/richtext/richtext_vc8.vcproj
index b686efd821..80dd2eb74a 100644
--- a/samples/richtext/richtext_vc8.vcproj
+++ b/samples/richtext/richtext_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\richtext"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\richtext"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\richtext\"
-				ProgramDataBaseFileName="vc_mswud_x64\richtext.pdb"
+				ObjectFile="vc_x64_mswud\richtext\"
+				ProgramDataBaseFileName="vc_x64_mswud\richtext.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_richtext.lib  wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud_xml.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\richtext.exe"
+				OutputFile="vc_x64_mswud\richtext.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\richtext.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\richtext.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\richtext_vc8.bsc"
+				OutputFile="vc_x64_mswud\richtext_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\richtext"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\richtext"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\richtext\"
-				ProgramDataBaseFileName="vc_mswu_x64\richtext.pdb"
+				ObjectFile="vc_x64_mswu\richtext\"
+				ProgramDataBaseFileName="vc_x64_mswu\richtext.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_richtext.lib  wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u_xml.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\richtext.exe"
+				OutputFile="vc_x64_mswu\richtext.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\richtext.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\richtext.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\richtext_vc8.bsc"
+				OutputFile="vc_x64_mswu\richtext_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\richtext"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\richtext"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\richtext\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\richtext.pdb"
+				ObjectFile="vc_x64_mswuddll\richtext\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\richtext.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_richtext.lib  wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud_xml.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\richtext.exe"
+				OutputFile="vc_x64_mswuddll\richtext.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\richtext.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\richtext.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\richtext_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\richtext_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\richtext"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\richtext"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\richtext\"
-				ProgramDataBaseFileName="vc_mswudll_x64\richtext.pdb"
+				ObjectFile="vc_x64_mswudll\richtext\"
+				ProgramDataBaseFileName="vc_x64_mswudll\richtext.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_richtext.lib  wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u_xml.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\richtext.exe"
+				OutputFile="vc_x64_mswudll\richtext.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\richtext.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\richtext.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\richtext_vc8.bsc"
+				OutputFile="vc_x64_mswudll\richtext_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/richtext/richtext_vc9.vcproj b/samples/richtext/richtext_vc9.vcproj
index adf0eb4a01..71af1869fa 100644
--- a/samples/richtext/richtext_vc9.vcproj
+++ b/samples/richtext/richtext_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\richtext"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\richtext"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\richtext\"
-				ProgramDataBaseFileName="vc_mswud_x64\richtext.pdb"
+				ObjectFile="vc_x64_mswud\richtext\"
+				ProgramDataBaseFileName="vc_x64_mswud\richtext.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_richtext.lib  wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud_xml.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\richtext.exe"
+				OutputFile="vc_x64_mswud\richtext.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\richtext.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\richtext.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\richtext_vc9.bsc"
+				OutputFile="vc_x64_mswud\richtext_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\richtext"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\richtext"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\richtext\"
-				ProgramDataBaseFileName="vc_mswu_x64\richtext.pdb"
+				ObjectFile="vc_x64_mswu\richtext\"
+				ProgramDataBaseFileName="vc_x64_mswu\richtext.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_richtext.lib  wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u_xml.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\richtext.exe"
+				OutputFile="vc_x64_mswu\richtext.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\richtext.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\richtext.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\richtext_vc9.bsc"
+				OutputFile="vc_x64_mswu\richtext_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\richtext"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\richtext"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\richtext\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\richtext.pdb"
+				ObjectFile="vc_x64_mswuddll\richtext\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\richtext.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_richtext.lib  wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud_xml.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\richtext.exe"
+				OutputFile="vc_x64_mswuddll\richtext.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\richtext.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\richtext.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\richtext_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\richtext_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\richtext"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\richtext"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\richtext\"
-				ProgramDataBaseFileName="vc_mswudll_x64\richtext.pdb"
+				ObjectFile="vc_x64_mswudll\richtext\"
+				ProgramDataBaseFileName="vc_x64_mswudll\richtext.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_richtext.lib  wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u_xml.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\richtext.exe"
+				OutputFile="vc_x64_mswudll\richtext.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\richtext.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\richtext.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\richtext_vc9.bsc"
+				OutputFile="vc_x64_mswudll\richtext_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/sashtest/makefile.vc b/samples/sashtest/makefile.vc
index eb28415770..202d608dfc 100644
--- a/samples/sashtest/makefile.vc
+++ b/samples/sashtest/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/sashtest/sashtest_vc8.vcproj b/samples/sashtest/sashtest_vc8.vcproj
index bf6774a17b..0986a75887 100644
--- a/samples/sashtest/sashtest_vc8.vcproj
+++ b/samples/sashtest/sashtest_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\sashtest"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\sashtest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\sashtest\"
-				ProgramDataBaseFileName="vc_mswud_x64\sashtest.pdb"
+				ObjectFile="vc_x64_mswud\sashtest\"
+				ProgramDataBaseFileName="vc_x64_mswud\sashtest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\sashtest.exe"
+				OutputFile="vc_x64_mswud\sashtest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\sashtest.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\sashtest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\sashtest_vc8.bsc"
+				OutputFile="vc_x64_mswud\sashtest_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\sashtest"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\sashtest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\sashtest\"
-				ProgramDataBaseFileName="vc_mswu_x64\sashtest.pdb"
+				ObjectFile="vc_x64_mswu\sashtest\"
+				ProgramDataBaseFileName="vc_x64_mswu\sashtest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\sashtest.exe"
+				OutputFile="vc_x64_mswu\sashtest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\sashtest.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\sashtest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\sashtest_vc8.bsc"
+				OutputFile="vc_x64_mswu\sashtest_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\sashtest"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\sashtest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\sashtest\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\sashtest.pdb"
+				ObjectFile="vc_x64_mswuddll\sashtest\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\sashtest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\sashtest.exe"
+				OutputFile="vc_x64_mswuddll\sashtest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\sashtest.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\sashtest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\sashtest_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\sashtest_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\sashtest"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\sashtest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\sashtest\"
-				ProgramDataBaseFileName="vc_mswudll_x64\sashtest.pdb"
+				ObjectFile="vc_x64_mswudll\sashtest\"
+				ProgramDataBaseFileName="vc_x64_mswudll\sashtest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\sashtest.exe"
+				OutputFile="vc_x64_mswudll\sashtest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\sashtest.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\sashtest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\sashtest_vc8.bsc"
+				OutputFile="vc_x64_mswudll\sashtest_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/sashtest/sashtest_vc9.vcproj b/samples/sashtest/sashtest_vc9.vcproj
index 928c030934..9b0fa52bcc 100644
--- a/samples/sashtest/sashtest_vc9.vcproj
+++ b/samples/sashtest/sashtest_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\sashtest"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\sashtest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\sashtest\"
-				ProgramDataBaseFileName="vc_mswud_x64\sashtest.pdb"
+				ObjectFile="vc_x64_mswud\sashtest\"
+				ProgramDataBaseFileName="vc_x64_mswud\sashtest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\sashtest.exe"
+				OutputFile="vc_x64_mswud\sashtest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\sashtest.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\sashtest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\sashtest_vc9.bsc"
+				OutputFile="vc_x64_mswud\sashtest_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\sashtest"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\sashtest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\sashtest\"
-				ProgramDataBaseFileName="vc_mswu_x64\sashtest.pdb"
+				ObjectFile="vc_x64_mswu\sashtest\"
+				ProgramDataBaseFileName="vc_x64_mswu\sashtest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\sashtest.exe"
+				OutputFile="vc_x64_mswu\sashtest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\sashtest.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\sashtest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\sashtest_vc9.bsc"
+				OutputFile="vc_x64_mswu\sashtest_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\sashtest"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\sashtest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\sashtest\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\sashtest.pdb"
+				ObjectFile="vc_x64_mswuddll\sashtest\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\sashtest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\sashtest.exe"
+				OutputFile="vc_x64_mswuddll\sashtest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\sashtest.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\sashtest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\sashtest_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\sashtest_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\sashtest"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\sashtest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\sashtest\"
-				ProgramDataBaseFileName="vc_mswudll_x64\sashtest.pdb"
+				ObjectFile="vc_x64_mswudll\sashtest\"
+				ProgramDataBaseFileName="vc_x64_mswudll\sashtest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\sashtest.exe"
+				OutputFile="vc_x64_mswudll\sashtest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\sashtest.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\sashtest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\sashtest_vc9.bsc"
+				OutputFile="vc_x64_mswudll\sashtest_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/scroll/makefile.vc b/samples/scroll/makefile.vc
index 33ec4047a6..65ebc6933d 100644
--- a/samples/scroll/makefile.vc
+++ b/samples/scroll/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/scroll/scroll_vc8.vcproj b/samples/scroll/scroll_vc8.vcproj
index 3c0cc55219..3acc8f61e5 100644
--- a/samples/scroll/scroll_vc8.vcproj
+++ b/samples/scroll/scroll_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\scroll"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\scroll"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\scroll\"
-				ProgramDataBaseFileName="vc_mswud_x64\scroll.pdb"
+				ObjectFile="vc_x64_mswud\scroll\"
+				ProgramDataBaseFileName="vc_x64_mswud\scroll.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\scroll.exe"
+				OutputFile="vc_x64_mswud\scroll.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\scroll.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\scroll.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\scroll_vc8.bsc"
+				OutputFile="vc_x64_mswud\scroll_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\scroll"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\scroll"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\scroll\"
-				ProgramDataBaseFileName="vc_mswu_x64\scroll.pdb"
+				ObjectFile="vc_x64_mswu\scroll\"
+				ProgramDataBaseFileName="vc_x64_mswu\scroll.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\scroll.exe"
+				OutputFile="vc_x64_mswu\scroll.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\scroll.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\scroll.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\scroll_vc8.bsc"
+				OutputFile="vc_x64_mswu\scroll_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\scroll"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\scroll"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\scroll\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\scroll.pdb"
+				ObjectFile="vc_x64_mswuddll\scroll\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\scroll.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\scroll.exe"
+				OutputFile="vc_x64_mswuddll\scroll.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\scroll.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\scroll.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\scroll_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\scroll_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\scroll"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\scroll"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\scroll\"
-				ProgramDataBaseFileName="vc_mswudll_x64\scroll.pdb"
+				ObjectFile="vc_x64_mswudll\scroll\"
+				ProgramDataBaseFileName="vc_x64_mswudll\scroll.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\scroll.exe"
+				OutputFile="vc_x64_mswudll\scroll.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\scroll.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\scroll.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\scroll_vc8.bsc"
+				OutputFile="vc_x64_mswudll\scroll_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/scroll/scroll_vc9.vcproj b/samples/scroll/scroll_vc9.vcproj
index 3fda6f74aa..4925ef0c6f 100644
--- a/samples/scroll/scroll_vc9.vcproj
+++ b/samples/scroll/scroll_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\scroll"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\scroll"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\scroll\"
-				ProgramDataBaseFileName="vc_mswud_x64\scroll.pdb"
+				ObjectFile="vc_x64_mswud\scroll\"
+				ProgramDataBaseFileName="vc_x64_mswud\scroll.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\scroll.exe"
+				OutputFile="vc_x64_mswud\scroll.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\scroll.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\scroll.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\scroll_vc9.bsc"
+				OutputFile="vc_x64_mswud\scroll_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\scroll"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\scroll"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\scroll\"
-				ProgramDataBaseFileName="vc_mswu_x64\scroll.pdb"
+				ObjectFile="vc_x64_mswu\scroll\"
+				ProgramDataBaseFileName="vc_x64_mswu\scroll.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\scroll.exe"
+				OutputFile="vc_x64_mswu\scroll.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\scroll.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\scroll.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\scroll_vc9.bsc"
+				OutputFile="vc_x64_mswu\scroll_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\scroll"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\scroll"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\scroll\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\scroll.pdb"
+				ObjectFile="vc_x64_mswuddll\scroll\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\scroll.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\scroll.exe"
+				OutputFile="vc_x64_mswuddll\scroll.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\scroll.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\scroll.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\scroll_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\scroll_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\scroll"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\scroll"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\scroll\"
-				ProgramDataBaseFileName="vc_mswudll_x64\scroll.pdb"
+				ObjectFile="vc_x64_mswudll\scroll\"
+				ProgramDataBaseFileName="vc_x64_mswudll\scroll.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\scroll.exe"
+				OutputFile="vc_x64_mswudll\scroll.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\scroll.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\scroll.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\scroll_vc9.bsc"
+				OutputFile="vc_x64_mswudll\scroll_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/secretstore/makefile.vc b/samples/secretstore/makefile.vc
index 0c66e95a17..2fc72e989f 100644
--- a/samples/secretstore/makefile.vc
+++ b/samples/secretstore/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/secretstore/secretstore_vc8.vcproj b/samples/secretstore/secretstore_vc8.vcproj
index beca9d5919..d0f90839f0 100644
--- a/samples/secretstore/secretstore_vc8.vcproj
+++ b/samples/secretstore/secretstore_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\secretstore"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\secretstore"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\secretstore\"
-				ProgramDataBaseFileName="vc_mswud_x64\secretstore.pdb"
+				ObjectFile="vc_x64_mswud\secretstore\"
+				ProgramDataBaseFileName="vc_x64_mswud\secretstore.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\secretstore.exe"
+				OutputFile="vc_x64_mswud\secretstore.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\secretstore.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\secretstore.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\secretstore_vc8.bsc"
+				OutputFile="vc_x64_mswud\secretstore_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\secretstore"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\secretstore"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\secretstore\"
-				ProgramDataBaseFileName="vc_mswu_x64\secretstore.pdb"
+				ObjectFile="vc_x64_mswu\secretstore\"
+				ProgramDataBaseFileName="vc_x64_mswu\secretstore.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\secretstore.exe"
+				OutputFile="vc_x64_mswu\secretstore.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\secretstore.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\secretstore.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\secretstore_vc8.bsc"
+				OutputFile="vc_x64_mswu\secretstore_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\secretstore"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\secretstore"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\secretstore\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\secretstore.pdb"
+				ObjectFile="vc_x64_mswuddll\secretstore\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\secretstore.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\secretstore.exe"
+				OutputFile="vc_x64_mswuddll\secretstore.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\secretstore.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\secretstore.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\secretstore_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\secretstore_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\secretstore"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\secretstore"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\secretstore\"
-				ProgramDataBaseFileName="vc_mswudll_x64\secretstore.pdb"
+				ObjectFile="vc_x64_mswudll\secretstore\"
+				ProgramDataBaseFileName="vc_x64_mswudll\secretstore.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\secretstore.exe"
+				OutputFile="vc_x64_mswudll\secretstore.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\secretstore.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\secretstore.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\secretstore_vc8.bsc"
+				OutputFile="vc_x64_mswudll\secretstore_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/secretstore/secretstore_vc9.vcproj b/samples/secretstore/secretstore_vc9.vcproj
index 3c7db203d3..bf8637dc86 100644
--- a/samples/secretstore/secretstore_vc9.vcproj
+++ b/samples/secretstore/secretstore_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\secretstore"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\secretstore"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\secretstore\"
-				ProgramDataBaseFileName="vc_mswud_x64\secretstore.pdb"
+				ObjectFile="vc_x64_mswud\secretstore\"
+				ProgramDataBaseFileName="vc_x64_mswud\secretstore.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\secretstore.exe"
+				OutputFile="vc_x64_mswud\secretstore.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\secretstore.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\secretstore.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\secretstore_vc9.bsc"
+				OutputFile="vc_x64_mswud\secretstore_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\secretstore"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\secretstore"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\secretstore\"
-				ProgramDataBaseFileName="vc_mswu_x64\secretstore.pdb"
+				ObjectFile="vc_x64_mswu\secretstore\"
+				ProgramDataBaseFileName="vc_x64_mswu\secretstore.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\secretstore.exe"
+				OutputFile="vc_x64_mswu\secretstore.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\secretstore.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\secretstore.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\secretstore_vc9.bsc"
+				OutputFile="vc_x64_mswu\secretstore_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\secretstore"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\secretstore"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\secretstore\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\secretstore.pdb"
+				ObjectFile="vc_x64_mswuddll\secretstore\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\secretstore.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\secretstore.exe"
+				OutputFile="vc_x64_mswuddll\secretstore.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\secretstore.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\secretstore.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\secretstore_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\secretstore_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\secretstore"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\secretstore"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\secretstore\"
-				ProgramDataBaseFileName="vc_mswudll_x64\secretstore.pdb"
+				ObjectFile="vc_x64_mswudll\secretstore\"
+				ProgramDataBaseFileName="vc_x64_mswudll\secretstore.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\secretstore.exe"
+				OutputFile="vc_x64_mswudll\secretstore.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\secretstore.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\secretstore.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\secretstore_vc9.bsc"
+				OutputFile="vc_x64_mswudll\secretstore_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/shaped/makefile.vc b/samples/shaped/makefile.vc
index 4ac154a07a..2e92f7cc6f 100644
--- a/samples/shaped/makefile.vc
+++ b/samples/shaped/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/shaped/shaped_vc8.vcproj b/samples/shaped/shaped_vc8.vcproj
index 6276cb14f5..386ecdb39f 100644
--- a/samples/shaped/shaped_vc8.vcproj
+++ b/samples/shaped/shaped_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\shaped"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\shaped"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\shaped\"
-				ProgramDataBaseFileName="vc_mswud_x64\shaped.pdb"
+				ObjectFile="vc_x64_mswud\shaped\"
+				ProgramDataBaseFileName="vc_x64_mswud\shaped.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\shaped.exe"
+				OutputFile="vc_x64_mswud\shaped.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\shaped.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\shaped.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\shaped_vc8.bsc"
+				OutputFile="vc_x64_mswud\shaped_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\shaped"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\shaped"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\shaped\"
-				ProgramDataBaseFileName="vc_mswu_x64\shaped.pdb"
+				ObjectFile="vc_x64_mswu\shaped\"
+				ProgramDataBaseFileName="vc_x64_mswu\shaped.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\shaped.exe"
+				OutputFile="vc_x64_mswu\shaped.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\shaped.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\shaped.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\shaped_vc8.bsc"
+				OutputFile="vc_x64_mswu\shaped_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\shaped"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\shaped"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\shaped\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\shaped.pdb"
+				ObjectFile="vc_x64_mswuddll\shaped\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\shaped.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\shaped.exe"
+				OutputFile="vc_x64_mswuddll\shaped.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\shaped.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\shaped.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\shaped_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\shaped_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\shaped"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\shaped"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\shaped\"
-				ProgramDataBaseFileName="vc_mswudll_x64\shaped.pdb"
+				ObjectFile="vc_x64_mswudll\shaped\"
+				ProgramDataBaseFileName="vc_x64_mswudll\shaped.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\shaped.exe"
+				OutputFile="vc_x64_mswudll\shaped.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\shaped.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\shaped.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\shaped_vc8.bsc"
+				OutputFile="vc_x64_mswudll\shaped_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/shaped/shaped_vc9.vcproj b/samples/shaped/shaped_vc9.vcproj
index 81878cdefb..8f880ae1e8 100644
--- a/samples/shaped/shaped_vc9.vcproj
+++ b/samples/shaped/shaped_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\shaped"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\shaped"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\shaped\"
-				ProgramDataBaseFileName="vc_mswud_x64\shaped.pdb"
+				ObjectFile="vc_x64_mswud\shaped\"
+				ProgramDataBaseFileName="vc_x64_mswud\shaped.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\shaped.exe"
+				OutputFile="vc_x64_mswud\shaped.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\shaped.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\shaped.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\shaped_vc9.bsc"
+				OutputFile="vc_x64_mswud\shaped_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\shaped"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\shaped"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\shaped\"
-				ProgramDataBaseFileName="vc_mswu_x64\shaped.pdb"
+				ObjectFile="vc_x64_mswu\shaped\"
+				ProgramDataBaseFileName="vc_x64_mswu\shaped.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\shaped.exe"
+				OutputFile="vc_x64_mswu\shaped.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\shaped.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\shaped.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\shaped_vc9.bsc"
+				OutputFile="vc_x64_mswu\shaped_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\shaped"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\shaped"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\shaped\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\shaped.pdb"
+				ObjectFile="vc_x64_mswuddll\shaped\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\shaped.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\shaped.exe"
+				OutputFile="vc_x64_mswuddll\shaped.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\shaped.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\shaped.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\shaped_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\shaped_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\shaped"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\shaped"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\shaped\"
-				ProgramDataBaseFileName="vc_mswudll_x64\shaped.pdb"
+				ObjectFile="vc_x64_mswudll\shaped\"
+				ProgramDataBaseFileName="vc_x64_mswudll\shaped.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\shaped.exe"
+				OutputFile="vc_x64_mswudll\shaped.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\shaped.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\shaped.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\shaped_vc9.bsc"
+				OutputFile="vc_x64_mswudll\shaped_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/sockets/makefile.vc b/samples/sockets/makefile.vc
index 35532641b7..2475403d91 100644
--- a/samples/sockets/makefile.vc
+++ b/samples/sockets/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/sockets/sockets_vc8_baseclient.vcproj b/samples/sockets/sockets_vc8_baseclient.vcproj
index b6c4de7245..43af5b9f51 100644
--- a/samples/sockets/sockets_vc8_baseclient.vcproj
+++ b/samples/sockets/sockets_vc8_baseclient.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\baseclient"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\baseclient"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\baseclient\"
-				ProgramDataBaseFileName="vc_mswud_x64\baseclient.pdb"
+				ObjectFile="vc_x64_mswud\baseclient\"
+				ProgramDataBaseFileName="vc_x64_mswud\baseclient.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud_net.lib  wxbase31ud.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\baseclient.exe"
+				OutputFile="vc_x64_mswud\baseclient.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\baseclient.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\baseclient.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\sockets_vc8_baseclient.bsc"
+				OutputFile="vc_x64_mswud\sockets_vc8_baseclient.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\baseclient"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\baseclient"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\baseclient\"
-				ProgramDataBaseFileName="vc_mswu_x64\baseclient.pdb"
+				ObjectFile="vc_x64_mswu\baseclient\"
+				ProgramDataBaseFileName="vc_x64_mswu\baseclient.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u_net.lib  wxbase31u.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\baseclient.exe"
+				OutputFile="vc_x64_mswu\baseclient.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\baseclient.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\baseclient.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\sockets_vc8_baseclient.bsc"
+				OutputFile="vc_x64_mswu\sockets_vc8_baseclient.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\baseclient"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\baseclient"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\baseclient\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\baseclient.pdb"
+				ObjectFile="vc_x64_mswuddll\baseclient\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\baseclient.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud_net.lib  wxbase31ud.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\baseclient.exe"
+				OutputFile="vc_x64_mswuddll\baseclient.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\baseclient.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\baseclient.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\sockets_vc8_baseclient.bsc"
+				OutputFile="vc_x64_mswuddll\sockets_vc8_baseclient.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\baseclient"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\baseclient"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\baseclient\"
-				ProgramDataBaseFileName="vc_mswudll_x64\baseclient.pdb"
+				ObjectFile="vc_x64_mswudll\baseclient\"
+				ProgramDataBaseFileName="vc_x64_mswudll\baseclient.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u_net.lib  wxbase31u.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\baseclient.exe"
+				OutputFile="vc_x64_mswudll\baseclient.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\baseclient.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\baseclient.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\sockets_vc8_baseclient.bsc"
+				OutputFile="vc_x64_mswudll\sockets_vc8_baseclient.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/sockets/sockets_vc8_baseserver.vcproj b/samples/sockets/sockets_vc8_baseserver.vcproj
index ff2107a55e..98b935a095 100644
--- a/samples/sockets/sockets_vc8_baseserver.vcproj
+++ b/samples/sockets/sockets_vc8_baseserver.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\baseserver"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\baseserver"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\baseserver\"
-				ProgramDataBaseFileName="vc_mswud_x64\baseserver.pdb"
+				ObjectFile="vc_x64_mswud\baseserver\"
+				ProgramDataBaseFileName="vc_x64_mswud\baseserver.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud_net.lib  wxbase31ud.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\baseserver.exe"
+				OutputFile="vc_x64_mswud\baseserver.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\baseserver.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\baseserver.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\sockets_vc8_baseserver.bsc"
+				OutputFile="vc_x64_mswud\sockets_vc8_baseserver.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\baseserver"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\baseserver"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\baseserver\"
-				ProgramDataBaseFileName="vc_mswu_x64\baseserver.pdb"
+				ObjectFile="vc_x64_mswu\baseserver\"
+				ProgramDataBaseFileName="vc_x64_mswu\baseserver.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u_net.lib  wxbase31u.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\baseserver.exe"
+				OutputFile="vc_x64_mswu\baseserver.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\baseserver.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\baseserver.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\sockets_vc8_baseserver.bsc"
+				OutputFile="vc_x64_mswu\sockets_vc8_baseserver.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\baseserver"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\baseserver"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\baseserver\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\baseserver.pdb"
+				ObjectFile="vc_x64_mswuddll\baseserver\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\baseserver.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud_net.lib  wxbase31ud.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\baseserver.exe"
+				OutputFile="vc_x64_mswuddll\baseserver.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\baseserver.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\baseserver.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\sockets_vc8_baseserver.bsc"
+				OutputFile="vc_x64_mswuddll\sockets_vc8_baseserver.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\baseserver"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\baseserver"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\baseserver\"
-				ProgramDataBaseFileName="vc_mswudll_x64\baseserver.pdb"
+				ObjectFile="vc_x64_mswudll\baseserver\"
+				ProgramDataBaseFileName="vc_x64_mswudll\baseserver.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u_net.lib  wxbase31u.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\baseserver.exe"
+				OutputFile="vc_x64_mswudll\baseserver.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\baseserver.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\baseserver.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\sockets_vc8_baseserver.bsc"
+				OutputFile="vc_x64_mswudll\sockets_vc8_baseserver.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/sockets/sockets_vc8_client.vcproj b/samples/sockets/sockets_vc8_client.vcproj
index 20dcc7fe68..5ca3da75d9 100644
--- a/samples/sockets/sockets_vc8_client.vcproj
+++ b/samples/sockets/sockets_vc8_client.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\client"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\client"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\client\"
-				ProgramDataBaseFileName="vc_mswud_x64\client.pdb"
+				ObjectFile="vc_x64_mswud\client\"
+				ProgramDataBaseFileName="vc_x64_mswud\client.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\client.exe"
+				OutputFile="vc_x64_mswud\client.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\client.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\client.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\sockets_vc8_client.bsc"
+				OutputFile="vc_x64_mswud\sockets_vc8_client.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\client"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\client"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\client\"
-				ProgramDataBaseFileName="vc_mswu_x64\client.pdb"
+				ObjectFile="vc_x64_mswu\client\"
+				ProgramDataBaseFileName="vc_x64_mswu\client.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\client.exe"
+				OutputFile="vc_x64_mswu\client.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\client.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\client.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\sockets_vc8_client.bsc"
+				OutputFile="vc_x64_mswu\sockets_vc8_client.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\client"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\client"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\client\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\client.pdb"
+				ObjectFile="vc_x64_mswuddll\client\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\client.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\client.exe"
+				OutputFile="vc_x64_mswuddll\client.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\client.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\client.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\sockets_vc8_client.bsc"
+				OutputFile="vc_x64_mswuddll\sockets_vc8_client.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\client"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\client"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\client\"
-				ProgramDataBaseFileName="vc_mswudll_x64\client.pdb"
+				ObjectFile="vc_x64_mswudll\client\"
+				ProgramDataBaseFileName="vc_x64_mswudll\client.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\client.exe"
+				OutputFile="vc_x64_mswudll\client.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\client.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\client.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\sockets_vc8_client.bsc"
+				OutputFile="vc_x64_mswudll\sockets_vc8_client.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/sockets/sockets_vc8_server.vcproj b/samples/sockets/sockets_vc8_server.vcproj
index 8b2a34cc26..e1e4197039 100644
--- a/samples/sockets/sockets_vc8_server.vcproj
+++ b/samples/sockets/sockets_vc8_server.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\server"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\server"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\server\"
-				ProgramDataBaseFileName="vc_mswud_x64\server.pdb"
+				ObjectFile="vc_x64_mswud\server\"
+				ProgramDataBaseFileName="vc_x64_mswud\server.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\server.exe"
+				OutputFile="vc_x64_mswud\server.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\server.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\server.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\sockets_vc8_server.bsc"
+				OutputFile="vc_x64_mswud\sockets_vc8_server.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\server"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\server"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\server\"
-				ProgramDataBaseFileName="vc_mswu_x64\server.pdb"
+				ObjectFile="vc_x64_mswu\server\"
+				ProgramDataBaseFileName="vc_x64_mswu\server.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\server.exe"
+				OutputFile="vc_x64_mswu\server.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\server.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\server.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\sockets_vc8_server.bsc"
+				OutputFile="vc_x64_mswu\sockets_vc8_server.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\server"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\server"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\server\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\server.pdb"
+				ObjectFile="vc_x64_mswuddll\server\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\server.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\server.exe"
+				OutputFile="vc_x64_mswuddll\server.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\server.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\server.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\sockets_vc8_server.bsc"
+				OutputFile="vc_x64_mswuddll\sockets_vc8_server.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\server"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\server"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\server\"
-				ProgramDataBaseFileName="vc_mswudll_x64\server.pdb"
+				ObjectFile="vc_x64_mswudll\server\"
+				ProgramDataBaseFileName="vc_x64_mswudll\server.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\server.exe"
+				OutputFile="vc_x64_mswudll\server.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\server.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\server.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\sockets_vc8_server.bsc"
+				OutputFile="vc_x64_mswudll\sockets_vc8_server.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/sockets/sockets_vc9_baseclient.vcproj b/samples/sockets/sockets_vc9_baseclient.vcproj
index e9966e9ba6..f3254d7f26 100644
--- a/samples/sockets/sockets_vc9_baseclient.vcproj
+++ b/samples/sockets/sockets_vc9_baseclient.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\baseclient"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\baseclient"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\baseclient\"
-				ProgramDataBaseFileName="vc_mswud_x64\baseclient.pdb"
+				ObjectFile="vc_x64_mswud\baseclient\"
+				ProgramDataBaseFileName="vc_x64_mswud\baseclient.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud_net.lib  wxbase31ud.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\baseclient.exe"
+				OutputFile="vc_x64_mswud\baseclient.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\baseclient.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\baseclient.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\sockets_vc9_baseclient.bsc"
+				OutputFile="vc_x64_mswud\sockets_vc9_baseclient.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\baseclient"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\baseclient"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\baseclient\"
-				ProgramDataBaseFileName="vc_mswu_x64\baseclient.pdb"
+				ObjectFile="vc_x64_mswu\baseclient\"
+				ProgramDataBaseFileName="vc_x64_mswu\baseclient.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u_net.lib  wxbase31u.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\baseclient.exe"
+				OutputFile="vc_x64_mswu\baseclient.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\baseclient.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\baseclient.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\sockets_vc9_baseclient.bsc"
+				OutputFile="vc_x64_mswu\sockets_vc9_baseclient.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\baseclient"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\baseclient"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\baseclient\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\baseclient.pdb"
+				ObjectFile="vc_x64_mswuddll\baseclient\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\baseclient.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud_net.lib  wxbase31ud.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\baseclient.exe"
+				OutputFile="vc_x64_mswuddll\baseclient.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\baseclient.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\baseclient.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\sockets_vc9_baseclient.bsc"
+				OutputFile="vc_x64_mswuddll\sockets_vc9_baseclient.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\baseclient"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\baseclient"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\baseclient\"
-				ProgramDataBaseFileName="vc_mswudll_x64\baseclient.pdb"
+				ObjectFile="vc_x64_mswudll\baseclient\"
+				ProgramDataBaseFileName="vc_x64_mswudll\baseclient.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u_net.lib  wxbase31u.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\baseclient.exe"
+				OutputFile="vc_x64_mswudll\baseclient.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\baseclient.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\baseclient.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\sockets_vc9_baseclient.bsc"
+				OutputFile="vc_x64_mswudll\sockets_vc9_baseclient.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/sockets/sockets_vc9_baseserver.vcproj b/samples/sockets/sockets_vc9_baseserver.vcproj
index bf52bcf9c0..bc5861b2ad 100644
--- a/samples/sockets/sockets_vc9_baseserver.vcproj
+++ b/samples/sockets/sockets_vc9_baseserver.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\baseserver"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\baseserver"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\baseserver\"
-				ProgramDataBaseFileName="vc_mswud_x64\baseserver.pdb"
+				ObjectFile="vc_x64_mswud\baseserver\"
+				ProgramDataBaseFileName="vc_x64_mswud\baseserver.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud_net.lib  wxbase31ud.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\baseserver.exe"
+				OutputFile="vc_x64_mswud\baseserver.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\baseserver.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\baseserver.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\sockets_vc9_baseserver.bsc"
+				OutputFile="vc_x64_mswud\sockets_vc9_baseserver.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\baseserver"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\baseserver"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\baseserver\"
-				ProgramDataBaseFileName="vc_mswu_x64\baseserver.pdb"
+				ObjectFile="vc_x64_mswu\baseserver\"
+				ProgramDataBaseFileName="vc_x64_mswu\baseserver.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u_net.lib  wxbase31u.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\baseserver.exe"
+				OutputFile="vc_x64_mswu\baseserver.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\baseserver.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\baseserver.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\sockets_vc9_baseserver.bsc"
+				OutputFile="vc_x64_mswu\sockets_vc9_baseserver.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\baseserver"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\baseserver"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\baseserver\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\baseserver.pdb"
+				ObjectFile="vc_x64_mswuddll\baseserver\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\baseserver.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud_net.lib  wxbase31ud.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\baseserver.exe"
+				OutputFile="vc_x64_mswuddll\baseserver.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\baseserver.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\baseserver.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\sockets_vc9_baseserver.bsc"
+				OutputFile="vc_x64_mswuddll\sockets_vc9_baseserver.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\baseserver"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\baseserver"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\baseserver\"
-				ProgramDataBaseFileName="vc_mswudll_x64\baseserver.pdb"
+				ObjectFile="vc_x64_mswudll\baseserver\"
+				ProgramDataBaseFileName="vc_x64_mswudll\baseserver.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u_net.lib  wxbase31u.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\baseserver.exe"
+				OutputFile="vc_x64_mswudll\baseserver.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\baseserver.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\baseserver.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\sockets_vc9_baseserver.bsc"
+				OutputFile="vc_x64_mswudll\sockets_vc9_baseserver.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/sockets/sockets_vc9_client.vcproj b/samples/sockets/sockets_vc9_client.vcproj
index 3014de96b9..2c216071c8 100644
--- a/samples/sockets/sockets_vc9_client.vcproj
+++ b/samples/sockets/sockets_vc9_client.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\client"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\client"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\client\"
-				ProgramDataBaseFileName="vc_mswud_x64\client.pdb"
+				ObjectFile="vc_x64_mswud\client\"
+				ProgramDataBaseFileName="vc_x64_mswud\client.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\client.exe"
+				OutputFile="vc_x64_mswud\client.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\client.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\client.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\sockets_vc9_client.bsc"
+				OutputFile="vc_x64_mswud\sockets_vc9_client.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\client"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\client"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\client\"
-				ProgramDataBaseFileName="vc_mswu_x64\client.pdb"
+				ObjectFile="vc_x64_mswu\client\"
+				ProgramDataBaseFileName="vc_x64_mswu\client.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\client.exe"
+				OutputFile="vc_x64_mswu\client.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\client.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\client.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\sockets_vc9_client.bsc"
+				OutputFile="vc_x64_mswu\sockets_vc9_client.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\client"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\client"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\client\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\client.pdb"
+				ObjectFile="vc_x64_mswuddll\client\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\client.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\client.exe"
+				OutputFile="vc_x64_mswuddll\client.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\client.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\client.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\sockets_vc9_client.bsc"
+				OutputFile="vc_x64_mswuddll\sockets_vc9_client.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\client"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\client"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\client\"
-				ProgramDataBaseFileName="vc_mswudll_x64\client.pdb"
+				ObjectFile="vc_x64_mswudll\client\"
+				ProgramDataBaseFileName="vc_x64_mswudll\client.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\client.exe"
+				OutputFile="vc_x64_mswudll\client.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\client.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\client.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\sockets_vc9_client.bsc"
+				OutputFile="vc_x64_mswudll\sockets_vc9_client.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/sockets/sockets_vc9_server.vcproj b/samples/sockets/sockets_vc9_server.vcproj
index b72d0c7de3..2dbea8782c 100644
--- a/samples/sockets/sockets_vc9_server.vcproj
+++ b/samples/sockets/sockets_vc9_server.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\server"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\server"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\server\"
-				ProgramDataBaseFileName="vc_mswud_x64\server.pdb"
+				ObjectFile="vc_x64_mswud\server\"
+				ProgramDataBaseFileName="vc_x64_mswud\server.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\server.exe"
+				OutputFile="vc_x64_mswud\server.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\server.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\server.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\sockets_vc9_server.bsc"
+				OutputFile="vc_x64_mswud\sockets_vc9_server.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\server"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\server"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\server\"
-				ProgramDataBaseFileName="vc_mswu_x64\server.pdb"
+				ObjectFile="vc_x64_mswu\server\"
+				ProgramDataBaseFileName="vc_x64_mswu\server.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\server.exe"
+				OutputFile="vc_x64_mswu\server.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\server.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\server.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\sockets_vc9_server.bsc"
+				OutputFile="vc_x64_mswu\sockets_vc9_server.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\server"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\server"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\server\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\server.pdb"
+				ObjectFile="vc_x64_mswuddll\server\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\server.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\server.exe"
+				OutputFile="vc_x64_mswuddll\server.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\server.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\server.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\sockets_vc9_server.bsc"
+				OutputFile="vc_x64_mswuddll\sockets_vc9_server.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\server"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\server"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\server\"
-				ProgramDataBaseFileName="vc_mswudll_x64\server.pdb"
+				ObjectFile="vc_x64_mswudll\server\"
+				ProgramDataBaseFileName="vc_x64_mswudll\server.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\server.exe"
+				OutputFile="vc_x64_mswudll\server.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\server.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\server.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\sockets_vc9_server.bsc"
+				OutputFile="vc_x64_mswudll\sockets_vc9_server.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/sound/makefile.vc b/samples/sound/makefile.vc
index 3d228a1655..2fa6683409 100644
--- a/samples/sound/makefile.vc
+++ b/samples/sound/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/sound/sound_vc8.vcproj b/samples/sound/sound_vc8.vcproj
index 4b2f8e1245..5cdf3edf1b 100644
--- a/samples/sound/sound_vc8.vcproj
+++ b/samples/sound/sound_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\sound"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\sound"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\sound\"
-				ProgramDataBaseFileName="vc_mswud_x64\sound.pdb"
+				ObjectFile="vc_x64_mswud\sound\"
+				ProgramDataBaseFileName="vc_x64_mswud\sound.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\sound.exe"
+				OutputFile="vc_x64_mswud\sound.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\sound.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\sound.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\sound_vc8.bsc"
+				OutputFile="vc_x64_mswud\sound_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\sound"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\sound"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\sound\"
-				ProgramDataBaseFileName="vc_mswu_x64\sound.pdb"
+				ObjectFile="vc_x64_mswu\sound\"
+				ProgramDataBaseFileName="vc_x64_mswu\sound.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\sound.exe"
+				OutputFile="vc_x64_mswu\sound.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\sound.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\sound.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\sound_vc8.bsc"
+				OutputFile="vc_x64_mswu\sound_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\sound"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\sound"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\sound\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\sound.pdb"
+				ObjectFile="vc_x64_mswuddll\sound\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\sound.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\sound.exe"
+				OutputFile="vc_x64_mswuddll\sound.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\sound.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\sound.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\sound_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\sound_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\sound"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\sound"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\sound\"
-				ProgramDataBaseFileName="vc_mswudll_x64\sound.pdb"
+				ObjectFile="vc_x64_mswudll\sound\"
+				ProgramDataBaseFileName="vc_x64_mswudll\sound.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\sound.exe"
+				OutputFile="vc_x64_mswudll\sound.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\sound.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\sound.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\sound_vc8.bsc"
+				OutputFile="vc_x64_mswudll\sound_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/sound/sound_vc9.vcproj b/samples/sound/sound_vc9.vcproj
index 13b9cb9d81..9031123081 100644
--- a/samples/sound/sound_vc9.vcproj
+++ b/samples/sound/sound_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\sound"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\sound"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\sound\"
-				ProgramDataBaseFileName="vc_mswud_x64\sound.pdb"
+				ObjectFile="vc_x64_mswud\sound\"
+				ProgramDataBaseFileName="vc_x64_mswud\sound.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\sound.exe"
+				OutputFile="vc_x64_mswud\sound.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\sound.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\sound.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\sound_vc9.bsc"
+				OutputFile="vc_x64_mswud\sound_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\sound"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\sound"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\sound\"
-				ProgramDataBaseFileName="vc_mswu_x64\sound.pdb"
+				ObjectFile="vc_x64_mswu\sound\"
+				ProgramDataBaseFileName="vc_x64_mswu\sound.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\sound.exe"
+				OutputFile="vc_x64_mswu\sound.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\sound.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\sound.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\sound_vc9.bsc"
+				OutputFile="vc_x64_mswu\sound_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\sound"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\sound"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\sound\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\sound.pdb"
+				ObjectFile="vc_x64_mswuddll\sound\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\sound.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\sound.exe"
+				OutputFile="vc_x64_mswuddll\sound.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\sound.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\sound.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\sound_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\sound_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\sound"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\sound"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\sound\"
-				ProgramDataBaseFileName="vc_mswudll_x64\sound.pdb"
+				ObjectFile="vc_x64_mswudll\sound\"
+				ProgramDataBaseFileName="vc_x64_mswudll\sound.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\sound.exe"
+				OutputFile="vc_x64_mswudll\sound.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\sound.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\sound.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\sound_vc9.bsc"
+				OutputFile="vc_x64_mswudll\sound_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/splash/makefile.vc b/samples/splash/makefile.vc
index 513ce0bab6..d50f6e1431 100644
--- a/samples/splash/makefile.vc
+++ b/samples/splash/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/splash/splash_vc8.vcproj b/samples/splash/splash_vc8.vcproj
index bed484912e..3bb9d8e4b9 100644
--- a/samples/splash/splash_vc8.vcproj
+++ b/samples/splash/splash_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\splash"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\splash"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\splash\"
-				ProgramDataBaseFileName="vc_mswud_x64\splash.pdb"
+				ObjectFile="vc_x64_mswud\splash\"
+				ProgramDataBaseFileName="vc_x64_mswud\splash.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_media.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\splash.exe"
+				OutputFile="vc_x64_mswud\splash.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\splash.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\splash.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\splash_vc8.bsc"
+				OutputFile="vc_x64_mswud\splash_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\splash"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\splash"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\splash\"
-				ProgramDataBaseFileName="vc_mswu_x64\splash.pdb"
+				ObjectFile="vc_x64_mswu\splash\"
+				ProgramDataBaseFileName="vc_x64_mswu\splash.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_media.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\splash.exe"
+				OutputFile="vc_x64_mswu\splash.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\splash.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\splash.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\splash_vc8.bsc"
+				OutputFile="vc_x64_mswu\splash_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\splash"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\splash"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\splash\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\splash.pdb"
+				ObjectFile="vc_x64_mswuddll\splash\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\splash.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_media.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\splash.exe"
+				OutputFile="vc_x64_mswuddll\splash.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\splash.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\splash.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\splash_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\splash_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\splash"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\splash"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\splash\"
-				ProgramDataBaseFileName="vc_mswudll_x64\splash.pdb"
+				ObjectFile="vc_x64_mswudll\splash\"
+				ProgramDataBaseFileName="vc_x64_mswudll\splash.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_media.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\splash.exe"
+				OutputFile="vc_x64_mswudll\splash.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\splash.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\splash.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\splash_vc8.bsc"
+				OutputFile="vc_x64_mswudll\splash_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/splash/splash_vc9.vcproj b/samples/splash/splash_vc9.vcproj
index 368d6d0b03..b2a4652472 100644
--- a/samples/splash/splash_vc9.vcproj
+++ b/samples/splash/splash_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\splash"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\splash"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\splash\"
-				ProgramDataBaseFileName="vc_mswud_x64\splash.pdb"
+				ObjectFile="vc_x64_mswud\splash\"
+				ProgramDataBaseFileName="vc_x64_mswud\splash.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_media.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\splash.exe"
+				OutputFile="vc_x64_mswud\splash.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\splash.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\splash.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\splash_vc9.bsc"
+				OutputFile="vc_x64_mswud\splash_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\splash"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\splash"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\splash\"
-				ProgramDataBaseFileName="vc_mswu_x64\splash.pdb"
+				ObjectFile="vc_x64_mswu\splash\"
+				ProgramDataBaseFileName="vc_x64_mswu\splash.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_media.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\splash.exe"
+				OutputFile="vc_x64_mswu\splash.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\splash.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\splash.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\splash_vc9.bsc"
+				OutputFile="vc_x64_mswu\splash_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\splash"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\splash"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\splash\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\splash.pdb"
+				ObjectFile="vc_x64_mswuddll\splash\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\splash.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_media.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\splash.exe"
+				OutputFile="vc_x64_mswuddll\splash.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\splash.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\splash.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\splash_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\splash_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\splash"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\splash"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\splash\"
-				ProgramDataBaseFileName="vc_mswudll_x64\splash.pdb"
+				ObjectFile="vc_x64_mswudll\splash\"
+				ProgramDataBaseFileName="vc_x64_mswudll\splash.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_media.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\splash.exe"
+				OutputFile="vc_x64_mswudll\splash.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\splash.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\splash.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\splash_vc9.bsc"
+				OutputFile="vc_x64_mswudll\splash_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/splitter/makefile.vc b/samples/splitter/makefile.vc
index 8844a0d202..6a2ff7a0fb 100644
--- a/samples/splitter/makefile.vc
+++ b/samples/splitter/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/splitter/splitter_vc8.vcproj b/samples/splitter/splitter_vc8.vcproj
index fc394fcd07..a987a62af7 100644
--- a/samples/splitter/splitter_vc8.vcproj
+++ b/samples/splitter/splitter_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\splitter"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\splitter"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\splitter\"
-				ProgramDataBaseFileName="vc_mswud_x64\splitter.pdb"
+				ObjectFile="vc_x64_mswud\splitter\"
+				ProgramDataBaseFileName="vc_x64_mswud\splitter.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\splitter.exe"
+				OutputFile="vc_x64_mswud\splitter.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\splitter.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\splitter.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\splitter_vc8.bsc"
+				OutputFile="vc_x64_mswud\splitter_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\splitter"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\splitter"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\splitter\"
-				ProgramDataBaseFileName="vc_mswu_x64\splitter.pdb"
+				ObjectFile="vc_x64_mswu\splitter\"
+				ProgramDataBaseFileName="vc_x64_mswu\splitter.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\splitter.exe"
+				OutputFile="vc_x64_mswu\splitter.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\splitter.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\splitter.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\splitter_vc8.bsc"
+				OutputFile="vc_x64_mswu\splitter_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\splitter"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\splitter"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\splitter\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\splitter.pdb"
+				ObjectFile="vc_x64_mswuddll\splitter\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\splitter.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\splitter.exe"
+				OutputFile="vc_x64_mswuddll\splitter.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\splitter.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\splitter.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\splitter_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\splitter_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\splitter"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\splitter"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\splitter\"
-				ProgramDataBaseFileName="vc_mswudll_x64\splitter.pdb"
+				ObjectFile="vc_x64_mswudll\splitter\"
+				ProgramDataBaseFileName="vc_x64_mswudll\splitter.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\splitter.exe"
+				OutputFile="vc_x64_mswudll\splitter.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\splitter.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\splitter.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\splitter_vc8.bsc"
+				OutputFile="vc_x64_mswudll\splitter_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/splitter/splitter_vc9.vcproj b/samples/splitter/splitter_vc9.vcproj
index 13880c2310..3bd29b4a5e 100644
--- a/samples/splitter/splitter_vc9.vcproj
+++ b/samples/splitter/splitter_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\splitter"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\splitter"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\splitter\"
-				ProgramDataBaseFileName="vc_mswud_x64\splitter.pdb"
+				ObjectFile="vc_x64_mswud\splitter\"
+				ProgramDataBaseFileName="vc_x64_mswud\splitter.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\splitter.exe"
+				OutputFile="vc_x64_mswud\splitter.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\splitter.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\splitter.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\splitter_vc9.bsc"
+				OutputFile="vc_x64_mswud\splitter_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\splitter"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\splitter"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\splitter\"
-				ProgramDataBaseFileName="vc_mswu_x64\splitter.pdb"
+				ObjectFile="vc_x64_mswu\splitter\"
+				ProgramDataBaseFileName="vc_x64_mswu\splitter.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\splitter.exe"
+				OutputFile="vc_x64_mswu\splitter.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\splitter.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\splitter.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\splitter_vc9.bsc"
+				OutputFile="vc_x64_mswu\splitter_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\splitter"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\splitter"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\splitter\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\splitter.pdb"
+				ObjectFile="vc_x64_mswuddll\splitter\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\splitter.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\splitter.exe"
+				OutputFile="vc_x64_mswuddll\splitter.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\splitter.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\splitter.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\splitter_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\splitter_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\splitter"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\splitter"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\splitter\"
-				ProgramDataBaseFileName="vc_mswudll_x64\splitter.pdb"
+				ObjectFile="vc_x64_mswudll\splitter\"
+				ProgramDataBaseFileName="vc_x64_mswudll\splitter.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\splitter.exe"
+				OutputFile="vc_x64_mswudll\splitter.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\splitter.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\splitter.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\splitter_vc9.bsc"
+				OutputFile="vc_x64_mswudll\splitter_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/statbar/makefile.vc b/samples/statbar/makefile.vc
index da1872e0ba..3eac8567f9 100644
--- a/samples/statbar/makefile.vc
+++ b/samples/statbar/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/statbar/statbar_vc8.vcproj b/samples/statbar/statbar_vc8.vcproj
index 75e8e63a60..584e57e7b5 100644
--- a/samples/statbar/statbar_vc8.vcproj
+++ b/samples/statbar/statbar_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\statbar"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\statbar"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\statbar\"
-				ProgramDataBaseFileName="vc_mswud_x64\statbar.pdb"
+				ObjectFile="vc_x64_mswud\statbar\"
+				ProgramDataBaseFileName="vc_x64_mswud\statbar.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\statbar.exe"
+				OutputFile="vc_x64_mswud\statbar.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\statbar.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\statbar.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\statbar_vc8.bsc"
+				OutputFile="vc_x64_mswud\statbar_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\statbar"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\statbar"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\statbar\"
-				ProgramDataBaseFileName="vc_mswu_x64\statbar.pdb"
+				ObjectFile="vc_x64_mswu\statbar\"
+				ProgramDataBaseFileName="vc_x64_mswu\statbar.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\statbar.exe"
+				OutputFile="vc_x64_mswu\statbar.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\statbar.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\statbar.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\statbar_vc8.bsc"
+				OutputFile="vc_x64_mswu\statbar_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\statbar"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\statbar"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\statbar\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\statbar.pdb"
+				ObjectFile="vc_x64_mswuddll\statbar\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\statbar.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\statbar.exe"
+				OutputFile="vc_x64_mswuddll\statbar.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\statbar.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\statbar.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\statbar_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\statbar_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\statbar"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\statbar"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\statbar\"
-				ProgramDataBaseFileName="vc_mswudll_x64\statbar.pdb"
+				ObjectFile="vc_x64_mswudll\statbar\"
+				ProgramDataBaseFileName="vc_x64_mswudll\statbar.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\statbar.exe"
+				OutputFile="vc_x64_mswudll\statbar.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\statbar.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\statbar.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\statbar_vc8.bsc"
+				OutputFile="vc_x64_mswudll\statbar_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/statbar/statbar_vc9.vcproj b/samples/statbar/statbar_vc9.vcproj
index b83a11361e..51de4702c7 100644
--- a/samples/statbar/statbar_vc9.vcproj
+++ b/samples/statbar/statbar_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\statbar"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\statbar"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\statbar\"
-				ProgramDataBaseFileName="vc_mswud_x64\statbar.pdb"
+				ObjectFile="vc_x64_mswud\statbar\"
+				ProgramDataBaseFileName="vc_x64_mswud\statbar.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\statbar.exe"
+				OutputFile="vc_x64_mswud\statbar.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\statbar.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\statbar.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\statbar_vc9.bsc"
+				OutputFile="vc_x64_mswud\statbar_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\statbar"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\statbar"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\statbar\"
-				ProgramDataBaseFileName="vc_mswu_x64\statbar.pdb"
+				ObjectFile="vc_x64_mswu\statbar\"
+				ProgramDataBaseFileName="vc_x64_mswu\statbar.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\statbar.exe"
+				OutputFile="vc_x64_mswu\statbar.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\statbar.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\statbar.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\statbar_vc9.bsc"
+				OutputFile="vc_x64_mswu\statbar_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\statbar"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\statbar"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\statbar\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\statbar.pdb"
+				ObjectFile="vc_x64_mswuddll\statbar\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\statbar.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\statbar.exe"
+				OutputFile="vc_x64_mswuddll\statbar.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\statbar.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\statbar.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\statbar_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\statbar_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\statbar"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\statbar"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\statbar\"
-				ProgramDataBaseFileName="vc_mswudll_x64\statbar.pdb"
+				ObjectFile="vc_x64_mswudll\statbar\"
+				ProgramDataBaseFileName="vc_x64_mswudll\statbar.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\statbar.exe"
+				OutputFile="vc_x64_mswudll\statbar.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\statbar.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\statbar.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\statbar_vc9.bsc"
+				OutputFile="vc_x64_mswudll\statbar_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/stc/makefile.vc b/samples/stc/makefile.vc
index 7e6803d0d5..d9e0d6144d 100644
--- a/samples/stc/makefile.vc
+++ b/samples/stc/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/stc/stctest_vc8.vcproj b/samples/stc/stctest_vc8.vcproj
index 1c81814344..9e1b18f8d1 100644
--- a/samples/stc/stctest_vc8.vcproj
+++ b/samples/stc/stctest_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\stctest"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\stctest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\stctest\"
-				ProgramDataBaseFileName="vc_mswud_x64\stctest.pdb"
+				ObjectFile="vc_x64_mswud\stctest\"
+				ProgramDataBaseFileName="vc_x64_mswud\stctest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_stc.lib imm32.lib wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib wxscintillad.lib imm32.lib"
-				OutputFile="vc_mswud_x64\stctest.exe"
+				OutputFile="vc_x64_mswud\stctest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\stctest.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\stctest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\stctest_vc8.bsc"
+				OutputFile="vc_x64_mswud\stctest_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\stctest"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\stctest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\stctest\"
-				ProgramDataBaseFileName="vc_mswu_x64\stctest.pdb"
+				ObjectFile="vc_x64_mswu\stctest\"
+				ProgramDataBaseFileName="vc_x64_mswu\stctest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_stc.lib imm32.lib wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib wxscintilla.lib imm32.lib"
-				OutputFile="vc_mswu_x64\stctest.exe"
+				OutputFile="vc_x64_mswu\stctest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\stctest.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\stctest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\stctest_vc8.bsc"
+				OutputFile="vc_x64_mswu\stctest_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\stctest"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\stctest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\stctest\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\stctest.pdb"
+				ObjectFile="vc_x64_mswuddll\stctest\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\stctest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_stc.lib imm32.lib wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib wxscintillad.lib imm32.lib"
-				OutputFile="vc_mswuddll_x64\stctest.exe"
+				OutputFile="vc_x64_mswuddll\stctest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\stctest.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\stctest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\stctest_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\stctest_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\stctest"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\stctest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\stctest\"
-				ProgramDataBaseFileName="vc_mswudll_x64\stctest.pdb"
+				ObjectFile="vc_x64_mswudll\stctest\"
+				ProgramDataBaseFileName="vc_x64_mswudll\stctest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_stc.lib imm32.lib wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib wxscintilla.lib imm32.lib"
-				OutputFile="vc_mswudll_x64\stctest.exe"
+				OutputFile="vc_x64_mswudll\stctest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\stctest.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\stctest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\stctest_vc8.bsc"
+				OutputFile="vc_x64_mswudll\stctest_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/stc/stctest_vc9.vcproj b/samples/stc/stctest_vc9.vcproj
index ada2bd0df5..be89568b7d 100644
--- a/samples/stc/stctest_vc9.vcproj
+++ b/samples/stc/stctest_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\stctest"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\stctest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\stctest\"
-				ProgramDataBaseFileName="vc_mswud_x64\stctest.pdb"
+				ObjectFile="vc_x64_mswud\stctest\"
+				ProgramDataBaseFileName="vc_x64_mswud\stctest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_stc.lib imm32.lib wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib wxscintillad.lib imm32.lib"
-				OutputFile="vc_mswud_x64\stctest.exe"
+				OutputFile="vc_x64_mswud\stctest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\stctest.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\stctest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\stctest_vc9.bsc"
+				OutputFile="vc_x64_mswud\stctest_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\stctest"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\stctest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\stctest\"
-				ProgramDataBaseFileName="vc_mswu_x64\stctest.pdb"
+				ObjectFile="vc_x64_mswu\stctest\"
+				ProgramDataBaseFileName="vc_x64_mswu\stctest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_stc.lib imm32.lib wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib wxscintilla.lib imm32.lib"
-				OutputFile="vc_mswu_x64\stctest.exe"
+				OutputFile="vc_x64_mswu\stctest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\stctest.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\stctest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\stctest_vc9.bsc"
+				OutputFile="vc_x64_mswu\stctest_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\stctest"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\stctest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\stctest\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\stctest.pdb"
+				ObjectFile="vc_x64_mswuddll\stctest\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\stctest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_stc.lib imm32.lib wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib wxscintillad.lib imm32.lib"
-				OutputFile="vc_mswuddll_x64\stctest.exe"
+				OutputFile="vc_x64_mswuddll\stctest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\stctest.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\stctest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\stctest_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\stctest_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\stctest"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\stctest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\stctest\"
-				ProgramDataBaseFileName="vc_mswudll_x64\stctest.pdb"
+				ObjectFile="vc_x64_mswudll\stctest\"
+				ProgramDataBaseFileName="vc_x64_mswudll\stctest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_stc.lib imm32.lib wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib wxscintilla.lib imm32.lib"
-				OutputFile="vc_mswudll_x64\stctest.exe"
+				OutputFile="vc_x64_mswudll\stctest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\stctest.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\stctest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\stctest_vc9.bsc"
+				OutputFile="vc_x64_mswudll\stctest_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/svg/makefile.vc b/samples/svg/makefile.vc
index b3f2e1dbec..0f67f707ee 100644
--- a/samples/svg/makefile.vc
+++ b/samples/svg/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/svg/svgtest_vc8.vcproj b/samples/svg/svgtest_vc8.vcproj
index 7b211ad738..e284e86754 100644
--- a/samples/svg/svgtest_vc8.vcproj
+++ b/samples/svg/svgtest_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\svgtest"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\svgtest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\svgtest\"
-				ProgramDataBaseFileName="vc_mswud_x64\svgtest.pdb"
+				ObjectFile="vc_x64_mswud\svgtest\"
+				ProgramDataBaseFileName="vc_x64_mswud\svgtest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\svgtest.exe"
+				OutputFile="vc_x64_mswud\svgtest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\svgtest.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\svgtest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\svgtest_vc8.bsc"
+				OutputFile="vc_x64_mswud\svgtest_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\svgtest"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\svgtest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\svgtest\"
-				ProgramDataBaseFileName="vc_mswu_x64\svgtest.pdb"
+				ObjectFile="vc_x64_mswu\svgtest\"
+				ProgramDataBaseFileName="vc_x64_mswu\svgtest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\svgtest.exe"
+				OutputFile="vc_x64_mswu\svgtest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\svgtest.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\svgtest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\svgtest_vc8.bsc"
+				OutputFile="vc_x64_mswu\svgtest_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\svgtest"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\svgtest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\svgtest\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\svgtest.pdb"
+				ObjectFile="vc_x64_mswuddll\svgtest\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\svgtest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\svgtest.exe"
+				OutputFile="vc_x64_mswuddll\svgtest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\svgtest.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\svgtest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\svgtest_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\svgtest_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\svgtest"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\svgtest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\svgtest\"
-				ProgramDataBaseFileName="vc_mswudll_x64\svgtest.pdb"
+				ObjectFile="vc_x64_mswudll\svgtest\"
+				ProgramDataBaseFileName="vc_x64_mswudll\svgtest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\svgtest.exe"
+				OutputFile="vc_x64_mswudll\svgtest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\svgtest.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\svgtest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\svgtest_vc8.bsc"
+				OutputFile="vc_x64_mswudll\svgtest_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/svg/svgtest_vc9.vcproj b/samples/svg/svgtest_vc9.vcproj
index d191079780..f64ce7e86c 100644
--- a/samples/svg/svgtest_vc9.vcproj
+++ b/samples/svg/svgtest_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\svgtest"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\svgtest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\svgtest\"
-				ProgramDataBaseFileName="vc_mswud_x64\svgtest.pdb"
+				ObjectFile="vc_x64_mswud\svgtest\"
+				ProgramDataBaseFileName="vc_x64_mswud\svgtest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\svgtest.exe"
+				OutputFile="vc_x64_mswud\svgtest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\svgtest.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\svgtest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\svgtest_vc9.bsc"
+				OutputFile="vc_x64_mswud\svgtest_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\svgtest"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\svgtest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\svgtest\"
-				ProgramDataBaseFileName="vc_mswu_x64\svgtest.pdb"
+				ObjectFile="vc_x64_mswu\svgtest\"
+				ProgramDataBaseFileName="vc_x64_mswu\svgtest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\svgtest.exe"
+				OutputFile="vc_x64_mswu\svgtest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\svgtest.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\svgtest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\svgtest_vc9.bsc"
+				OutputFile="vc_x64_mswu\svgtest_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\svgtest"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\svgtest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\svgtest\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\svgtest.pdb"
+				ObjectFile="vc_x64_mswuddll\svgtest\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\svgtest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\svgtest.exe"
+				OutputFile="vc_x64_mswuddll\svgtest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\svgtest.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\svgtest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\svgtest_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\svgtest_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\svgtest"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\svgtest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\svgtest\"
-				ProgramDataBaseFileName="vc_mswudll_x64\svgtest.pdb"
+				ObjectFile="vc_x64_mswudll\svgtest\"
+				ProgramDataBaseFileName="vc_x64_mswudll\svgtest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\svgtest.exe"
+				OutputFile="vc_x64_mswudll\svgtest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\svgtest.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\svgtest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\svgtest_vc9.bsc"
+				OutputFile="vc_x64_mswudll\svgtest_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/taborder/makefile.vc b/samples/taborder/makefile.vc
index 4fe40c2a5c..f06f76c65f 100644
--- a/samples/taborder/makefile.vc
+++ b/samples/taborder/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/taborder/taborder_vc8.vcproj b/samples/taborder/taborder_vc8.vcproj
index d317081921..851cb9958b 100644
--- a/samples/taborder/taborder_vc8.vcproj
+++ b/samples/taborder/taborder_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\taborder"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\taborder"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\taborder\"
-				ProgramDataBaseFileName="vc_mswud_x64\taborder.pdb"
+				ObjectFile="vc_x64_mswud\taborder\"
+				ProgramDataBaseFileName="vc_x64_mswud\taborder.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\taborder.exe"
+				OutputFile="vc_x64_mswud\taborder.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\taborder.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\taborder.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\taborder_vc8.bsc"
+				OutputFile="vc_x64_mswud\taborder_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\taborder"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\taborder"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\taborder\"
-				ProgramDataBaseFileName="vc_mswu_x64\taborder.pdb"
+				ObjectFile="vc_x64_mswu\taborder\"
+				ProgramDataBaseFileName="vc_x64_mswu\taborder.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\taborder.exe"
+				OutputFile="vc_x64_mswu\taborder.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\taborder.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\taborder.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\taborder_vc8.bsc"
+				OutputFile="vc_x64_mswu\taborder_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\taborder"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\taborder"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\taborder\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\taborder.pdb"
+				ObjectFile="vc_x64_mswuddll\taborder\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\taborder.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\taborder.exe"
+				OutputFile="vc_x64_mswuddll\taborder.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\taborder.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\taborder.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\taborder_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\taborder_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\taborder"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\taborder"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\taborder\"
-				ProgramDataBaseFileName="vc_mswudll_x64\taborder.pdb"
+				ObjectFile="vc_x64_mswudll\taborder\"
+				ProgramDataBaseFileName="vc_x64_mswudll\taborder.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\taborder.exe"
+				OutputFile="vc_x64_mswudll\taborder.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\taborder.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\taborder.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\taborder_vc8.bsc"
+				OutputFile="vc_x64_mswudll\taborder_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/taborder/taborder_vc9.vcproj b/samples/taborder/taborder_vc9.vcproj
index 16d869f824..e29a54a5ea 100644
--- a/samples/taborder/taborder_vc9.vcproj
+++ b/samples/taborder/taborder_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\taborder"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\taborder"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\taborder\"
-				ProgramDataBaseFileName="vc_mswud_x64\taborder.pdb"
+				ObjectFile="vc_x64_mswud\taborder\"
+				ProgramDataBaseFileName="vc_x64_mswud\taborder.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\taborder.exe"
+				OutputFile="vc_x64_mswud\taborder.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\taborder.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\taborder.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\taborder_vc9.bsc"
+				OutputFile="vc_x64_mswud\taborder_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\taborder"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\taborder"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\taborder\"
-				ProgramDataBaseFileName="vc_mswu_x64\taborder.pdb"
+				ObjectFile="vc_x64_mswu\taborder\"
+				ProgramDataBaseFileName="vc_x64_mswu\taborder.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\taborder.exe"
+				OutputFile="vc_x64_mswu\taborder.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\taborder.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\taborder.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\taborder_vc9.bsc"
+				OutputFile="vc_x64_mswu\taborder_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\taborder"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\taborder"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\taborder\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\taborder.pdb"
+				ObjectFile="vc_x64_mswuddll\taborder\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\taborder.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\taborder.exe"
+				OutputFile="vc_x64_mswuddll\taborder.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\taborder.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\taborder.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\taborder_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\taborder_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\taborder"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\taborder"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\taborder\"
-				ProgramDataBaseFileName="vc_mswudll_x64\taborder.pdb"
+				ObjectFile="vc_x64_mswudll\taborder\"
+				ProgramDataBaseFileName="vc_x64_mswudll\taborder.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\taborder.exe"
+				OutputFile="vc_x64_mswudll\taborder.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\taborder.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\taborder.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\taborder_vc9.bsc"
+				OutputFile="vc_x64_mswudll\taborder_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/taskbar/makefile.vc b/samples/taskbar/makefile.vc
index 2b7fc5f2a6..c813ce7bfb 100644
--- a/samples/taskbar/makefile.vc
+++ b/samples/taskbar/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/taskbar/taskbar_vc8.vcproj b/samples/taskbar/taskbar_vc8.vcproj
index 00d82bbb37..f0bdf67496 100644
--- a/samples/taskbar/taskbar_vc8.vcproj
+++ b/samples/taskbar/taskbar_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\taskbar"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\taskbar"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\taskbar\"
-				ProgramDataBaseFileName="vc_mswud_x64\taskbar.pdb"
+				ObjectFile="vc_x64_mswud\taskbar\"
+				ProgramDataBaseFileName="vc_x64_mswud\taskbar.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\taskbar.exe"
+				OutputFile="vc_x64_mswud\taskbar.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\taskbar.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\taskbar.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\taskbar_vc8.bsc"
+				OutputFile="vc_x64_mswud\taskbar_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\taskbar"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\taskbar"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\taskbar\"
-				ProgramDataBaseFileName="vc_mswu_x64\taskbar.pdb"
+				ObjectFile="vc_x64_mswu\taskbar\"
+				ProgramDataBaseFileName="vc_x64_mswu\taskbar.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\taskbar.exe"
+				OutputFile="vc_x64_mswu\taskbar.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\taskbar.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\taskbar.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\taskbar_vc8.bsc"
+				OutputFile="vc_x64_mswu\taskbar_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\taskbar"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\taskbar"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\taskbar\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\taskbar.pdb"
+				ObjectFile="vc_x64_mswuddll\taskbar\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\taskbar.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\taskbar.exe"
+				OutputFile="vc_x64_mswuddll\taskbar.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\taskbar.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\taskbar.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\taskbar_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\taskbar_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\taskbar"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\taskbar"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\taskbar\"
-				ProgramDataBaseFileName="vc_mswudll_x64\taskbar.pdb"
+				ObjectFile="vc_x64_mswudll\taskbar\"
+				ProgramDataBaseFileName="vc_x64_mswudll\taskbar.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\taskbar.exe"
+				OutputFile="vc_x64_mswudll\taskbar.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\taskbar.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\taskbar.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\taskbar_vc8.bsc"
+				OutputFile="vc_x64_mswudll\taskbar_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/taskbar/taskbar_vc9.vcproj b/samples/taskbar/taskbar_vc9.vcproj
index 2c23b553e9..2eca28bfb9 100644
--- a/samples/taskbar/taskbar_vc9.vcproj
+++ b/samples/taskbar/taskbar_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\taskbar"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\taskbar"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\taskbar\"
-				ProgramDataBaseFileName="vc_mswud_x64\taskbar.pdb"
+				ObjectFile="vc_x64_mswud\taskbar\"
+				ProgramDataBaseFileName="vc_x64_mswud\taskbar.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\taskbar.exe"
+				OutputFile="vc_x64_mswud\taskbar.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\taskbar.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\taskbar.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\taskbar_vc9.bsc"
+				OutputFile="vc_x64_mswud\taskbar_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\taskbar"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\taskbar"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\taskbar\"
-				ProgramDataBaseFileName="vc_mswu_x64\taskbar.pdb"
+				ObjectFile="vc_x64_mswu\taskbar\"
+				ProgramDataBaseFileName="vc_x64_mswu\taskbar.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\taskbar.exe"
+				OutputFile="vc_x64_mswu\taskbar.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\taskbar.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\taskbar.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\taskbar_vc9.bsc"
+				OutputFile="vc_x64_mswu\taskbar_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\taskbar"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\taskbar"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\taskbar\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\taskbar.pdb"
+				ObjectFile="vc_x64_mswuddll\taskbar\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\taskbar.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\taskbar.exe"
+				OutputFile="vc_x64_mswuddll\taskbar.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\taskbar.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\taskbar.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\taskbar_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\taskbar_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\taskbar"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\taskbar"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\taskbar\"
-				ProgramDataBaseFileName="vc_mswudll_x64\taskbar.pdb"
+				ObjectFile="vc_x64_mswudll\taskbar\"
+				ProgramDataBaseFileName="vc_x64_mswudll\taskbar.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\taskbar.exe"
+				OutputFile="vc_x64_mswudll\taskbar.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\taskbar.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\taskbar.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\taskbar_vc9.bsc"
+				OutputFile="vc_x64_mswudll\taskbar_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/taskbarbutton/makefile.vc b/samples/taskbarbutton/makefile.vc
index 2dc434acfb..b442db7d2e 100644
--- a/samples/taskbarbutton/makefile.vc
+++ b/samples/taskbarbutton/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/taskbarbutton/taskbarbutton_vc8.vcproj b/samples/taskbarbutton/taskbarbutton_vc8.vcproj
index 29346cd491..64a0b2a6f8 100644
--- a/samples/taskbarbutton/taskbarbutton_vc8.vcproj
+++ b/samples/taskbarbutton/taskbarbutton_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\taskbarbutton"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\taskbarbutton"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\taskbarbutton\"
-				ProgramDataBaseFileName="vc_mswud_x64\taskbarbutton.pdb"
+				ObjectFile="vc_x64_mswud\taskbarbutton\"
+				ProgramDataBaseFileName="vc_x64_mswud\taskbarbutton.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\taskbarbutton.exe"
+				OutputFile="vc_x64_mswud\taskbarbutton.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\taskbarbutton.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\taskbarbutton.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\taskbarbutton_vc8.bsc"
+				OutputFile="vc_x64_mswud\taskbarbutton_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\taskbarbutton"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\taskbarbutton"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\taskbarbutton\"
-				ProgramDataBaseFileName="vc_mswu_x64\taskbarbutton.pdb"
+				ObjectFile="vc_x64_mswu\taskbarbutton\"
+				ProgramDataBaseFileName="vc_x64_mswu\taskbarbutton.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\taskbarbutton.exe"
+				OutputFile="vc_x64_mswu\taskbarbutton.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\taskbarbutton.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\taskbarbutton.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\taskbarbutton_vc8.bsc"
+				OutputFile="vc_x64_mswu\taskbarbutton_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\taskbarbutton"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\taskbarbutton"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\taskbarbutton\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\taskbarbutton.pdb"
+				ObjectFile="vc_x64_mswuddll\taskbarbutton\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\taskbarbutton.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\taskbarbutton.exe"
+				OutputFile="vc_x64_mswuddll\taskbarbutton.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\taskbarbutton.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\taskbarbutton.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\taskbarbutton_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\taskbarbutton_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\taskbarbutton"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\taskbarbutton"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\taskbarbutton\"
-				ProgramDataBaseFileName="vc_mswudll_x64\taskbarbutton.pdb"
+				ObjectFile="vc_x64_mswudll\taskbarbutton\"
+				ProgramDataBaseFileName="vc_x64_mswudll\taskbarbutton.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\taskbarbutton.exe"
+				OutputFile="vc_x64_mswudll\taskbarbutton.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\taskbarbutton.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\taskbarbutton.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\taskbarbutton_vc8.bsc"
+				OutputFile="vc_x64_mswudll\taskbarbutton_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/taskbarbutton/taskbarbutton_vc9.vcproj b/samples/taskbarbutton/taskbarbutton_vc9.vcproj
index baf9ef4e06..d970b20c2c 100644
--- a/samples/taskbarbutton/taskbarbutton_vc9.vcproj
+++ b/samples/taskbarbutton/taskbarbutton_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\taskbarbutton"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\taskbarbutton"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\taskbarbutton\"
-				ProgramDataBaseFileName="vc_mswud_x64\taskbarbutton.pdb"
+				ObjectFile="vc_x64_mswud\taskbarbutton\"
+				ProgramDataBaseFileName="vc_x64_mswud\taskbarbutton.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\taskbarbutton.exe"
+				OutputFile="vc_x64_mswud\taskbarbutton.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\taskbarbutton.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\taskbarbutton.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\taskbarbutton_vc9.bsc"
+				OutputFile="vc_x64_mswud\taskbarbutton_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\taskbarbutton"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\taskbarbutton"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\taskbarbutton\"
-				ProgramDataBaseFileName="vc_mswu_x64\taskbarbutton.pdb"
+				ObjectFile="vc_x64_mswu\taskbarbutton\"
+				ProgramDataBaseFileName="vc_x64_mswu\taskbarbutton.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\taskbarbutton.exe"
+				OutputFile="vc_x64_mswu\taskbarbutton.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\taskbarbutton.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\taskbarbutton.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\taskbarbutton_vc9.bsc"
+				OutputFile="vc_x64_mswu\taskbarbutton_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\taskbarbutton"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\taskbarbutton"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\taskbarbutton\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\taskbarbutton.pdb"
+				ObjectFile="vc_x64_mswuddll\taskbarbutton\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\taskbarbutton.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\taskbarbutton.exe"
+				OutputFile="vc_x64_mswuddll\taskbarbutton.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\taskbarbutton.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\taskbarbutton.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\taskbarbutton_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\taskbarbutton_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\taskbarbutton"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\taskbarbutton"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\taskbarbutton\"
-				ProgramDataBaseFileName="vc_mswudll_x64\taskbarbutton.pdb"
+				ObjectFile="vc_x64_mswudll\taskbarbutton\"
+				ProgramDataBaseFileName="vc_x64_mswudll\taskbarbutton.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\taskbarbutton.exe"
+				OutputFile="vc_x64_mswudll\taskbarbutton.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\taskbarbutton.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\taskbarbutton.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\taskbarbutton_vc9.bsc"
+				OutputFile="vc_x64_mswudll\taskbarbutton_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/text/makefile.vc b/samples/text/makefile.vc
index 303e51bff8..2cdff2c5f4 100644
--- a/samples/text/makefile.vc
+++ b/samples/text/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/text/text_vc8.vcproj b/samples/text/text_vc8.vcproj
index ccfc187f65..d962f60324 100644
--- a/samples/text/text_vc8.vcproj
+++ b/samples/text/text_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\text"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\text"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\text\"
-				ProgramDataBaseFileName="vc_mswud_x64\text.pdb"
+				ObjectFile="vc_x64_mswud\text\"
+				ProgramDataBaseFileName="vc_x64_mswud\text.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\text.exe"
+				OutputFile="vc_x64_mswud\text.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\text.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\text.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\text_vc8.bsc"
+				OutputFile="vc_x64_mswud\text_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\text"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\text"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\text\"
-				ProgramDataBaseFileName="vc_mswu_x64\text.pdb"
+				ObjectFile="vc_x64_mswu\text\"
+				ProgramDataBaseFileName="vc_x64_mswu\text.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\text.exe"
+				OutputFile="vc_x64_mswu\text.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\text.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\text.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\text_vc8.bsc"
+				OutputFile="vc_x64_mswu\text_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\text"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\text"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\text\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\text.pdb"
+				ObjectFile="vc_x64_mswuddll\text\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\text.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\text.exe"
+				OutputFile="vc_x64_mswuddll\text.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\text.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\text.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\text_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\text_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\text"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\text"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\text\"
-				ProgramDataBaseFileName="vc_mswudll_x64\text.pdb"
+				ObjectFile="vc_x64_mswudll\text\"
+				ProgramDataBaseFileName="vc_x64_mswudll\text.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\text.exe"
+				OutputFile="vc_x64_mswudll\text.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\text.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\text.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\text_vc8.bsc"
+				OutputFile="vc_x64_mswudll\text_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/text/text_vc9.vcproj b/samples/text/text_vc9.vcproj
index 4a62e7dbe8..7b0f820231 100644
--- a/samples/text/text_vc9.vcproj
+++ b/samples/text/text_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\text"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\text"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\text\"
-				ProgramDataBaseFileName="vc_mswud_x64\text.pdb"
+				ObjectFile="vc_x64_mswud\text\"
+				ProgramDataBaseFileName="vc_x64_mswud\text.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\text.exe"
+				OutputFile="vc_x64_mswud\text.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\text.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\text.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\text_vc9.bsc"
+				OutputFile="vc_x64_mswud\text_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\text"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\text"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\text\"
-				ProgramDataBaseFileName="vc_mswu_x64\text.pdb"
+				ObjectFile="vc_x64_mswu\text\"
+				ProgramDataBaseFileName="vc_x64_mswu\text.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\text.exe"
+				OutputFile="vc_x64_mswu\text.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\text.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\text.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\text_vc9.bsc"
+				OutputFile="vc_x64_mswu\text_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\text"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\text"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\text\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\text.pdb"
+				ObjectFile="vc_x64_mswuddll\text\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\text.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\text.exe"
+				OutputFile="vc_x64_mswuddll\text.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\text.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\text.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\text_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\text_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\text"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\text"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\text\"
-				ProgramDataBaseFileName="vc_mswudll_x64\text.pdb"
+				ObjectFile="vc_x64_mswudll\text\"
+				ProgramDataBaseFileName="vc_x64_mswudll\text.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\text.exe"
+				OutputFile="vc_x64_mswudll\text.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\text.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\text.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\text_vc9.bsc"
+				OutputFile="vc_x64_mswudll\text_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/thread/makefile.vc b/samples/thread/makefile.vc
index 06054eeed2..ff8abdabd3 100644
--- a/samples/thread/makefile.vc
+++ b/samples/thread/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/thread/thread_vc8.vcproj b/samples/thread/thread_vc8.vcproj
index 8cb84bd1f8..6b460561dd 100644
--- a/samples/thread/thread_vc8.vcproj
+++ b/samples/thread/thread_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\thread"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\thread"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\thread\"
-				ProgramDataBaseFileName="vc_mswud_x64\thread.pdb"
+				ObjectFile="vc_x64_mswud\thread\"
+				ProgramDataBaseFileName="vc_x64_mswud\thread.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\thread.exe"
+				OutputFile="vc_x64_mswud\thread.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\thread.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\thread.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\thread_vc8.bsc"
+				OutputFile="vc_x64_mswud\thread_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\thread"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\thread"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\thread\"
-				ProgramDataBaseFileName="vc_mswu_x64\thread.pdb"
+				ObjectFile="vc_x64_mswu\thread\"
+				ProgramDataBaseFileName="vc_x64_mswu\thread.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\thread.exe"
+				OutputFile="vc_x64_mswu\thread.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\thread.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\thread.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\thread_vc8.bsc"
+				OutputFile="vc_x64_mswu\thread_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\thread"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\thread"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\thread\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\thread.pdb"
+				ObjectFile="vc_x64_mswuddll\thread\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\thread.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\thread.exe"
+				OutputFile="vc_x64_mswuddll\thread.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\thread.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\thread.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\thread_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\thread_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\thread"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\thread"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\thread\"
-				ProgramDataBaseFileName="vc_mswudll_x64\thread.pdb"
+				ObjectFile="vc_x64_mswudll\thread\"
+				ProgramDataBaseFileName="vc_x64_mswudll\thread.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\thread.exe"
+				OutputFile="vc_x64_mswudll\thread.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\thread.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\thread.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\thread_vc8.bsc"
+				OutputFile="vc_x64_mswudll\thread_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/thread/thread_vc9.vcproj b/samples/thread/thread_vc9.vcproj
index de9468eceb..0ab08c09db 100644
--- a/samples/thread/thread_vc9.vcproj
+++ b/samples/thread/thread_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\thread"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\thread"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\thread\"
-				ProgramDataBaseFileName="vc_mswud_x64\thread.pdb"
+				ObjectFile="vc_x64_mswud\thread\"
+				ProgramDataBaseFileName="vc_x64_mswud\thread.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\thread.exe"
+				OutputFile="vc_x64_mswud\thread.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\thread.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\thread.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\thread_vc9.bsc"
+				OutputFile="vc_x64_mswud\thread_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\thread"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\thread"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\thread\"
-				ProgramDataBaseFileName="vc_mswu_x64\thread.pdb"
+				ObjectFile="vc_x64_mswu\thread\"
+				ProgramDataBaseFileName="vc_x64_mswu\thread.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\thread.exe"
+				OutputFile="vc_x64_mswu\thread.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\thread.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\thread.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\thread_vc9.bsc"
+				OutputFile="vc_x64_mswu\thread_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\thread"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\thread"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\thread\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\thread.pdb"
+				ObjectFile="vc_x64_mswuddll\thread\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\thread.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\thread.exe"
+				OutputFile="vc_x64_mswuddll\thread.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\thread.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\thread.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\thread_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\thread_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\thread"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\thread"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\thread\"
-				ProgramDataBaseFileName="vc_mswudll_x64\thread.pdb"
+				ObjectFile="vc_x64_mswudll\thread\"
+				ProgramDataBaseFileName="vc_x64_mswudll\thread.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\thread.exe"
+				OutputFile="vc_x64_mswudll\thread.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\thread.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\thread.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\thread_vc9.bsc"
+				OutputFile="vc_x64_mswudll\thread_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/toolbar/makefile.vc b/samples/toolbar/makefile.vc
index 1011af4511..6a2fc5b971 100644
--- a/samples/toolbar/makefile.vc
+++ b/samples/toolbar/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/toolbar/toolbar_vc8.vcproj b/samples/toolbar/toolbar_vc8.vcproj
index 6bc576b015..52a975c9a8 100644
--- a/samples/toolbar/toolbar_vc8.vcproj
+++ b/samples/toolbar/toolbar_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\toolbar"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\toolbar"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\toolbar\"
-				ProgramDataBaseFileName="vc_mswud_x64\toolbar.pdb"
+				ObjectFile="vc_x64_mswud\toolbar\"
+				ProgramDataBaseFileName="vc_x64_mswud\toolbar.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\toolbar.exe"
+				OutputFile="vc_x64_mswud\toolbar.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\toolbar.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\toolbar.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\toolbar_vc8.bsc"
+				OutputFile="vc_x64_mswud\toolbar_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\toolbar"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\toolbar"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\toolbar\"
-				ProgramDataBaseFileName="vc_mswu_x64\toolbar.pdb"
+				ObjectFile="vc_x64_mswu\toolbar\"
+				ProgramDataBaseFileName="vc_x64_mswu\toolbar.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\toolbar.exe"
+				OutputFile="vc_x64_mswu\toolbar.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\toolbar.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\toolbar.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\toolbar_vc8.bsc"
+				OutputFile="vc_x64_mswu\toolbar_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\toolbar"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\toolbar"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\toolbar\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\toolbar.pdb"
+				ObjectFile="vc_x64_mswuddll\toolbar\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\toolbar.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\toolbar.exe"
+				OutputFile="vc_x64_mswuddll\toolbar.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\toolbar.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\toolbar.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\toolbar_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\toolbar_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\toolbar"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\toolbar"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\toolbar\"
-				ProgramDataBaseFileName="vc_mswudll_x64\toolbar.pdb"
+				ObjectFile="vc_x64_mswudll\toolbar\"
+				ProgramDataBaseFileName="vc_x64_mswudll\toolbar.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\toolbar.exe"
+				OutputFile="vc_x64_mswudll\toolbar.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\toolbar.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\toolbar.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\toolbar_vc8.bsc"
+				OutputFile="vc_x64_mswudll\toolbar_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/toolbar/toolbar_vc9.vcproj b/samples/toolbar/toolbar_vc9.vcproj
index 350d583bf4..7f7c02f617 100644
--- a/samples/toolbar/toolbar_vc9.vcproj
+++ b/samples/toolbar/toolbar_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\toolbar"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\toolbar"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\toolbar\"
-				ProgramDataBaseFileName="vc_mswud_x64\toolbar.pdb"
+				ObjectFile="vc_x64_mswud\toolbar\"
+				ProgramDataBaseFileName="vc_x64_mswud\toolbar.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\toolbar.exe"
+				OutputFile="vc_x64_mswud\toolbar.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\toolbar.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\toolbar.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\toolbar_vc9.bsc"
+				OutputFile="vc_x64_mswud\toolbar_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\toolbar"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\toolbar"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\toolbar\"
-				ProgramDataBaseFileName="vc_mswu_x64\toolbar.pdb"
+				ObjectFile="vc_x64_mswu\toolbar\"
+				ProgramDataBaseFileName="vc_x64_mswu\toolbar.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\toolbar.exe"
+				OutputFile="vc_x64_mswu\toolbar.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\toolbar.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\toolbar.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\toolbar_vc9.bsc"
+				OutputFile="vc_x64_mswu\toolbar_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\toolbar"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\toolbar"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\toolbar\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\toolbar.pdb"
+				ObjectFile="vc_x64_mswuddll\toolbar\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\toolbar.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\toolbar.exe"
+				OutputFile="vc_x64_mswuddll\toolbar.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\toolbar.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\toolbar.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\toolbar_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\toolbar_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\toolbar"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\toolbar"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\toolbar\"
-				ProgramDataBaseFileName="vc_mswudll_x64\toolbar.pdb"
+				ObjectFile="vc_x64_mswudll\toolbar\"
+				ProgramDataBaseFileName="vc_x64_mswudll\toolbar.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\toolbar.exe"
+				OutputFile="vc_x64_mswudll\toolbar.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\toolbar.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\toolbar.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\toolbar_vc9.bsc"
+				OutputFile="vc_x64_mswudll\toolbar_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/treectrl/makefile.vc b/samples/treectrl/makefile.vc
index 1df0ed509e..c68fb140ea 100644
--- a/samples/treectrl/makefile.vc
+++ b/samples/treectrl/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/treectrl/treectrl_vc8.vcproj b/samples/treectrl/treectrl_vc8.vcproj
index 5e2d780f65..c09a66568b 100644
--- a/samples/treectrl/treectrl_vc8.vcproj
+++ b/samples/treectrl/treectrl_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\treectrl"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\treectrl"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\treectrl\"
-				ProgramDataBaseFileName="vc_mswud_x64\treectrl.pdb"
+				ObjectFile="vc_x64_mswud\treectrl\"
+				ProgramDataBaseFileName="vc_x64_mswud\treectrl.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\treectrl.exe"
+				OutputFile="vc_x64_mswud\treectrl.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\treectrl.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\treectrl.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\treectrl_vc8.bsc"
+				OutputFile="vc_x64_mswud\treectrl_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\treectrl"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\treectrl"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\treectrl\"
-				ProgramDataBaseFileName="vc_mswu_x64\treectrl.pdb"
+				ObjectFile="vc_x64_mswu\treectrl\"
+				ProgramDataBaseFileName="vc_x64_mswu\treectrl.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\treectrl.exe"
+				OutputFile="vc_x64_mswu\treectrl.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\treectrl.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\treectrl.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\treectrl_vc8.bsc"
+				OutputFile="vc_x64_mswu\treectrl_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\treectrl"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\treectrl"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\treectrl\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\treectrl.pdb"
+				ObjectFile="vc_x64_mswuddll\treectrl\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\treectrl.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\treectrl.exe"
+				OutputFile="vc_x64_mswuddll\treectrl.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\treectrl.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\treectrl.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\treectrl_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\treectrl_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\treectrl"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\treectrl"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\treectrl\"
-				ProgramDataBaseFileName="vc_mswudll_x64\treectrl.pdb"
+				ObjectFile="vc_x64_mswudll\treectrl\"
+				ProgramDataBaseFileName="vc_x64_mswudll\treectrl.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\treectrl.exe"
+				OutputFile="vc_x64_mswudll\treectrl.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\treectrl.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\treectrl.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\treectrl_vc8.bsc"
+				OutputFile="vc_x64_mswudll\treectrl_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/treectrl/treectrl_vc9.vcproj b/samples/treectrl/treectrl_vc9.vcproj
index 85a43639c8..845a2c233d 100644
--- a/samples/treectrl/treectrl_vc9.vcproj
+++ b/samples/treectrl/treectrl_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\treectrl"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\treectrl"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\treectrl\"
-				ProgramDataBaseFileName="vc_mswud_x64\treectrl.pdb"
+				ObjectFile="vc_x64_mswud\treectrl\"
+				ProgramDataBaseFileName="vc_x64_mswud\treectrl.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\treectrl.exe"
+				OutputFile="vc_x64_mswud\treectrl.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\treectrl.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\treectrl.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\treectrl_vc9.bsc"
+				OutputFile="vc_x64_mswud\treectrl_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\treectrl"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\treectrl"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\treectrl\"
-				ProgramDataBaseFileName="vc_mswu_x64\treectrl.pdb"
+				ObjectFile="vc_x64_mswu\treectrl\"
+				ProgramDataBaseFileName="vc_x64_mswu\treectrl.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\treectrl.exe"
+				OutputFile="vc_x64_mswu\treectrl.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\treectrl.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\treectrl.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\treectrl_vc9.bsc"
+				OutputFile="vc_x64_mswu\treectrl_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\treectrl"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\treectrl"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\treectrl\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\treectrl.pdb"
+				ObjectFile="vc_x64_mswuddll\treectrl\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\treectrl.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\treectrl.exe"
+				OutputFile="vc_x64_mswuddll\treectrl.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\treectrl.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\treectrl.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\treectrl_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\treectrl_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\treectrl"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\treectrl"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\treectrl\"
-				ProgramDataBaseFileName="vc_mswudll_x64\treectrl.pdb"
+				ObjectFile="vc_x64_mswudll\treectrl\"
+				ProgramDataBaseFileName="vc_x64_mswudll\treectrl.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\treectrl.exe"
+				OutputFile="vc_x64_mswudll\treectrl.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\treectrl.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\treectrl.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\treectrl_vc9.bsc"
+				OutputFile="vc_x64_mswudll\treectrl_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/treelist/makefile.vc b/samples/treelist/makefile.vc
index a190c07e1a..701226c3e0 100644
--- a/samples/treelist/makefile.vc
+++ b/samples/treelist/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/treelist/treelist_vc8.vcproj b/samples/treelist/treelist_vc8.vcproj
index 1dc46f40a5..352d1ba8ac 100644
--- a/samples/treelist/treelist_vc8.vcproj
+++ b/samples/treelist/treelist_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\treelist"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\treelist"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\treelist\"
-				ProgramDataBaseFileName="vc_mswud_x64\treelist.pdb"
+				ObjectFile="vc_x64_mswud\treelist\"
+				ProgramDataBaseFileName="vc_x64_mswud\treelist.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\treelist.exe"
+				OutputFile="vc_x64_mswud\treelist.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\treelist.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\treelist.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\treelist_vc8.bsc"
+				OutputFile="vc_x64_mswud\treelist_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\treelist"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\treelist"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\treelist\"
-				ProgramDataBaseFileName="vc_mswu_x64\treelist.pdb"
+				ObjectFile="vc_x64_mswu\treelist\"
+				ProgramDataBaseFileName="vc_x64_mswu\treelist.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\treelist.exe"
+				OutputFile="vc_x64_mswu\treelist.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\treelist.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\treelist.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\treelist_vc8.bsc"
+				OutputFile="vc_x64_mswu\treelist_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\treelist"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\treelist"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\treelist\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\treelist.pdb"
+				ObjectFile="vc_x64_mswuddll\treelist\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\treelist.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\treelist.exe"
+				OutputFile="vc_x64_mswuddll\treelist.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\treelist.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\treelist.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\treelist_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\treelist_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\treelist"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\treelist"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\treelist\"
-				ProgramDataBaseFileName="vc_mswudll_x64\treelist.pdb"
+				ObjectFile="vc_x64_mswudll\treelist\"
+				ProgramDataBaseFileName="vc_x64_mswudll\treelist.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\treelist.exe"
+				OutputFile="vc_x64_mswudll\treelist.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\treelist.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\treelist.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\treelist_vc8.bsc"
+				OutputFile="vc_x64_mswudll\treelist_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/treelist/treelist_vc9.vcproj b/samples/treelist/treelist_vc9.vcproj
index a7d8293e5b..fc032a3305 100644
--- a/samples/treelist/treelist_vc9.vcproj
+++ b/samples/treelist/treelist_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\treelist"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\treelist"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\treelist\"
-				ProgramDataBaseFileName="vc_mswud_x64\treelist.pdb"
+				ObjectFile="vc_x64_mswud\treelist\"
+				ProgramDataBaseFileName="vc_x64_mswud\treelist.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\treelist.exe"
+				OutputFile="vc_x64_mswud\treelist.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\treelist.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\treelist.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\treelist_vc9.bsc"
+				OutputFile="vc_x64_mswud\treelist_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\treelist"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\treelist"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\treelist\"
-				ProgramDataBaseFileName="vc_mswu_x64\treelist.pdb"
+				ObjectFile="vc_x64_mswu\treelist\"
+				ProgramDataBaseFileName="vc_x64_mswu\treelist.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\treelist.exe"
+				OutputFile="vc_x64_mswu\treelist.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\treelist.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\treelist.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\treelist_vc9.bsc"
+				OutputFile="vc_x64_mswu\treelist_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\treelist"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\treelist"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\treelist\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\treelist.pdb"
+				ObjectFile="vc_x64_mswuddll\treelist\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\treelist.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\treelist.exe"
+				OutputFile="vc_x64_mswuddll\treelist.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\treelist.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\treelist.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\treelist_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\treelist_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\treelist"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\treelist"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\treelist\"
-				ProgramDataBaseFileName="vc_mswudll_x64\treelist.pdb"
+				ObjectFile="vc_x64_mswudll\treelist\"
+				ProgramDataBaseFileName="vc_x64_mswudll\treelist.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\treelist.exe"
+				OutputFile="vc_x64_mswudll\treelist.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\treelist.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\treelist.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\treelist_vc9.bsc"
+				OutputFile="vc_x64_mswudll\treelist_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/typetest/makefile.vc b/samples/typetest/makefile.vc
index 6e03b2fec6..3ea7a08c48 100644
--- a/samples/typetest/makefile.vc
+++ b/samples/typetest/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/typetest/typetest_vc8.vcproj b/samples/typetest/typetest_vc8.vcproj
index d9a4d22f07..da9940ed50 100644
--- a/samples/typetest/typetest_vc8.vcproj
+++ b/samples/typetest/typetest_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\typetest"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\typetest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\typetest\"
-				ProgramDataBaseFileName="vc_mswud_x64\typetest.pdb"
+				ObjectFile="vc_x64_mswud\typetest\"
+				ProgramDataBaseFileName="vc_x64_mswud\typetest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\typetest.exe"
+				OutputFile="vc_x64_mswud\typetest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\typetest.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\typetest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\typetest_vc8.bsc"
+				OutputFile="vc_x64_mswud\typetest_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\typetest"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\typetest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\typetest\"
-				ProgramDataBaseFileName="vc_mswu_x64\typetest.pdb"
+				ObjectFile="vc_x64_mswu\typetest\"
+				ProgramDataBaseFileName="vc_x64_mswu\typetest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\typetest.exe"
+				OutputFile="vc_x64_mswu\typetest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\typetest.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\typetest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\typetest_vc8.bsc"
+				OutputFile="vc_x64_mswu\typetest_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\typetest"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\typetest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\typetest\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\typetest.pdb"
+				ObjectFile="vc_x64_mswuddll\typetest\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\typetest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\typetest.exe"
+				OutputFile="vc_x64_mswuddll\typetest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\typetest.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\typetest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\typetest_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\typetest_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\typetest"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\typetest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\typetest\"
-				ProgramDataBaseFileName="vc_mswudll_x64\typetest.pdb"
+				ObjectFile="vc_x64_mswudll\typetest\"
+				ProgramDataBaseFileName="vc_x64_mswudll\typetest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\typetest.exe"
+				OutputFile="vc_x64_mswudll\typetest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\typetest.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\typetest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\typetest_vc8.bsc"
+				OutputFile="vc_x64_mswudll\typetest_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/typetest/typetest_vc9.vcproj b/samples/typetest/typetest_vc9.vcproj
index 6663815984..aaea7a1fd8 100644
--- a/samples/typetest/typetest_vc9.vcproj
+++ b/samples/typetest/typetest_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\typetest"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\typetest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\typetest\"
-				ProgramDataBaseFileName="vc_mswud_x64\typetest.pdb"
+				ObjectFile="vc_x64_mswud\typetest\"
+				ProgramDataBaseFileName="vc_x64_mswud\typetest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\typetest.exe"
+				OutputFile="vc_x64_mswud\typetest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\typetest.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\typetest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\typetest_vc9.bsc"
+				OutputFile="vc_x64_mswud\typetest_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\typetest"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\typetest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\typetest\"
-				ProgramDataBaseFileName="vc_mswu_x64\typetest.pdb"
+				ObjectFile="vc_x64_mswu\typetest\"
+				ProgramDataBaseFileName="vc_x64_mswu\typetest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\typetest.exe"
+				OutputFile="vc_x64_mswu\typetest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\typetest.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\typetest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\typetest_vc9.bsc"
+				OutputFile="vc_x64_mswu\typetest_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\typetest"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\typetest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\typetest\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\typetest.pdb"
+				ObjectFile="vc_x64_mswuddll\typetest\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\typetest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\typetest.exe"
+				OutputFile="vc_x64_mswuddll\typetest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\typetest.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\typetest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\typetest_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\typetest_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\typetest"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\typetest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\typetest\"
-				ProgramDataBaseFileName="vc_mswudll_x64\typetest.pdb"
+				ObjectFile="vc_x64_mswudll\typetest\"
+				ProgramDataBaseFileName="vc_x64_mswudll\typetest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\typetest.exe"
+				OutputFile="vc_x64_mswudll\typetest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\typetest.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\typetest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\typetest_vc9.bsc"
+				OutputFile="vc_x64_mswudll\typetest_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/uiaction/makefile.vc b/samples/uiaction/makefile.vc
index 2fec6d277a..6c33c4daea 100644
--- a/samples/uiaction/makefile.vc
+++ b/samples/uiaction/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/uiaction/uiaction_vc8.vcproj b/samples/uiaction/uiaction_vc8.vcproj
index 0bc45c4706..47da8cddce 100644
--- a/samples/uiaction/uiaction_vc8.vcproj
+++ b/samples/uiaction/uiaction_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\uiaction"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\uiaction"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\uiaction\"
-				ProgramDataBaseFileName="vc_mswud_x64\uiaction.pdb"
+				ObjectFile="vc_x64_mswud\uiaction\"
+				ProgramDataBaseFileName="vc_x64_mswud\uiaction.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\uiaction.exe"
+				OutputFile="vc_x64_mswud\uiaction.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\uiaction.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\uiaction.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\uiaction_vc8.bsc"
+				OutputFile="vc_x64_mswud\uiaction_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\uiaction"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\uiaction"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\uiaction\"
-				ProgramDataBaseFileName="vc_mswu_x64\uiaction.pdb"
+				ObjectFile="vc_x64_mswu\uiaction\"
+				ProgramDataBaseFileName="vc_x64_mswu\uiaction.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\uiaction.exe"
+				OutputFile="vc_x64_mswu\uiaction.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\uiaction.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\uiaction.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\uiaction_vc8.bsc"
+				OutputFile="vc_x64_mswu\uiaction_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\uiaction"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\uiaction"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\uiaction\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\uiaction.pdb"
+				ObjectFile="vc_x64_mswuddll\uiaction\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\uiaction.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\uiaction.exe"
+				OutputFile="vc_x64_mswuddll\uiaction.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\uiaction.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\uiaction.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\uiaction_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\uiaction_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\uiaction"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\uiaction"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\uiaction\"
-				ProgramDataBaseFileName="vc_mswudll_x64\uiaction.pdb"
+				ObjectFile="vc_x64_mswudll\uiaction\"
+				ProgramDataBaseFileName="vc_x64_mswudll\uiaction.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\uiaction.exe"
+				OutputFile="vc_x64_mswudll\uiaction.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\uiaction.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\uiaction.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\uiaction_vc8.bsc"
+				OutputFile="vc_x64_mswudll\uiaction_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/uiaction/uiaction_vc9.vcproj b/samples/uiaction/uiaction_vc9.vcproj
index 02c0625d2a..149cdc4b55 100644
--- a/samples/uiaction/uiaction_vc9.vcproj
+++ b/samples/uiaction/uiaction_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\uiaction"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\uiaction"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\uiaction\"
-				ProgramDataBaseFileName="vc_mswud_x64\uiaction.pdb"
+				ObjectFile="vc_x64_mswud\uiaction\"
+				ProgramDataBaseFileName="vc_x64_mswud\uiaction.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\uiaction.exe"
+				OutputFile="vc_x64_mswud\uiaction.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\uiaction.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\uiaction.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\uiaction_vc9.bsc"
+				OutputFile="vc_x64_mswud\uiaction_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\uiaction"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\uiaction"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\uiaction\"
-				ProgramDataBaseFileName="vc_mswu_x64\uiaction.pdb"
+				ObjectFile="vc_x64_mswu\uiaction\"
+				ProgramDataBaseFileName="vc_x64_mswu\uiaction.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\uiaction.exe"
+				OutputFile="vc_x64_mswu\uiaction.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\uiaction.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\uiaction.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\uiaction_vc9.bsc"
+				OutputFile="vc_x64_mswu\uiaction_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\uiaction"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\uiaction"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\uiaction\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\uiaction.pdb"
+				ObjectFile="vc_x64_mswuddll\uiaction\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\uiaction.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\uiaction.exe"
+				OutputFile="vc_x64_mswuddll\uiaction.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\uiaction.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\uiaction.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\uiaction_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\uiaction_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\uiaction"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\uiaction"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\uiaction\"
-				ProgramDataBaseFileName="vc_mswudll_x64\uiaction.pdb"
+				ObjectFile="vc_x64_mswudll\uiaction\"
+				ProgramDataBaseFileName="vc_x64_mswudll\uiaction.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\uiaction.exe"
+				OutputFile="vc_x64_mswudll\uiaction.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\uiaction.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\uiaction.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\uiaction_vc9.bsc"
+				OutputFile="vc_x64_mswudll\uiaction_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/validate/makefile.vc b/samples/validate/makefile.vc
index 8589a0eea4..9fedf6dccc 100644
--- a/samples/validate/makefile.vc
+++ b/samples/validate/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/validate/validate_vc8.vcproj b/samples/validate/validate_vc8.vcproj
index a328302680..49e037f87b 100644
--- a/samples/validate/validate_vc8.vcproj
+++ b/samples/validate/validate_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\validate"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\validate"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\validate\"
-				ProgramDataBaseFileName="vc_mswud_x64\validate.pdb"
+				ObjectFile="vc_x64_mswud\validate\"
+				ProgramDataBaseFileName="vc_x64_mswud\validate.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\validate.exe"
+				OutputFile="vc_x64_mswud\validate.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\validate.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\validate.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\validate_vc8.bsc"
+				OutputFile="vc_x64_mswud\validate_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\validate"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\validate"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\validate\"
-				ProgramDataBaseFileName="vc_mswu_x64\validate.pdb"
+				ObjectFile="vc_x64_mswu\validate\"
+				ProgramDataBaseFileName="vc_x64_mswu\validate.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\validate.exe"
+				OutputFile="vc_x64_mswu\validate.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\validate.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\validate.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\validate_vc8.bsc"
+				OutputFile="vc_x64_mswu\validate_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\validate"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\validate"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\validate\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\validate.pdb"
+				ObjectFile="vc_x64_mswuddll\validate\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\validate.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\validate.exe"
+				OutputFile="vc_x64_mswuddll\validate.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\validate.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\validate.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\validate_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\validate_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\validate"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\validate"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\validate\"
-				ProgramDataBaseFileName="vc_mswudll_x64\validate.pdb"
+				ObjectFile="vc_x64_mswudll\validate\"
+				ProgramDataBaseFileName="vc_x64_mswudll\validate.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\validate.exe"
+				OutputFile="vc_x64_mswudll\validate.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\validate.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\validate.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\validate_vc8.bsc"
+				OutputFile="vc_x64_mswudll\validate_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/validate/validate_vc9.vcproj b/samples/validate/validate_vc9.vcproj
index f871522933..0de6a48bef 100644
--- a/samples/validate/validate_vc9.vcproj
+++ b/samples/validate/validate_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\validate"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\validate"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\validate\"
-				ProgramDataBaseFileName="vc_mswud_x64\validate.pdb"
+				ObjectFile="vc_x64_mswud\validate\"
+				ProgramDataBaseFileName="vc_x64_mswud\validate.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\validate.exe"
+				OutputFile="vc_x64_mswud\validate.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\validate.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\validate.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\validate_vc9.bsc"
+				OutputFile="vc_x64_mswud\validate_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\validate"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\validate"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\validate\"
-				ProgramDataBaseFileName="vc_mswu_x64\validate.pdb"
+				ObjectFile="vc_x64_mswu\validate\"
+				ProgramDataBaseFileName="vc_x64_mswu\validate.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\validate.exe"
+				OutputFile="vc_x64_mswu\validate.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\validate.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\validate.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\validate_vc9.bsc"
+				OutputFile="vc_x64_mswu\validate_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\validate"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\validate"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\validate\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\validate.pdb"
+				ObjectFile="vc_x64_mswuddll\validate\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\validate.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\validate.exe"
+				OutputFile="vc_x64_mswuddll\validate.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\validate.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\validate.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\validate_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\validate_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\validate"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\validate"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\validate\"
-				ProgramDataBaseFileName="vc_mswudll_x64\validate.pdb"
+				ObjectFile="vc_x64_mswudll\validate\"
+				ProgramDataBaseFileName="vc_x64_mswudll\validate.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\validate.exe"
+				OutputFile="vc_x64_mswudll\validate.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\validate.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\validate.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\validate_vc9.bsc"
+				OutputFile="vc_x64_mswudll\validate_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/vscroll/makefile.vc b/samples/vscroll/makefile.vc
index 94923ff9b1..635668ef7b 100644
--- a/samples/vscroll/makefile.vc
+++ b/samples/vscroll/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/vscroll/vscroll_vc8.vcproj b/samples/vscroll/vscroll_vc8.vcproj
index b914311ccb..b998c83cc6 100644
--- a/samples/vscroll/vscroll_vc8.vcproj
+++ b/samples/vscroll/vscroll_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\vstest"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\vstest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\vstest\"
-				ProgramDataBaseFileName="vc_mswud_x64\vstest.pdb"
+				ObjectFile="vc_x64_mswud\vstest\"
+				ProgramDataBaseFileName="vc_x64_mswud\vstest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\vstest.exe"
+				OutputFile="vc_x64_mswud\vstest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\vstest.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\vstest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\vscroll_vc8.bsc"
+				OutputFile="vc_x64_mswud\vscroll_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\vstest"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\vstest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\vstest\"
-				ProgramDataBaseFileName="vc_mswu_x64\vstest.pdb"
+				ObjectFile="vc_x64_mswu\vstest\"
+				ProgramDataBaseFileName="vc_x64_mswu\vstest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\vstest.exe"
+				OutputFile="vc_x64_mswu\vstest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\vstest.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\vstest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\vscroll_vc8.bsc"
+				OutputFile="vc_x64_mswu\vscroll_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\vstest"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\vstest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\vstest\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\vstest.pdb"
+				ObjectFile="vc_x64_mswuddll\vstest\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\vstest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\vstest.exe"
+				OutputFile="vc_x64_mswuddll\vstest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\vstest.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\vstest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\vscroll_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\vscroll_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\vstest"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\vstest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\vstest\"
-				ProgramDataBaseFileName="vc_mswudll_x64\vstest.pdb"
+				ObjectFile="vc_x64_mswudll\vstest\"
+				ProgramDataBaseFileName="vc_x64_mswudll\vstest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\vstest.exe"
+				OutputFile="vc_x64_mswudll\vstest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\vstest.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\vstest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\vscroll_vc8.bsc"
+				OutputFile="vc_x64_mswudll\vscroll_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/vscroll/vscroll_vc9.vcproj b/samples/vscroll/vscroll_vc9.vcproj
index 2bd4eac987..10357fd18f 100644
--- a/samples/vscroll/vscroll_vc9.vcproj
+++ b/samples/vscroll/vscroll_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\vstest"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\vstest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\vstest\"
-				ProgramDataBaseFileName="vc_mswud_x64\vstest.pdb"
+				ObjectFile="vc_x64_mswud\vstest\"
+				ProgramDataBaseFileName="vc_x64_mswud\vstest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\vstest.exe"
+				OutputFile="vc_x64_mswud\vstest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\vstest.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\vstest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\vscroll_vc9.bsc"
+				OutputFile="vc_x64_mswud\vscroll_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\vstest"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\vstest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\vstest\"
-				ProgramDataBaseFileName="vc_mswu_x64\vstest.pdb"
+				ObjectFile="vc_x64_mswu\vstest\"
+				ProgramDataBaseFileName="vc_x64_mswu\vstest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\vstest.exe"
+				OutputFile="vc_x64_mswu\vstest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\vstest.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\vstest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\vscroll_vc9.bsc"
+				OutputFile="vc_x64_mswu\vscroll_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\vstest"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\vstest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\vstest\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\vstest.pdb"
+				ObjectFile="vc_x64_mswuddll\vstest\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\vstest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\vstest.exe"
+				OutputFile="vc_x64_mswuddll\vstest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\vstest.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\vstest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\vscroll_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\vscroll_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\vstest"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\vstest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\vstest\"
-				ProgramDataBaseFileName="vc_mswudll_x64\vstest.pdb"
+				ObjectFile="vc_x64_mswudll\vstest\"
+				ProgramDataBaseFileName="vc_x64_mswudll\vstest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\vstest.exe"
+				OutputFile="vc_x64_mswudll\vstest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\vstest.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\vstest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\vscroll_vc9.bsc"
+				OutputFile="vc_x64_mswudll\vscroll_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/webrequest/makefile.vc b/samples/webrequest/makefile.vc
index 4a430a7b84..49b8cead78 100644
--- a/samples/webrequest/makefile.vc
+++ b/samples/webrequest/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/webrequest/webrequest_vc8.vcproj b/samples/webrequest/webrequest_vc8.vcproj
index 83354b0de9..33d235b650 100644
--- a/samples/webrequest/webrequest_vc8.vcproj
+++ b/samples/webrequest/webrequest_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\webrequest"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\webrequest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\webrequest\"
-				ProgramDataBaseFileName="vc_mswud_x64\webrequest.pdb"
+				ObjectFile="vc_x64_mswud\webrequest\"
+				ProgramDataBaseFileName="vc_x64_mswud\webrequest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib  wxbase31ud_net.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\webrequest.exe"
+				OutputFile="vc_x64_mswud\webrequest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\webrequest.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\webrequest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\webrequest_vc8.bsc"
+				OutputFile="vc_x64_mswud\webrequest_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\webrequest"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\webrequest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\webrequest\"
-				ProgramDataBaseFileName="vc_mswu_x64\webrequest.pdb"
+				ObjectFile="vc_x64_mswu\webrequest\"
+				ProgramDataBaseFileName="vc_x64_mswu\webrequest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib  wxbase31u_net.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\webrequest.exe"
+				OutputFile="vc_x64_mswu\webrequest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\webrequest.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\webrequest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\webrequest_vc8.bsc"
+				OutputFile="vc_x64_mswu\webrequest_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\webrequest"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\webrequest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\webrequest\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\webrequest.pdb"
+				ObjectFile="vc_x64_mswuddll\webrequest\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\webrequest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib  wxbase31ud_net.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\webrequest.exe"
+				OutputFile="vc_x64_mswuddll\webrequest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\webrequest.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\webrequest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\webrequest_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\webrequest_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\webrequest"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\webrequest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\webrequest\"
-				ProgramDataBaseFileName="vc_mswudll_x64\webrequest.pdb"
+				ObjectFile="vc_x64_mswudll\webrequest\"
+				ProgramDataBaseFileName="vc_x64_mswudll\webrequest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib  wxbase31u_net.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\webrequest.exe"
+				OutputFile="vc_x64_mswudll\webrequest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\webrequest.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\webrequest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\webrequest_vc8.bsc"
+				OutputFile="vc_x64_mswudll\webrequest_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/webrequest/webrequest_vc9.vcproj b/samples/webrequest/webrequest_vc9.vcproj
index 23ac450da0..94bc3a172e 100644
--- a/samples/webrequest/webrequest_vc9.vcproj
+++ b/samples/webrequest/webrequest_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\webrequest"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\webrequest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\webrequest\"
-				ProgramDataBaseFileName="vc_mswud_x64\webrequest.pdb"
+				ObjectFile="vc_x64_mswud\webrequest\"
+				ProgramDataBaseFileName="vc_x64_mswud\webrequest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib  wxbase31ud_net.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\webrequest.exe"
+				OutputFile="vc_x64_mswud\webrequest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\webrequest.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\webrequest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\webrequest_vc9.bsc"
+				OutputFile="vc_x64_mswud\webrequest_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\webrequest"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\webrequest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\webrequest\"
-				ProgramDataBaseFileName="vc_mswu_x64\webrequest.pdb"
+				ObjectFile="vc_x64_mswu\webrequest\"
+				ProgramDataBaseFileName="vc_x64_mswu\webrequest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib  wxbase31u_net.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\webrequest.exe"
+				OutputFile="vc_x64_mswu\webrequest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\webrequest.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\webrequest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\webrequest_vc9.bsc"
+				OutputFile="vc_x64_mswu\webrequest_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\webrequest"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\webrequest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\webrequest\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\webrequest.pdb"
+				ObjectFile="vc_x64_mswuddll\webrequest\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\webrequest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib  wxbase31ud_net.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\webrequest.exe"
+				OutputFile="vc_x64_mswuddll\webrequest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\webrequest.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\webrequest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\webrequest_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\webrequest_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\webrequest"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\webrequest"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\webrequest\"
-				ProgramDataBaseFileName="vc_mswudll_x64\webrequest.pdb"
+				ObjectFile="vc_x64_mswudll\webrequest\"
+				ProgramDataBaseFileName="vc_x64_mswudll\webrequest.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib  wxbase31u_net.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\webrequest.exe"
+				OutputFile="vc_x64_mswudll\webrequest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\webrequest.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\webrequest.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\webrequest_vc9.bsc"
+				OutputFile="vc_x64_mswudll\webrequest_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/webview/makefile.vc b/samples/webview/makefile.vc
index 04a57695b4..567d1569eb 100644
--- a/samples/webview/makefile.vc
+++ b/samples/webview/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/webview/webview_vc8.vcproj b/samples/webview/webview_vc8.vcproj
index bc170a2ebe..03f325dde1 100644
--- a/samples/webview/webview_vc8.vcproj
+++ b/samples/webview/webview_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\webview"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\webview"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\webview\"
-				ProgramDataBaseFileName="vc_mswud_x64\webview.pdb"
+				ObjectFile="vc_x64_mswud\webview\"
+				ProgramDataBaseFileName="vc_x64_mswud\webview.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_webview.lib  wxmsw31ud_stc.lib imm32.lib wxmsw31ud_core.lib  wxbase31ud.lib  wxscintillad.lib   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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\webview.exe"
+				OutputFile="vc_x64_mswud\webview.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\webview.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\webview.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\webview_vc8.bsc"
+				OutputFile="vc_x64_mswud\webview_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\webview"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\webview"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\webview\"
-				ProgramDataBaseFileName="vc_mswu_x64\webview.pdb"
+				ObjectFile="vc_x64_mswu\webview\"
+				ProgramDataBaseFileName="vc_x64_mswu\webview.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_webview.lib  wxmsw31u_stc.lib imm32.lib wxmsw31u_core.lib  wxbase31u.lib  wxscintilla.lib   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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\webview.exe"
+				OutputFile="vc_x64_mswu\webview.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\webview.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\webview.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\webview_vc8.bsc"
+				OutputFile="vc_x64_mswu\webview_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\webview"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\webview"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\webview\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\webview.pdb"
+				ObjectFile="vc_x64_mswuddll\webview\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\webview.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_webview.lib  wxmsw31ud_stc.lib imm32.lib wxmsw31ud_core.lib  wxbase31ud.lib  wxscintillad.lib   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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\webview.exe"
+				OutputFile="vc_x64_mswuddll\webview.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\webview.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\webview.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\webview_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\webview_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\webview"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\webview"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\webview\"
-				ProgramDataBaseFileName="vc_mswudll_x64\webview.pdb"
+				ObjectFile="vc_x64_mswudll\webview\"
+				ProgramDataBaseFileName="vc_x64_mswudll\webview.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_webview.lib  wxmsw31u_stc.lib imm32.lib wxmsw31u_core.lib  wxbase31u.lib  wxscintilla.lib   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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\webview.exe"
+				OutputFile="vc_x64_mswudll\webview.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\webview.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\webview.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\webview_vc8.bsc"
+				OutputFile="vc_x64_mswudll\webview_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/webview/webview_vc9.vcproj b/samples/webview/webview_vc9.vcproj
index d0a9213795..c09dcecdaf 100644
--- a/samples/webview/webview_vc9.vcproj
+++ b/samples/webview/webview_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\webview"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\webview"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\webview\"
-				ProgramDataBaseFileName="vc_mswud_x64\webview.pdb"
+				ObjectFile="vc_x64_mswud\webview\"
+				ProgramDataBaseFileName="vc_x64_mswud\webview.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_webview.lib  wxmsw31ud_stc.lib imm32.lib wxmsw31ud_core.lib  wxbase31ud.lib  wxscintillad.lib   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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\webview.exe"
+				OutputFile="vc_x64_mswud\webview.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\webview.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\webview.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\webview_vc9.bsc"
+				OutputFile="vc_x64_mswud\webview_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\webview"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\webview"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\webview\"
-				ProgramDataBaseFileName="vc_mswu_x64\webview.pdb"
+				ObjectFile="vc_x64_mswu\webview\"
+				ProgramDataBaseFileName="vc_x64_mswu\webview.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_webview.lib  wxmsw31u_stc.lib imm32.lib wxmsw31u_core.lib  wxbase31u.lib  wxscintilla.lib   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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\webview.exe"
+				OutputFile="vc_x64_mswu\webview.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\webview.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\webview.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\webview_vc9.bsc"
+				OutputFile="vc_x64_mswu\webview_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\webview"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\webview"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\webview\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\webview.pdb"
+				ObjectFile="vc_x64_mswuddll\webview\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\webview.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_webview.lib  wxmsw31ud_stc.lib imm32.lib wxmsw31ud_core.lib  wxbase31ud.lib  wxscintillad.lib   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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\webview.exe"
+				OutputFile="vc_x64_mswuddll\webview.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\webview.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\webview.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\webview_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\webview_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\webview"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\webview"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\webview\"
-				ProgramDataBaseFileName="vc_mswudll_x64\webview.pdb"
+				ObjectFile="vc_x64_mswudll\webview\"
+				ProgramDataBaseFileName="vc_x64_mswudll\webview.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_webview.lib  wxmsw31u_stc.lib imm32.lib wxmsw31u_core.lib  wxbase31u.lib  wxscintilla.lib   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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\webview.exe"
+				OutputFile="vc_x64_mswudll\webview.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\webview.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\webview.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\webview_vc9.bsc"
+				OutputFile="vc_x64_mswudll\webview_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/widgets/makefile.vc b/samples/widgets/makefile.vc
index f46d284ce2..ae65b3d145 100644
--- a/samples/widgets/makefile.vc
+++ b/samples/widgets/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/widgets/widgets_vc8.vcproj b/samples/widgets/widgets_vc8.vcproj
index dfb65e4fd5..a986622fb8 100644
--- a/samples/widgets/widgets_vc8.vcproj
+++ b/samples/widgets/widgets_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\widgets"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\widgets"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\widgets\"
-				ProgramDataBaseFileName="vc_mswud_x64\widgets.pdb"
+				ObjectFile="vc_x64_mswud\widgets\"
+				ProgramDataBaseFileName="vc_x64_mswud\widgets.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\widgets.exe"
+				OutputFile="vc_x64_mswud\widgets.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\widgets.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\widgets.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\widgets_vc8.bsc"
+				OutputFile="vc_x64_mswud\widgets_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\widgets"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\widgets"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\widgets\"
-				ProgramDataBaseFileName="vc_mswu_x64\widgets.pdb"
+				ObjectFile="vc_x64_mswu\widgets\"
+				ProgramDataBaseFileName="vc_x64_mswu\widgets.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\widgets.exe"
+				OutputFile="vc_x64_mswu\widgets.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\widgets.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\widgets.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\widgets_vc8.bsc"
+				OutputFile="vc_x64_mswu\widgets_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\widgets"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\widgets"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\widgets\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\widgets.pdb"
+				ObjectFile="vc_x64_mswuddll\widgets\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\widgets.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\widgets.exe"
+				OutputFile="vc_x64_mswuddll\widgets.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\widgets.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\widgets.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\widgets_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\widgets_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\widgets"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\widgets"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\widgets\"
-				ProgramDataBaseFileName="vc_mswudll_x64\widgets.pdb"
+				ObjectFile="vc_x64_mswudll\widgets\"
+				ProgramDataBaseFileName="vc_x64_mswudll\widgets.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\widgets.exe"
+				OutputFile="vc_x64_mswudll\widgets.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\widgets.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\widgets.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\widgets_vc8.bsc"
+				OutputFile="vc_x64_mswudll\widgets_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/widgets/widgets_vc9.vcproj b/samples/widgets/widgets_vc9.vcproj
index bce2ce4191..14f8f91d94 100644
--- a/samples/widgets/widgets_vc9.vcproj
+++ b/samples/widgets/widgets_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\widgets"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\widgets"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\widgets\"
-				ProgramDataBaseFileName="vc_mswud_x64\widgets.pdb"
+				ObjectFile="vc_x64_mswud\widgets\"
+				ProgramDataBaseFileName="vc_x64_mswud\widgets.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\widgets.exe"
+				OutputFile="vc_x64_mswud\widgets.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\widgets.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\widgets.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\widgets_vc9.bsc"
+				OutputFile="vc_x64_mswud\widgets_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\widgets"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\widgets"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\widgets\"
-				ProgramDataBaseFileName="vc_mswu_x64\widgets.pdb"
+				ObjectFile="vc_x64_mswu\widgets\"
+				ProgramDataBaseFileName="vc_x64_mswu\widgets.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\widgets.exe"
+				OutputFile="vc_x64_mswu\widgets.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\widgets.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\widgets.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\widgets_vc9.bsc"
+				OutputFile="vc_x64_mswu\widgets_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\widgets"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\widgets"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\widgets\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\widgets.pdb"
+				ObjectFile="vc_x64_mswuddll\widgets\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\widgets.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\widgets.exe"
+				OutputFile="vc_x64_mswuddll\widgets.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\widgets.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\widgets.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\widgets_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\widgets_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\widgets"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\widgets"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\widgets\"
-				ProgramDataBaseFileName="vc_mswudll_x64\widgets.pdb"
+				ObjectFile="vc_x64_mswudll\widgets\"
+				ProgramDataBaseFileName="vc_x64_mswudll\widgets.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\widgets.exe"
+				OutputFile="vc_x64_mswudll\widgets.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\widgets.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\widgets.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\widgets_vc9.bsc"
+				OutputFile="vc_x64_mswudll\widgets_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/wizard/makefile.vc b/samples/wizard/makefile.vc
index e7c75e44db..0167e66de1 100644
--- a/samples/wizard/makefile.vc
+++ b/samples/wizard/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/wizard/wizard_vc8.vcproj b/samples/wizard/wizard_vc8.vcproj
index 5687d3745c..b37ee59380 100644
--- a/samples/wizard/wizard_vc8.vcproj
+++ b/samples/wizard/wizard_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\wizard"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\wizard"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\wizard\"
-				ProgramDataBaseFileName="vc_mswud_x64\wizard.pdb"
+				ObjectFile="vc_x64_mswud\wizard\"
+				ProgramDataBaseFileName="vc_x64_mswud\wizard.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\wizard.exe"
+				OutputFile="vc_x64_mswud\wizard.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\wizard.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\wizard.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\wizard_vc8.bsc"
+				OutputFile="vc_x64_mswud\wizard_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\wizard"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\wizard"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\wizard\"
-				ProgramDataBaseFileName="vc_mswu_x64\wizard.pdb"
+				ObjectFile="vc_x64_mswu\wizard\"
+				ProgramDataBaseFileName="vc_x64_mswu\wizard.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\wizard.exe"
+				OutputFile="vc_x64_mswu\wizard.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\wizard.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\wizard.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\wizard_vc8.bsc"
+				OutputFile="vc_x64_mswu\wizard_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\wizard"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\wizard"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\wizard\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\wizard.pdb"
+				ObjectFile="vc_x64_mswuddll\wizard\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\wizard.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\wizard.exe"
+				OutputFile="vc_x64_mswuddll\wizard.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\wizard.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\wizard.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\wizard_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\wizard_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\wizard"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\wizard"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\wizard\"
-				ProgramDataBaseFileName="vc_mswudll_x64\wizard.pdb"
+				ObjectFile="vc_x64_mswudll\wizard\"
+				ProgramDataBaseFileName="vc_x64_mswudll\wizard.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\wizard.exe"
+				OutputFile="vc_x64_mswudll\wizard.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\wizard.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\wizard.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\wizard_vc8.bsc"
+				OutputFile="vc_x64_mswudll\wizard_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/wizard/wizard_vc9.vcproj b/samples/wizard/wizard_vc9.vcproj
index 91738ff4af..b1cf1f07b5 100644
--- a/samples/wizard/wizard_vc9.vcproj
+++ b/samples/wizard/wizard_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\wizard"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\wizard"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\wizard\"
-				ProgramDataBaseFileName="vc_mswud_x64\wizard.pdb"
+				ObjectFile="vc_x64_mswud\wizard\"
+				ProgramDataBaseFileName="vc_x64_mswud\wizard.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\wizard.exe"
+				OutputFile="vc_x64_mswud\wizard.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\wizard.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\wizard.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\wizard_vc9.bsc"
+				OutputFile="vc_x64_mswud\wizard_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\wizard"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\wizard"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\wizard\"
-				ProgramDataBaseFileName="vc_mswu_x64\wizard.pdb"
+				ObjectFile="vc_x64_mswu\wizard\"
+				ProgramDataBaseFileName="vc_x64_mswu\wizard.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\wizard.exe"
+				OutputFile="vc_x64_mswu\wizard.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\wizard.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\wizard.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\wizard_vc9.bsc"
+				OutputFile="vc_x64_mswu\wizard_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\wizard"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\wizard"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\wizard\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\wizard.pdb"
+				ObjectFile="vc_x64_mswuddll\wizard\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\wizard.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\wizard.exe"
+				OutputFile="vc_x64_mswuddll\wizard.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\wizard.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\wizard.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\wizard_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\wizard_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\wizard"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\wizard"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\wizard\"
-				ProgramDataBaseFileName="vc_mswudll_x64\wizard.pdb"
+				ObjectFile="vc_x64_mswudll\wizard\"
+				ProgramDataBaseFileName="vc_x64_mswudll\wizard.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\wizard.exe"
+				OutputFile="vc_x64_mswudll\wizard.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\wizard.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\wizard.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\wizard_vc9.bsc"
+				OutputFile="vc_x64_mswudll\wizard_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/wrapsizer/makefile.vc b/samples/wrapsizer/makefile.vc
index 328b88217f..33976e757b 100644
--- a/samples/wrapsizer/makefile.vc
+++ b/samples/wrapsizer/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/wrapsizer/wrapsizer_vc8.vcproj b/samples/wrapsizer/wrapsizer_vc8.vcproj
index ed19c3b14e..a5cf1a4de5 100644
--- a/samples/wrapsizer/wrapsizer_vc8.vcproj
+++ b/samples/wrapsizer/wrapsizer_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\wrapsizer"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\wrapsizer"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\wrapsizer\"
-				ProgramDataBaseFileName="vc_mswud_x64\wrapsizer.pdb"
+				ObjectFile="vc_x64_mswud\wrapsizer\"
+				ProgramDataBaseFileName="vc_x64_mswud\wrapsizer.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\wrapsizer.exe"
+				OutputFile="vc_x64_mswud\wrapsizer.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\wrapsizer.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\wrapsizer.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\wrapsizer_vc8.bsc"
+				OutputFile="vc_x64_mswud\wrapsizer_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\wrapsizer"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\wrapsizer"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\wrapsizer\"
-				ProgramDataBaseFileName="vc_mswu_x64\wrapsizer.pdb"
+				ObjectFile="vc_x64_mswu\wrapsizer\"
+				ProgramDataBaseFileName="vc_x64_mswu\wrapsizer.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\wrapsizer.exe"
+				OutputFile="vc_x64_mswu\wrapsizer.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\wrapsizer.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\wrapsizer.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\wrapsizer_vc8.bsc"
+				OutputFile="vc_x64_mswu\wrapsizer_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\wrapsizer"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\wrapsizer"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\wrapsizer\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\wrapsizer.pdb"
+				ObjectFile="vc_x64_mswuddll\wrapsizer\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\wrapsizer.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\wrapsizer.exe"
+				OutputFile="vc_x64_mswuddll\wrapsizer.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\wrapsizer.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\wrapsizer.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\wrapsizer_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\wrapsizer_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\wrapsizer"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\wrapsizer"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\wrapsizer\"
-				ProgramDataBaseFileName="vc_mswudll_x64\wrapsizer.pdb"
+				ObjectFile="vc_x64_mswudll\wrapsizer\"
+				ProgramDataBaseFileName="vc_x64_mswudll\wrapsizer.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\wrapsizer.exe"
+				OutputFile="vc_x64_mswudll\wrapsizer.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\wrapsizer.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\wrapsizer.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\wrapsizer_vc8.bsc"
+				OutputFile="vc_x64_mswudll\wrapsizer_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/wrapsizer/wrapsizer_vc9.vcproj b/samples/wrapsizer/wrapsizer_vc9.vcproj
index 29acbe2f3f..8c14a7e86a 100644
--- a/samples/wrapsizer/wrapsizer_vc9.vcproj
+++ b/samples/wrapsizer/wrapsizer_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\wrapsizer"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\wrapsizer"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\wrapsizer\"
-				ProgramDataBaseFileName="vc_mswud_x64\wrapsizer.pdb"
+				ObjectFile="vc_x64_mswud\wrapsizer\"
+				ProgramDataBaseFileName="vc_x64_mswud\wrapsizer.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\wrapsizer.exe"
+				OutputFile="vc_x64_mswud\wrapsizer.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\wrapsizer.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\wrapsizer.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\wrapsizer_vc9.bsc"
+				OutputFile="vc_x64_mswud\wrapsizer_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\wrapsizer"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\wrapsizer"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\wrapsizer\"
-				ProgramDataBaseFileName="vc_mswu_x64\wrapsizer.pdb"
+				ObjectFile="vc_x64_mswu\wrapsizer\"
+				ProgramDataBaseFileName="vc_x64_mswu\wrapsizer.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\wrapsizer.exe"
+				OutputFile="vc_x64_mswu\wrapsizer.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\wrapsizer.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\wrapsizer.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\wrapsizer_vc9.bsc"
+				OutputFile="vc_x64_mswu\wrapsizer_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\wrapsizer"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\wrapsizer"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\wrapsizer\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\wrapsizer.pdb"
+				ObjectFile="vc_x64_mswuddll\wrapsizer\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\wrapsizer.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\wrapsizer.exe"
+				OutputFile="vc_x64_mswuddll\wrapsizer.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\wrapsizer.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\wrapsizer.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\wrapsizer_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\wrapsizer_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\wrapsizer"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\wrapsizer"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\wrapsizer\"
-				ProgramDataBaseFileName="vc_mswudll_x64\wrapsizer.pdb"
+				ObjectFile="vc_x64_mswudll\wrapsizer\"
+				ProgramDataBaseFileName="vc_x64_mswudll\wrapsizer.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\wrapsizer.exe"
+				OutputFile="vc_x64_mswudll\wrapsizer.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\wrapsizer.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\wrapsizer.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\wrapsizer_vc9.bsc"
+				OutputFile="vc_x64_mswudll\wrapsizer_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/xrc/makefile.vc b/samples/xrc/makefile.vc
index ce0a49ea3d..77e77eba64 100644
--- a/samples/xrc/makefile.vc
+++ b/samples/xrc/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/xrc/xrcdemo_vc8.vcproj b/samples/xrc/xrcdemo_vc8.vcproj
index 330083d013..2cd7f1cf25 100644
--- a/samples/xrc/xrcdemo_vc8.vcproj
+++ b/samples/xrc/xrcdemo_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\xrcdemo"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\xrcdemo"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\xrcdemo\"
-				ProgramDataBaseFileName="vc_mswud_x64\xrcdemo.pdb"
+				ObjectFile="vc_x64_mswud\xrcdemo\"
+				ProgramDataBaseFileName="vc_x64_mswud\xrcdemo.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_aui.lib  wxmsw31ud_ribbon.lib  wxmsw31ud_xrc.lib  wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud_xml.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\xrcdemo.exe"
+				OutputFile="vc_x64_mswud\xrcdemo.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\xrcdemo.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\xrcdemo.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\xrcdemo_vc8.bsc"
+				OutputFile="vc_x64_mswud\xrcdemo_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\xrcdemo"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\xrcdemo"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\xrcdemo\"
-				ProgramDataBaseFileName="vc_mswu_x64\xrcdemo.pdb"
+				ObjectFile="vc_x64_mswu\xrcdemo\"
+				ProgramDataBaseFileName="vc_x64_mswu\xrcdemo.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_aui.lib  wxmsw31u_ribbon.lib  wxmsw31u_xrc.lib  wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u_xml.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\xrcdemo.exe"
+				OutputFile="vc_x64_mswu\xrcdemo.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\xrcdemo.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\xrcdemo.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\xrcdemo_vc8.bsc"
+				OutputFile="vc_x64_mswu\xrcdemo_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\xrcdemo"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\xrcdemo"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\xrcdemo\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\xrcdemo.pdb"
+				ObjectFile="vc_x64_mswuddll\xrcdemo\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\xrcdemo.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_aui.lib  wxmsw31ud_ribbon.lib  wxmsw31ud_xrc.lib  wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud_xml.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\xrcdemo.exe"
+				OutputFile="vc_x64_mswuddll\xrcdemo.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\xrcdemo.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\xrcdemo.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\xrcdemo_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\xrcdemo_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\xrcdemo"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\xrcdemo"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\xrcdemo\"
-				ProgramDataBaseFileName="vc_mswudll_x64\xrcdemo.pdb"
+				ObjectFile="vc_x64_mswudll\xrcdemo\"
+				ProgramDataBaseFileName="vc_x64_mswudll\xrcdemo.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_aui.lib  wxmsw31u_ribbon.lib  wxmsw31u_xrc.lib  wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u_xml.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\xrcdemo.exe"
+				OutputFile="vc_x64_mswudll\xrcdemo.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\xrcdemo.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\xrcdemo.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\xrcdemo_vc8.bsc"
+				OutputFile="vc_x64_mswudll\xrcdemo_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/xrc/xrcdemo_vc9.vcproj b/samples/xrc/xrcdemo_vc9.vcproj
index e6114d8ab2..6c73526f0a 100644
--- a/samples/xrc/xrcdemo_vc9.vcproj
+++ b/samples/xrc/xrcdemo_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\xrcdemo"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\xrcdemo"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\xrcdemo\"
-				ProgramDataBaseFileName="vc_mswud_x64\xrcdemo.pdb"
+				ObjectFile="vc_x64_mswud\xrcdemo\"
+				ProgramDataBaseFileName="vc_x64_mswud\xrcdemo.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_aui.lib  wxmsw31ud_ribbon.lib  wxmsw31ud_xrc.lib  wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud_xml.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\xrcdemo.exe"
+				OutputFile="vc_x64_mswud\xrcdemo.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\xrcdemo.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\xrcdemo.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\xrcdemo_vc9.bsc"
+				OutputFile="vc_x64_mswud\xrcdemo_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\xrcdemo"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\xrcdemo"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\xrcdemo\"
-				ProgramDataBaseFileName="vc_mswu_x64\xrcdemo.pdb"
+				ObjectFile="vc_x64_mswu\xrcdemo\"
+				ProgramDataBaseFileName="vc_x64_mswu\xrcdemo.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_aui.lib  wxmsw31u_ribbon.lib  wxmsw31u_xrc.lib  wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u_xml.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\xrcdemo.exe"
+				OutputFile="vc_x64_mswu\xrcdemo.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\xrcdemo.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\xrcdemo.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\xrcdemo_vc9.bsc"
+				OutputFile="vc_x64_mswu\xrcdemo_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\xrcdemo"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\xrcdemo"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\xrcdemo\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\xrcdemo.pdb"
+				ObjectFile="vc_x64_mswuddll\xrcdemo\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\xrcdemo.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_aui.lib  wxmsw31ud_ribbon.lib  wxmsw31ud_xrc.lib  wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud_xml.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\xrcdemo.exe"
+				OutputFile="vc_x64_mswuddll\xrcdemo.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\xrcdemo.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\xrcdemo.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\xrcdemo_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\xrcdemo_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\xrcdemo"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\xrcdemo"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\xrcdemo\"
-				ProgramDataBaseFileName="vc_mswudll_x64\xrcdemo.pdb"
+				ObjectFile="vc_x64_mswudll\xrcdemo\"
+				ProgramDataBaseFileName="vc_x64_mswudll\xrcdemo.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_aui.lib  wxmsw31u_ribbon.lib  wxmsw31u_xrc.lib  wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u_xml.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\xrcdemo.exe"
+				OutputFile="vc_x64_mswudll\xrcdemo.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\xrcdemo.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\xrcdemo.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\xrcdemo_vc9.bsc"
+				OutputFile="vc_x64_mswudll\xrcdemo_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/xti/makefile.vc b/samples/xti/makefile.vc
index a8cd3678f4..f928023a4a 100644
--- a/samples/xti/makefile.vc
+++ b/samples/xti/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/samples/xti/xti_vc8.vcproj b/samples/xti/xti_vc8.vcproj
index 17618f9015..cf7c04fa40 100644
--- a/samples/xti/xti_vc8.vcproj
+++ b/samples/xti/xti_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\xti"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\xti"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\xti\"
-				ProgramDataBaseFileName="vc_mswud_x64\xti.pdb"
+				ObjectFile="vc_x64_mswud\xti\"
+				ProgramDataBaseFileName="vc_x64_mswud\xti.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud_xml.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\xti.exe"
+				OutputFile="vc_x64_mswud\xti.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\xti.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\xti.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\xti_vc8.bsc"
+				OutputFile="vc_x64_mswud\xti_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\xti"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\xti"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\xti\"
-				ProgramDataBaseFileName="vc_mswu_x64\xti.pdb"
+				ObjectFile="vc_x64_mswu\xti\"
+				ProgramDataBaseFileName="vc_x64_mswu\xti.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u_xml.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\xti.exe"
+				OutputFile="vc_x64_mswu\xti.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\xti.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\xti.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\xti_vc8.bsc"
+				OutputFile="vc_x64_mswu\xti_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\xti"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\xti"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\xti\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\xti.pdb"
+				ObjectFile="vc_x64_mswuddll\xti\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\xti.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud_xml.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\xti.exe"
+				OutputFile="vc_x64_mswuddll\xti.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\xti.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\xti.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\xti_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\xti_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\xti"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\xti"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\xti\"
-				ProgramDataBaseFileName="vc_mswudll_x64\xti.pdb"
+				ObjectFile="vc_x64_mswudll\xti\"
+				ProgramDataBaseFileName="vc_x64_mswudll\xti.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u_xml.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\xti.exe"
+				OutputFile="vc_x64_mswudll\xti.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\xti.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\xti.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\xti_vc8.bsc"
+				OutputFile="vc_x64_mswudll\xti_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/samples/xti/xti_vc9.vcproj b/samples/xti/xti_vc9.vcproj
index a2f054dec8..3c5f397402 100644
--- a/samples/xti/xti_vc9.vcproj
+++ b/samples/xti/xti_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\xti"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\xti"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\xti\"
-				ProgramDataBaseFileName="vc_mswud_x64\xti.pdb"
+				ObjectFile="vc_x64_mswud\xti\"
+				ProgramDataBaseFileName="vc_x64_mswud\xti.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud_xml.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\xti.exe"
+				OutputFile="vc_x64_mswud\xti.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\xti.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\xti.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\xti_vc9.bsc"
+				OutputFile="vc_x64_mswud\xti_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\xti"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\xti"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\xti\"
-				ProgramDataBaseFileName="vc_mswu_x64\xti.pdb"
+				ObjectFile="vc_x64_mswu\xti\"
+				ProgramDataBaseFileName="vc_x64_mswu\xti.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u_xml.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\xti.exe"
+				OutputFile="vc_x64_mswu\xti.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\xti.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\xti.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\xti_vc9.bsc"
+				OutputFile="vc_x64_mswu\xti_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\xti"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\xti"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\xti\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\xti.pdb"
+				ObjectFile="vc_x64_mswuddll\xti\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\xti.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud_xml.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\xti.exe"
+				OutputFile="vc_x64_mswuddll\xti.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\xti.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\xti.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\xti_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\xti_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\xti"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\xti"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\xti\"
-				ProgramDataBaseFileName="vc_mswudll_x64\xti.pdb"
+				ObjectFile="vc_x64_mswudll\xti\"
+				ProgramDataBaseFileName="vc_x64_mswudll\xti.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u_xml.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\xti.exe"
+				OutputFile="vc_x64_mswudll\xti.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\xti.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\xti.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\xti_vc9.bsc"
+				OutputFile="vc_x64_mswudll\xti_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/tests/benchmarks/bench_vc8_bench.vcproj b/tests/benchmarks/bench_vc8_bench.vcproj
index 80b87940c3..cfbc5066ff 100644
--- a/tests/benchmarks/bench_vc8_bench.vcproj
+++ b/tests/benchmarks/bench_vc8_bench.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\bench"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\bench"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\bench\"
-				ProgramDataBaseFileName="vc_mswud_x64\bench.pdb"
+				ObjectFile="vc_x64_mswud\bench\"
+				ProgramDataBaseFileName="vc_x64_mswud\bench.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud_net.lib  wxbase31ud.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\bench.exe"
+				OutputFile="vc_x64_mswud\bench.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\bench.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\bench.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\bench_vc8_bench.bsc"
+				OutputFile="vc_x64_mswud\bench_vc8_bench.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\bench"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\bench"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\bench\"
-				ProgramDataBaseFileName="vc_mswu_x64\bench.pdb"
+				ObjectFile="vc_x64_mswu\bench\"
+				ProgramDataBaseFileName="vc_x64_mswu\bench.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u_net.lib  wxbase31u.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\bench.exe"
+				OutputFile="vc_x64_mswu\bench.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\bench.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\bench.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\bench_vc8_bench.bsc"
+				OutputFile="vc_x64_mswu\bench_vc8_bench.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\bench"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\bench"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\bench\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\bench.pdb"
+				ObjectFile="vc_x64_mswuddll\bench\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\bench.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud_net.lib  wxbase31ud.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\bench.exe"
+				OutputFile="vc_x64_mswuddll\bench.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\bench.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\bench.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\bench_vc8_bench.bsc"
+				OutputFile="vc_x64_mswuddll\bench_vc8_bench.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\bench"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\bench"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\bench\"
-				ProgramDataBaseFileName="vc_mswudll_x64\bench.pdb"
+				ObjectFile="vc_x64_mswudll\bench\"
+				ProgramDataBaseFileName="vc_x64_mswudll\bench.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u_net.lib  wxbase31u.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\bench.exe"
+				OutputFile="vc_x64_mswudll\bench.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\bench.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\bench.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\bench_vc8_bench.bsc"
+				OutputFile="vc_x64_mswudll\bench_vc8_bench.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/tests/benchmarks/bench_vc8_bench_graphics.vcproj b/tests/benchmarks/bench_vc8_bench_graphics.vcproj
index f6f306626f..8070f757e5 100644
--- a/tests/benchmarks/bench_vc8_bench_graphics.vcproj
+++ b/tests/benchmarks/bench_vc8_bench_graphics.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\bench_graphics"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\bench_graphics"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\bench_graphics\"
-				ProgramDataBaseFileName="vc_mswud_x64\bench_graphics.pdb"
+				ObjectFile="vc_x64_mswud\bench_graphics\"
+				ProgramDataBaseFileName="vc_x64_mswud\bench_graphics.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib  wxmsw31ud_gl.lib opengl32.lib glu32.lib   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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\bench_graphics.exe"
+				OutputFile="vc_x64_mswud\bench_graphics.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\bench_graphics.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\bench_graphics.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\bench_vc8_bench_graphics.bsc"
+				OutputFile="vc_x64_mswud\bench_vc8_bench_graphics.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\bench_graphics"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\bench_graphics"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\bench_graphics\"
-				ProgramDataBaseFileName="vc_mswu_x64\bench_graphics.pdb"
+				ObjectFile="vc_x64_mswu\bench_graphics\"
+				ProgramDataBaseFileName="vc_x64_mswu\bench_graphics.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib  wxmsw31u_gl.lib opengl32.lib glu32.lib   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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\bench_graphics.exe"
+				OutputFile="vc_x64_mswu\bench_graphics.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\bench_graphics.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\bench_graphics.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\bench_vc8_bench_graphics.bsc"
+				OutputFile="vc_x64_mswu\bench_vc8_bench_graphics.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\bench_graphics"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\bench_graphics"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\bench_graphics\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\bench_graphics.pdb"
+				ObjectFile="vc_x64_mswuddll\bench_graphics\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\bench_graphics.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib  wxmsw31ud_gl.lib opengl32.lib glu32.lib   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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\bench_graphics.exe"
+				OutputFile="vc_x64_mswuddll\bench_graphics.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\bench_graphics.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\bench_graphics.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\bench_vc8_bench_graphics.bsc"
+				OutputFile="vc_x64_mswuddll\bench_vc8_bench_graphics.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\bench_graphics"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\bench_graphics"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\bench_graphics\"
-				ProgramDataBaseFileName="vc_mswudll_x64\bench_graphics.pdb"
+				ObjectFile="vc_x64_mswudll\bench_graphics\"
+				ProgramDataBaseFileName="vc_x64_mswudll\bench_graphics.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib  wxmsw31u_gl.lib opengl32.lib glu32.lib   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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\bench_graphics.exe"
+				OutputFile="vc_x64_mswudll\bench_graphics.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\bench_graphics.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\bench_graphics.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\bench_vc8_bench_graphics.bsc"
+				OutputFile="vc_x64_mswudll\bench_vc8_bench_graphics.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/tests/benchmarks/bench_vc8_bench_gui.vcproj b/tests/benchmarks/bench_vc8_bench_gui.vcproj
index 76bf228f20..fe69a8e77f 100644
--- a/tests/benchmarks/bench_vc8_bench_gui.vcproj
+++ b/tests/benchmarks/bench_vc8_bench_gui.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\bench_gui"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\bench_gui"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\bench_gui\"
-				ProgramDataBaseFileName="vc_mswud_x64\bench_gui.pdb"
+				ObjectFile="vc_x64_mswud\bench_gui\"
+				ProgramDataBaseFileName="vc_x64_mswud\bench_gui.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\bench_gui.exe"
+				OutputFile="vc_x64_mswud\bench_gui.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\bench_gui.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\bench_gui.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\bench_vc8_bench_gui.bsc"
+				OutputFile="vc_x64_mswud\bench_vc8_bench_gui.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\bench_gui"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\bench_gui"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\bench_gui\"
-				ProgramDataBaseFileName="vc_mswu_x64\bench_gui.pdb"
+				ObjectFile="vc_x64_mswu\bench_gui\"
+				ProgramDataBaseFileName="vc_x64_mswu\bench_gui.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\bench_gui.exe"
+				OutputFile="vc_x64_mswu\bench_gui.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\bench_gui.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\bench_gui.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\bench_vc8_bench_gui.bsc"
+				OutputFile="vc_x64_mswu\bench_vc8_bench_gui.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\bench_gui"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\bench_gui"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\bench_gui\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\bench_gui.pdb"
+				ObjectFile="vc_x64_mswuddll\bench_gui\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\bench_gui.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\bench_gui.exe"
+				OutputFile="vc_x64_mswuddll\bench_gui.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\bench_gui.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\bench_gui.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\bench_vc8_bench_gui.bsc"
+				OutputFile="vc_x64_mswuddll\bench_vc8_bench_gui.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\bench_gui"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\bench_gui"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\bench_gui\"
-				ProgramDataBaseFileName="vc_mswudll_x64\bench_gui.pdb"
+				ObjectFile="vc_x64_mswudll\bench_gui\"
+				ProgramDataBaseFileName="vc_x64_mswudll\bench_gui.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\bench_gui.exe"
+				OutputFile="vc_x64_mswudll\bench_gui.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\bench_gui.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\bench_gui.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\bench_vc8_bench_gui.bsc"
+				OutputFile="vc_x64_mswudll\bench_vc8_bench_gui.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/tests/benchmarks/bench_vc9_bench.vcproj b/tests/benchmarks/bench_vc9_bench.vcproj
index 049dd37fb9..7e7d7cb859 100644
--- a/tests/benchmarks/bench_vc9_bench.vcproj
+++ b/tests/benchmarks/bench_vc9_bench.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\bench"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\bench"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\bench\"
-				ProgramDataBaseFileName="vc_mswud_x64\bench.pdb"
+				ObjectFile="vc_x64_mswud\bench\"
+				ProgramDataBaseFileName="vc_x64_mswud\bench.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud_net.lib  wxbase31ud.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\bench.exe"
+				OutputFile="vc_x64_mswud\bench.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\bench.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\bench.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\bench_vc9_bench.bsc"
+				OutputFile="vc_x64_mswud\bench_vc9_bench.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\bench"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\bench"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\bench\"
-				ProgramDataBaseFileName="vc_mswu_x64\bench.pdb"
+				ObjectFile="vc_x64_mswu\bench\"
+				ProgramDataBaseFileName="vc_x64_mswu\bench.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u_net.lib  wxbase31u.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\bench.exe"
+				OutputFile="vc_x64_mswu\bench.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\bench.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\bench.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\bench_vc9_bench.bsc"
+				OutputFile="vc_x64_mswu\bench_vc9_bench.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\bench"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\bench"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\bench\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\bench.pdb"
+				ObjectFile="vc_x64_mswuddll\bench\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\bench.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud_net.lib  wxbase31ud.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\bench.exe"
+				OutputFile="vc_x64_mswuddll\bench.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\bench.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\bench.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\bench_vc9_bench.bsc"
+				OutputFile="vc_x64_mswuddll\bench_vc9_bench.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\bench"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\bench"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\bench\"
-				ProgramDataBaseFileName="vc_mswudll_x64\bench.pdb"
+				ObjectFile="vc_x64_mswudll\bench\"
+				ProgramDataBaseFileName="vc_x64_mswudll\bench.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u_net.lib  wxbase31u.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\bench.exe"
+				OutputFile="vc_x64_mswudll\bench.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\bench.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\bench.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\bench_vc9_bench.bsc"
+				OutputFile="vc_x64_mswudll\bench_vc9_bench.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/tests/benchmarks/bench_vc9_bench_graphics.vcproj b/tests/benchmarks/bench_vc9_bench_graphics.vcproj
index ac3b3b784d..b4d6262306 100644
--- a/tests/benchmarks/bench_vc9_bench_graphics.vcproj
+++ b/tests/benchmarks/bench_vc9_bench_graphics.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\bench_graphics"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\bench_graphics"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\bench_graphics\"
-				ProgramDataBaseFileName="vc_mswud_x64\bench_graphics.pdb"
+				ObjectFile="vc_x64_mswud\bench_graphics\"
+				ProgramDataBaseFileName="vc_x64_mswud\bench_graphics.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib  wxmsw31ud_gl.lib opengl32.lib glu32.lib   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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\bench_graphics.exe"
+				OutputFile="vc_x64_mswud\bench_graphics.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\bench_graphics.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\bench_graphics.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\bench_vc9_bench_graphics.bsc"
+				OutputFile="vc_x64_mswud\bench_vc9_bench_graphics.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\bench_graphics"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\bench_graphics"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\bench_graphics\"
-				ProgramDataBaseFileName="vc_mswu_x64\bench_graphics.pdb"
+				ObjectFile="vc_x64_mswu\bench_graphics\"
+				ProgramDataBaseFileName="vc_x64_mswu\bench_graphics.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib  wxmsw31u_gl.lib opengl32.lib glu32.lib   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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\bench_graphics.exe"
+				OutputFile="vc_x64_mswu\bench_graphics.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\bench_graphics.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\bench_graphics.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\bench_vc9_bench_graphics.bsc"
+				OutputFile="vc_x64_mswu\bench_vc9_bench_graphics.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\bench_graphics"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\bench_graphics"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\bench_graphics\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\bench_graphics.pdb"
+				ObjectFile="vc_x64_mswuddll\bench_graphics\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\bench_graphics.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib  wxmsw31ud_gl.lib opengl32.lib glu32.lib   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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\bench_graphics.exe"
+				OutputFile="vc_x64_mswuddll\bench_graphics.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\bench_graphics.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\bench_graphics.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\bench_vc9_bench_graphics.bsc"
+				OutputFile="vc_x64_mswuddll\bench_vc9_bench_graphics.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\bench_graphics"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\bench_graphics"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\bench_graphics\"
-				ProgramDataBaseFileName="vc_mswudll_x64\bench_graphics.pdb"
+				ObjectFile="vc_x64_mswudll\bench_graphics\"
+				ProgramDataBaseFileName="vc_x64_mswudll\bench_graphics.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib  wxmsw31u_gl.lib opengl32.lib glu32.lib   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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\bench_graphics.exe"
+				OutputFile="vc_x64_mswudll\bench_graphics.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\bench_graphics.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\bench_graphics.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\bench_vc9_bench_graphics.bsc"
+				OutputFile="vc_x64_mswudll\bench_vc9_bench_graphics.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/tests/benchmarks/bench_vc9_bench_gui.vcproj b/tests/benchmarks/bench_vc9_bench_gui.vcproj
index 86bad0593a..0ae3167b71 100644
--- a/tests/benchmarks/bench_vc9_bench_gui.vcproj
+++ b/tests/benchmarks/bench_vc9_bench_gui.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\bench_gui"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\bench_gui"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\bench_gui\"
-				ProgramDataBaseFileName="vc_mswud_x64\bench_gui.pdb"
+				ObjectFile="vc_x64_mswud\bench_gui\"
+				ProgramDataBaseFileName="vc_x64_mswud\bench_gui.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\bench_gui.exe"
+				OutputFile="vc_x64_mswud\bench_gui.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\bench_gui.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\bench_gui.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\bench_vc9_bench_gui.bsc"
+				OutputFile="vc_x64_mswud\bench_vc9_bench_gui.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\bench_gui"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\bench_gui"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\bench_gui\"
-				ProgramDataBaseFileName="vc_mswu_x64\bench_gui.pdb"
+				ObjectFile="vc_x64_mswu\bench_gui\"
+				ProgramDataBaseFileName="vc_x64_mswu\bench_gui.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\bench_gui.exe"
+				OutputFile="vc_x64_mswu\bench_gui.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\bench_gui.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\bench_gui.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\bench_vc9_bench_gui.bsc"
+				OutputFile="vc_x64_mswu\bench_vc9_bench_gui.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\bench_gui"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\bench_gui"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\bench_gui\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\bench_gui.pdb"
+				ObjectFile="vc_x64_mswuddll\bench_gui\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\bench_gui.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\bench_gui.exe"
+				OutputFile="vc_x64_mswuddll\bench_gui.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\bench_gui.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\bench_gui.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\bench_vc9_bench_gui.bsc"
+				OutputFile="vc_x64_mswuddll\bench_vc9_bench_gui.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\bench_gui"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\bench_gui"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\bench_gui\"
-				ProgramDataBaseFileName="vc_mswudll_x64\bench_gui.pdb"
+				ObjectFile="vc_x64_mswudll\bench_gui\"
+				ProgramDataBaseFileName="vc_x64_mswudll\bench_gui.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\bench_gui.exe"
+				OutputFile="vc_x64_mswudll\bench_gui.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\bench_gui.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\bench_gui.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\bench_vc9_bench_gui.bsc"
+				OutputFile="vc_x64_mswudll\bench_vc9_bench_gui.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/tests/benchmarks/makefile.vc b/tests/benchmarks/makefile.vc
index 9b0a130818..fb4fc1071e 100644
--- a/tests/benchmarks/makefile.vc
+++ b/tests/benchmarks/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/tests/makefile.vc b/tests/makefile.vc
index 836677b107..83e5888831 100644
--- a/tests/makefile.vc
+++ b/tests/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/tests/test_vc8_test.vcproj b/tests/test_vc8_test.vcproj
index af2cadba9d..27bdb3cab8 100644
--- a/tests/test_vc8_test.vcproj
+++ b/tests/test_vc8_test.vcproj
@@ -424,8 +424,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\test"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\test"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -461,9 +461,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswud_x64\testprec_test.pch"
-				ObjectFile="vc_mswud_x64\test\"
-				ProgramDataBaseFileName="vc_mswud_x64\test.pdb"
+				PrecompiledHeaderFile="vc_x64_mswud\testprec_test.pch"
+				ObjectFile="vc_x64_mswud\test\"
+				ProgramDataBaseFileName="vc_x64_mswud\test.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -485,13 +485,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud_net.lib  wxbase31ud_xml.lib  wxbase31ud.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\test.exe"
+				OutputFile="vc_x64_mswud\test.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\test.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\test.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -506,7 +506,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\test_vc8_test.bsc"
+				OutputFile="vc_x64_mswud\test_vc8_test.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -524,8 +524,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\test"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\test"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -558,9 +558,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswu_x64\testprec_test.pch"
-				ObjectFile="vc_mswu_x64\test\"
-				ProgramDataBaseFileName="vc_mswu_x64\test.pdb"
+				PrecompiledHeaderFile="vc_x64_mswu\testprec_test.pch"
+				ObjectFile="vc_x64_mswu\test\"
+				ProgramDataBaseFileName="vc_x64_mswu\test.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -582,13 +582,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u_net.lib  wxbase31u_xml.lib  wxbase31u.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\test.exe"
+				OutputFile="vc_x64_mswu\test.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\test.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\test.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -605,7 +605,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\test_vc8_test.bsc"
+				OutputFile="vc_x64_mswu\test_vc8_test.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -623,8 +623,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\test"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\test"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -660,9 +660,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswuddll_x64\testprec_test.pch"
-				ObjectFile="vc_mswuddll_x64\test\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\test.pdb"
+				PrecompiledHeaderFile="vc_x64_mswuddll\testprec_test.pch"
+				ObjectFile="vc_x64_mswuddll\test\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\test.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -684,13 +684,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud_net.lib  wxbase31ud_xml.lib  wxbase31ud.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\test.exe"
+				OutputFile="vc_x64_mswuddll\test.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\test.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\test.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -705,7 +705,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\test_vc8_test.bsc"
+				OutputFile="vc_x64_mswuddll\test_vc8_test.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -723,8 +723,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\test"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\test"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -757,9 +757,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswudll_x64\testprec_test.pch"
-				ObjectFile="vc_mswudll_x64\test\"
-				ProgramDataBaseFileName="vc_mswudll_x64\test.pdb"
+				PrecompiledHeaderFile="vc_x64_mswudll\testprec_test.pch"
+				ObjectFile="vc_x64_mswudll\test\"
+				ProgramDataBaseFileName="vc_x64_mswudll\test.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -781,13 +781,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u_net.lib  wxbase31u_xml.lib  wxbase31u.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\test.exe"
+				OutputFile="vc_x64_mswudll\test.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\test.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\test.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -804,7 +804,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\test_vc8_test.bsc"
+				OutputFile="vc_x64_mswudll\test_vc8_test.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/tests/test_vc8_test_allheaders.vcproj b/tests/test_vc8_test_allheaders.vcproj
index 395dc937ec..ff2423b425 100644
--- a/tests/test_vc8_test_allheaders.vcproj
+++ b/tests/test_vc8_test_allheaders.vcproj
@@ -424,8 +424,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\test_allheaders"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\test_allheaders"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -461,9 +461,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswud_x64\testprec_test_allheaders.pch"
-				ObjectFile="vc_mswud_x64\test_allheaders\"
-				ProgramDataBaseFileName="vc_mswud_x64\test_allheaders.pdb"
+				PrecompiledHeaderFile="vc_x64_mswud\testprec_test_allheaders.pch"
+				ObjectFile="vc_x64_mswud\test_allheaders\"
+				ProgramDataBaseFileName="vc_x64_mswud\test_allheaders.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -485,13 +485,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_webview.lib  wxmsw31ud_stc.lib imm32.lib wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\test_allheaders.exe"
+				OutputFile="vc_x64_mswud\test_allheaders.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\test_allheaders.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\test_allheaders.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -506,7 +506,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\test_vc8_test_allheaders.bsc"
+				OutputFile="vc_x64_mswud\test_vc8_test_allheaders.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -524,8 +524,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\test_allheaders"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\test_allheaders"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -558,9 +558,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswu_x64\testprec_test_allheaders.pch"
-				ObjectFile="vc_mswu_x64\test_allheaders\"
-				ProgramDataBaseFileName="vc_mswu_x64\test_allheaders.pdb"
+				PrecompiledHeaderFile="vc_x64_mswu\testprec_test_allheaders.pch"
+				ObjectFile="vc_x64_mswu\test_allheaders\"
+				ProgramDataBaseFileName="vc_x64_mswu\test_allheaders.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -582,13 +582,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_webview.lib  wxmsw31u_stc.lib imm32.lib wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\test_allheaders.exe"
+				OutputFile="vc_x64_mswu\test_allheaders.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\test_allheaders.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\test_allheaders.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -605,7 +605,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\test_vc8_test_allheaders.bsc"
+				OutputFile="vc_x64_mswu\test_vc8_test_allheaders.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -623,8 +623,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\test_allheaders"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\test_allheaders"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -660,9 +660,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswuddll_x64\testprec_test_allheaders.pch"
-				ObjectFile="vc_mswuddll_x64\test_allheaders\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\test_allheaders.pdb"
+				PrecompiledHeaderFile="vc_x64_mswuddll\testprec_test_allheaders.pch"
+				ObjectFile="vc_x64_mswuddll\test_allheaders\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\test_allheaders.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -684,13 +684,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_webview.lib  wxmsw31ud_stc.lib imm32.lib wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\test_allheaders.exe"
+				OutputFile="vc_x64_mswuddll\test_allheaders.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\test_allheaders.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\test_allheaders.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -705,7 +705,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\test_vc8_test_allheaders.bsc"
+				OutputFile="vc_x64_mswuddll\test_vc8_test_allheaders.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -723,8 +723,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\test_allheaders"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\test_allheaders"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -757,9 +757,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswudll_x64\testprec_test_allheaders.pch"
-				ObjectFile="vc_mswudll_x64\test_allheaders\"
-				ProgramDataBaseFileName="vc_mswudll_x64\test_allheaders.pdb"
+				PrecompiledHeaderFile="vc_x64_mswudll\testprec_test_allheaders.pch"
+				ObjectFile="vc_x64_mswudll\test_allheaders\"
+				ProgramDataBaseFileName="vc_x64_mswudll\test_allheaders.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -781,13 +781,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_webview.lib  wxmsw31u_stc.lib imm32.lib wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\test_allheaders.exe"
+				OutputFile="vc_x64_mswudll\test_allheaders.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\test_allheaders.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\test_allheaders.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -804,7 +804,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\test_vc8_test_allheaders.bsc"
+				OutputFile="vc_x64_mswudll\test_vc8_test_allheaders.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/tests/test_vc8_test_drawing.vcproj b/tests/test_vc8_test_drawing.vcproj
index 01d3d64100..b30fca819d 100644
--- a/tests/test_vc8_test_drawing.vcproj
+++ b/tests/test_vc8_test_drawing.vcproj
@@ -424,8 +424,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\test_drawing"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\test_drawing"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -461,9 +461,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswud_x64\testprec_test_drawing.pch"
-				ObjectFile="vc_mswud_x64\test_drawing\"
-				ProgramDataBaseFileName="vc_mswud_x64\test_drawing.pdb"
+				PrecompiledHeaderFile="vc_x64_mswud\testprec_test_drawing.pch"
+				ObjectFile="vc_x64_mswud\test_drawing\"
+				ProgramDataBaseFileName="vc_x64_mswud\test_drawing.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -485,13 +485,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\test_drawing.exe"
+				OutputFile="vc_x64_mswud\test_drawing.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\test_drawing.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\test_drawing.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -506,7 +506,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\test_vc8_test_drawing.bsc"
+				OutputFile="vc_x64_mswud\test_vc8_test_drawing.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -524,8 +524,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\test_drawing"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\test_drawing"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -558,9 +558,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswu_x64\testprec_test_drawing.pch"
-				ObjectFile="vc_mswu_x64\test_drawing\"
-				ProgramDataBaseFileName="vc_mswu_x64\test_drawing.pdb"
+				PrecompiledHeaderFile="vc_x64_mswu\testprec_test_drawing.pch"
+				ObjectFile="vc_x64_mswu\test_drawing\"
+				ProgramDataBaseFileName="vc_x64_mswu\test_drawing.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -582,13 +582,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\test_drawing.exe"
+				OutputFile="vc_x64_mswu\test_drawing.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\test_drawing.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\test_drawing.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -605,7 +605,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\test_vc8_test_drawing.bsc"
+				OutputFile="vc_x64_mswu\test_vc8_test_drawing.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -623,8 +623,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\test_drawing"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\test_drawing"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -660,9 +660,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswuddll_x64\testprec_test_drawing.pch"
-				ObjectFile="vc_mswuddll_x64\test_drawing\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\test_drawing.pdb"
+				PrecompiledHeaderFile="vc_x64_mswuddll\testprec_test_drawing.pch"
+				ObjectFile="vc_x64_mswuddll\test_drawing\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\test_drawing.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -684,13 +684,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\test_drawing.exe"
+				OutputFile="vc_x64_mswuddll\test_drawing.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\test_drawing.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\test_drawing.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -705,7 +705,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\test_vc8_test_drawing.bsc"
+				OutputFile="vc_x64_mswuddll\test_vc8_test_drawing.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -723,8 +723,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\test_drawing"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\test_drawing"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -757,9 +757,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswudll_x64\testprec_test_drawing.pch"
-				ObjectFile="vc_mswudll_x64\test_drawing\"
-				ProgramDataBaseFileName="vc_mswudll_x64\test_drawing.pdb"
+				PrecompiledHeaderFile="vc_x64_mswudll\testprec_test_drawing.pch"
+				ObjectFile="vc_x64_mswudll\test_drawing\"
+				ProgramDataBaseFileName="vc_x64_mswudll\test_drawing.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -781,13 +781,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\test_drawing.exe"
+				OutputFile="vc_x64_mswudll\test_drawing.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\test_drawing.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\test_drawing.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -804,7 +804,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\test_vc8_test_drawing.bsc"
+				OutputFile="vc_x64_mswudll\test_vc8_test_drawing.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/tests/test_vc8_test_drawingplugin.vcproj b/tests/test_vc8_test_drawingplugin.vcproj
index 31acf8bdfa..a7b32f254d 100644
--- a/tests/test_vc8_test_drawingplugin.vcproj
+++ b/tests/test_vc8_test_drawingplugin.vcproj
@@ -205,8 +205,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\test_drawingplugin"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\test_drawingplugin"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -240,8 +240,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\test_drawingplugin\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\test_drawingplugin.pdb"
+				ObjectFile="vc_x64_mswuddll\test_drawingplugin\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\test_drawingplugin.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -263,13 +263,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\test_drawingplugin.dll"
+				OutputFile="vc_x64_mswuddll\test_drawingplugin.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\test_drawingplugin.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\test_drawingplugin.pdb"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -283,7 +283,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\test_vc8_test_drawingplugin.bsc"
+				OutputFile="vc_x64_mswuddll\test_vc8_test_drawingplugin.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -295,8 +295,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\test_drawingplugin"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\test_drawingplugin"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -327,8 +327,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\test_drawingplugin\"
-				ProgramDataBaseFileName="vc_mswudll_x64\test_drawingplugin.pdb"
+				ObjectFile="vc_x64_mswudll\test_drawingplugin\"
+				ProgramDataBaseFileName="vc_x64_mswudll\test_drawingplugin.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -350,13 +350,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\test_drawingplugin.dll"
+				OutputFile="vc_x64_mswudll\test_drawingplugin.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\test_drawingplugin.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\test_drawingplugin.pdb"
 				TargetMachine="17"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -372,7 +372,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\test_vc8_test_drawingplugin.bsc"
+				OutputFile="vc_x64_mswudll\test_vc8_test_drawingplugin.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/tests/test_vc8_test_gui.vcproj b/tests/test_vc8_test_gui.vcproj
index fc1fdd65dd..db9e9d3d4c 100644
--- a/tests/test_vc8_test_gui.vcproj
+++ b/tests/test_vc8_test_gui.vcproj
@@ -424,8 +424,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\test_gui"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\test_gui"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -461,9 +461,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswud_x64\testprec_test_gui.pch"
-				ObjectFile="vc_mswud_x64\test_gui\"
-				ProgramDataBaseFileName="vc_mswud_x64\test_gui.pdb"
+				PrecompiledHeaderFile="vc_x64_mswud\testprec_test_gui.pch"
+				ObjectFile="vc_x64_mswud\test_gui\"
+				ProgramDataBaseFileName="vc_x64_mswud\test_gui.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -485,13 +485,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_webview.lib  wxmsw31ud_stc.lib imm32.lib wxmsw31ud_aui.lib  wxmsw31ud_richtext.lib  wxmsw31ud_media.lib  wxmsw31ud_xrc.lib  wxbase31ud_xml.lib  wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\test_gui.exe"
+				OutputFile="vc_x64_mswud\test_gui.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\test_gui.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\test_gui.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -506,7 +506,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\test_vc8_test_gui.bsc"
+				OutputFile="vc_x64_mswud\test_vc8_test_gui.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -524,8 +524,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\test_gui"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\test_gui"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -558,9 +558,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswu_x64\testprec_test_gui.pch"
-				ObjectFile="vc_mswu_x64\test_gui\"
-				ProgramDataBaseFileName="vc_mswu_x64\test_gui.pdb"
+				PrecompiledHeaderFile="vc_x64_mswu\testprec_test_gui.pch"
+				ObjectFile="vc_x64_mswu\test_gui\"
+				ProgramDataBaseFileName="vc_x64_mswu\test_gui.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -582,13 +582,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_webview.lib  wxmsw31u_stc.lib imm32.lib wxmsw31u_aui.lib  wxmsw31u_richtext.lib  wxmsw31u_media.lib  wxmsw31u_xrc.lib  wxbase31u_xml.lib  wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\test_gui.exe"
+				OutputFile="vc_x64_mswu\test_gui.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\test_gui.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\test_gui.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -605,7 +605,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\test_vc8_test_gui.bsc"
+				OutputFile="vc_x64_mswu\test_vc8_test_gui.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -623,8 +623,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\test_gui"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\test_gui"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -660,9 +660,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswuddll_x64\testprec_test_gui.pch"
-				ObjectFile="vc_mswuddll_x64\test_gui\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\test_gui.pdb"
+				PrecompiledHeaderFile="vc_x64_mswuddll\testprec_test_gui.pch"
+				ObjectFile="vc_x64_mswuddll\test_gui\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\test_gui.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -684,13 +684,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_webview.lib  wxmsw31ud_stc.lib imm32.lib wxmsw31ud_aui.lib  wxmsw31ud_richtext.lib  wxmsw31ud_media.lib  wxmsw31ud_xrc.lib  wxbase31ud_xml.lib  wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\test_gui.exe"
+				OutputFile="vc_x64_mswuddll\test_gui.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\test_gui.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\test_gui.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -705,7 +705,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\test_vc8_test_gui.bsc"
+				OutputFile="vc_x64_mswuddll\test_vc8_test_gui.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -723,8 +723,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\test_gui"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\test_gui"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -757,9 +757,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswudll_x64\testprec_test_gui.pch"
-				ObjectFile="vc_mswudll_x64\test_gui\"
-				ProgramDataBaseFileName="vc_mswudll_x64\test_gui.pdb"
+				PrecompiledHeaderFile="vc_x64_mswudll\testprec_test_gui.pch"
+				ObjectFile="vc_x64_mswudll\test_gui\"
+				ProgramDataBaseFileName="vc_x64_mswudll\test_gui.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -781,13 +781,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_webview.lib  wxmsw31u_stc.lib imm32.lib wxmsw31u_aui.lib  wxmsw31u_richtext.lib  wxmsw31u_media.lib  wxmsw31u_xrc.lib  wxbase31u_xml.lib  wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\test_gui.exe"
+				OutputFile="vc_x64_mswudll\test_gui.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\test_gui.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\test_gui.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -804,7 +804,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\test_vc8_test_gui.bsc"
+				OutputFile="vc_x64_mswudll\test_vc8_test_gui.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/tests/test_vc9_test.vcproj b/tests/test_vc9_test.vcproj
index acabbd896c..489cdcc883 100644
--- a/tests/test_vc9_test.vcproj
+++ b/tests/test_vc9_test.vcproj
@@ -410,8 +410,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\test"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\test"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,9 +447,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswud_x64\testprec_test.pch"
-				ObjectFile="vc_mswud_x64\test\"
-				ProgramDataBaseFileName="vc_mswud_x64\test.pdb"
+				PrecompiledHeaderFile="vc_x64_mswud\testprec_test.pch"
+				ObjectFile="vc_x64_mswud\test\"
+				ProgramDataBaseFileName="vc_x64_mswud\test.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud_net.lib  wxbase31ud_xml.lib  wxbase31ud.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\test.exe"
+				OutputFile="vc_x64_mswud\test.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\test.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\test.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\test_vc9_test.bsc"
+				OutputFile="vc_x64_mswud\test_vc9_test.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -506,8 +506,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\test"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\test"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,9 +541,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswu_x64\testprec_test.pch"
-				ObjectFile="vc_mswu_x64\test\"
-				ProgramDataBaseFileName="vc_mswu_x64\test.pdb"
+				PrecompiledHeaderFile="vc_x64_mswu\testprec_test.pch"
+				ObjectFile="vc_x64_mswu\test\"
+				ProgramDataBaseFileName="vc_x64_mswu\test.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u_net.lib  wxbase31u_xml.lib  wxbase31u.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\test.exe"
+				OutputFile="vc_x64_mswu\test.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\test.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\test.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\test_vc9_test.bsc"
+				OutputFile="vc_x64_mswu\test_vc9_test.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -602,8 +602,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\test"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\test"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -639,9 +639,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswuddll_x64\testprec_test.pch"
-				ObjectFile="vc_mswuddll_x64\test\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\test.pdb"
+				PrecompiledHeaderFile="vc_x64_mswuddll\testprec_test.pch"
+				ObjectFile="vc_x64_mswuddll\test\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\test.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -662,13 +662,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud_net.lib  wxbase31ud_xml.lib  wxbase31ud.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\test.exe"
+				OutputFile="vc_x64_mswuddll\test.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\test.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\test.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -683,7 +683,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\test_vc9_test.bsc"
+				OutputFile="vc_x64_mswuddll\test_vc9_test.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -698,8 +698,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\test"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\test"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -733,9 +733,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswudll_x64\testprec_test.pch"
-				ObjectFile="vc_mswudll_x64\test\"
-				ProgramDataBaseFileName="vc_mswudll_x64\test.pdb"
+				PrecompiledHeaderFile="vc_x64_mswudll\testprec_test.pch"
+				ObjectFile="vc_x64_mswudll\test\"
+				ProgramDataBaseFileName="vc_x64_mswudll\test.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -756,13 +756,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u_net.lib  wxbase31u_xml.lib  wxbase31u.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\test.exe"
+				OutputFile="vc_x64_mswudll\test.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\test.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\test.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -779,7 +779,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\test_vc9_test.bsc"
+				OutputFile="vc_x64_mswudll\test_vc9_test.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/tests/test_vc9_test_allheaders.vcproj b/tests/test_vc9_test_allheaders.vcproj
index e4f9bbfd50..5525782941 100644
--- a/tests/test_vc9_test_allheaders.vcproj
+++ b/tests/test_vc9_test_allheaders.vcproj
@@ -410,8 +410,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\test_allheaders"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\test_allheaders"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,9 +447,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswud_x64\testprec_test_allheaders.pch"
-				ObjectFile="vc_mswud_x64\test_allheaders\"
-				ProgramDataBaseFileName="vc_mswud_x64\test_allheaders.pdb"
+				PrecompiledHeaderFile="vc_x64_mswud\testprec_test_allheaders.pch"
+				ObjectFile="vc_x64_mswud\test_allheaders\"
+				ProgramDataBaseFileName="vc_x64_mswud\test_allheaders.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_webview.lib  wxmsw31ud_stc.lib imm32.lib wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\test_allheaders.exe"
+				OutputFile="vc_x64_mswud\test_allheaders.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\test_allheaders.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\test_allheaders.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\test_vc9_test_allheaders.bsc"
+				OutputFile="vc_x64_mswud\test_vc9_test_allheaders.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -506,8 +506,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\test_allheaders"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\test_allheaders"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,9 +541,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswu_x64\testprec_test_allheaders.pch"
-				ObjectFile="vc_mswu_x64\test_allheaders\"
-				ProgramDataBaseFileName="vc_mswu_x64\test_allheaders.pdb"
+				PrecompiledHeaderFile="vc_x64_mswu\testprec_test_allheaders.pch"
+				ObjectFile="vc_x64_mswu\test_allheaders\"
+				ProgramDataBaseFileName="vc_x64_mswu\test_allheaders.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_webview.lib  wxmsw31u_stc.lib imm32.lib wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\test_allheaders.exe"
+				OutputFile="vc_x64_mswu\test_allheaders.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\test_allheaders.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\test_allheaders.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\test_vc9_test_allheaders.bsc"
+				OutputFile="vc_x64_mswu\test_vc9_test_allheaders.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -602,8 +602,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\test_allheaders"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\test_allheaders"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -639,9 +639,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswuddll_x64\testprec_test_allheaders.pch"
-				ObjectFile="vc_mswuddll_x64\test_allheaders\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\test_allheaders.pdb"
+				PrecompiledHeaderFile="vc_x64_mswuddll\testprec_test_allheaders.pch"
+				ObjectFile="vc_x64_mswuddll\test_allheaders\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\test_allheaders.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -662,13 +662,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_webview.lib  wxmsw31ud_stc.lib imm32.lib wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\test_allheaders.exe"
+				OutputFile="vc_x64_mswuddll\test_allheaders.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\test_allheaders.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\test_allheaders.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -683,7 +683,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\test_vc9_test_allheaders.bsc"
+				OutputFile="vc_x64_mswuddll\test_vc9_test_allheaders.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -698,8 +698,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\test_allheaders"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\test_allheaders"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -733,9 +733,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswudll_x64\testprec_test_allheaders.pch"
-				ObjectFile="vc_mswudll_x64\test_allheaders\"
-				ProgramDataBaseFileName="vc_mswudll_x64\test_allheaders.pdb"
+				PrecompiledHeaderFile="vc_x64_mswudll\testprec_test_allheaders.pch"
+				ObjectFile="vc_x64_mswudll\test_allheaders\"
+				ProgramDataBaseFileName="vc_x64_mswudll\test_allheaders.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -756,13 +756,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_webview.lib  wxmsw31u_stc.lib imm32.lib wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\test_allheaders.exe"
+				OutputFile="vc_x64_mswudll\test_allheaders.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\test_allheaders.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\test_allheaders.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -779,7 +779,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\test_vc9_test_allheaders.bsc"
+				OutputFile="vc_x64_mswudll\test_vc9_test_allheaders.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/tests/test_vc9_test_drawing.vcproj b/tests/test_vc9_test_drawing.vcproj
index 008fb8b1ba..94bc5250c8 100644
--- a/tests/test_vc9_test_drawing.vcproj
+++ b/tests/test_vc9_test_drawing.vcproj
@@ -410,8 +410,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\test_drawing"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\test_drawing"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,9 +447,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswud_x64\testprec_test_drawing.pch"
-				ObjectFile="vc_mswud_x64\test_drawing\"
-				ProgramDataBaseFileName="vc_mswud_x64\test_drawing.pdb"
+				PrecompiledHeaderFile="vc_x64_mswud\testprec_test_drawing.pch"
+				ObjectFile="vc_x64_mswud\test_drawing\"
+				ProgramDataBaseFileName="vc_x64_mswud\test_drawing.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\test_drawing.exe"
+				OutputFile="vc_x64_mswud\test_drawing.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\test_drawing.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\test_drawing.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\test_vc9_test_drawing.bsc"
+				OutputFile="vc_x64_mswud\test_vc9_test_drawing.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -506,8 +506,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\test_drawing"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\test_drawing"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,9 +541,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswu_x64\testprec_test_drawing.pch"
-				ObjectFile="vc_mswu_x64\test_drawing\"
-				ProgramDataBaseFileName="vc_mswu_x64\test_drawing.pdb"
+				PrecompiledHeaderFile="vc_x64_mswu\testprec_test_drawing.pch"
+				ObjectFile="vc_x64_mswu\test_drawing\"
+				ProgramDataBaseFileName="vc_x64_mswu\test_drawing.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\test_drawing.exe"
+				OutputFile="vc_x64_mswu\test_drawing.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\test_drawing.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\test_drawing.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\test_vc9_test_drawing.bsc"
+				OutputFile="vc_x64_mswu\test_vc9_test_drawing.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -602,8 +602,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\test_drawing"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\test_drawing"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -639,9 +639,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswuddll_x64\testprec_test_drawing.pch"
-				ObjectFile="vc_mswuddll_x64\test_drawing\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\test_drawing.pdb"
+				PrecompiledHeaderFile="vc_x64_mswuddll\testprec_test_drawing.pch"
+				ObjectFile="vc_x64_mswuddll\test_drawing\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\test_drawing.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -662,13 +662,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\test_drawing.exe"
+				OutputFile="vc_x64_mswuddll\test_drawing.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\test_drawing.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\test_drawing.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -683,7 +683,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\test_vc9_test_drawing.bsc"
+				OutputFile="vc_x64_mswuddll\test_vc9_test_drawing.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -698,8 +698,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\test_drawing"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\test_drawing"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -733,9 +733,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswudll_x64\testprec_test_drawing.pch"
-				ObjectFile="vc_mswudll_x64\test_drawing\"
-				ProgramDataBaseFileName="vc_mswudll_x64\test_drawing.pdb"
+				PrecompiledHeaderFile="vc_x64_mswudll\testprec_test_drawing.pch"
+				ObjectFile="vc_x64_mswudll\test_drawing\"
+				ProgramDataBaseFileName="vc_x64_mswudll\test_drawing.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -756,13 +756,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\test_drawing.exe"
+				OutputFile="vc_x64_mswudll\test_drawing.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\test_drawing.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\test_drawing.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -779,7 +779,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\test_vc9_test_drawing.bsc"
+				OutputFile="vc_x64_mswudll\test_vc9_test_drawing.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/tests/test_vc9_test_drawingplugin.vcproj b/tests/test_vc9_test_drawingplugin.vcproj
index 46867d0d7c..0a0d3e1d68 100644
--- a/tests/test_vc9_test_drawingplugin.vcproj
+++ b/tests/test_vc9_test_drawingplugin.vcproj
@@ -204,8 +204,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\test_drawingplugin"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\test_drawingplugin"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -239,8 +239,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\test_drawingplugin\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\test_drawingplugin.pdb"
+				ObjectFile="vc_x64_mswuddll\test_drawingplugin\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\test_drawingplugin.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -261,13 +261,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\test_drawingplugin.dll"
+				OutputFile="vc_x64_mswuddll\test_drawingplugin.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\test_drawingplugin.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\test_drawingplugin.pdb"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -281,7 +281,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\test_vc9_test_drawingplugin.bsc"
+				OutputFile="vc_x64_mswuddll\test_vc9_test_drawingplugin.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -293,8 +293,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\test_drawingplugin"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\test_drawingplugin"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -326,8 +326,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\test_drawingplugin\"
-				ProgramDataBaseFileName="vc_mswudll_x64\test_drawingplugin.pdb"
+				ObjectFile="vc_x64_mswudll\test_drawingplugin\"
+				ProgramDataBaseFileName="vc_x64_mswudll\test_drawingplugin.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -348,13 +348,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\test_drawingplugin.dll"
+				OutputFile="vc_x64_mswudll\test_drawingplugin.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\test_drawingplugin.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\test_drawingplugin.pdb"
 				TargetMachine="17"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -370,7 +370,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\test_vc9_test_drawingplugin.bsc"
+				OutputFile="vc_x64_mswudll\test_vc9_test_drawingplugin.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/tests/test_vc9_test_gui.vcproj b/tests/test_vc9_test_gui.vcproj
index 2afb56645f..867da681f6 100644
--- a/tests/test_vc9_test_gui.vcproj
+++ b/tests/test_vc9_test_gui.vcproj
@@ -410,8 +410,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\test_gui"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\test_gui"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,9 +447,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswud_x64\testprec_test_gui.pch"
-				ObjectFile="vc_mswud_x64\test_gui\"
-				ProgramDataBaseFileName="vc_mswud_x64\test_gui.pdb"
+				PrecompiledHeaderFile="vc_x64_mswud\testprec_test_gui.pch"
+				ObjectFile="vc_x64_mswud\test_gui\"
+				ProgramDataBaseFileName="vc_x64_mswud\test_gui.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_webview.lib  wxmsw31ud_stc.lib imm32.lib wxmsw31ud_aui.lib  wxmsw31ud_richtext.lib  wxmsw31ud_media.lib  wxmsw31ud_xrc.lib  wxbase31ud_xml.lib  wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\test_gui.exe"
+				OutputFile="vc_x64_mswud\test_gui.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\test_gui.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\test_gui.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\test_vc9_test_gui.bsc"
+				OutputFile="vc_x64_mswud\test_vc9_test_gui.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -506,8 +506,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\test_gui"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\test_gui"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,9 +541,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswu_x64\testprec_test_gui.pch"
-				ObjectFile="vc_mswu_x64\test_gui\"
-				ProgramDataBaseFileName="vc_mswu_x64\test_gui.pdb"
+				PrecompiledHeaderFile="vc_x64_mswu\testprec_test_gui.pch"
+				ObjectFile="vc_x64_mswu\test_gui\"
+				ProgramDataBaseFileName="vc_x64_mswu\test_gui.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_webview.lib  wxmsw31u_stc.lib imm32.lib wxmsw31u_aui.lib  wxmsw31u_richtext.lib  wxmsw31u_media.lib  wxmsw31u_xrc.lib  wxbase31u_xml.lib  wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\test_gui.exe"
+				OutputFile="vc_x64_mswu\test_gui.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\test_gui.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\test_gui.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\test_vc9_test_gui.bsc"
+				OutputFile="vc_x64_mswu\test_vc9_test_gui.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -602,8 +602,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\test_gui"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\test_gui"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -639,9 +639,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswuddll_x64\testprec_test_gui.pch"
-				ObjectFile="vc_mswuddll_x64\test_gui\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\test_gui.pdb"
+				PrecompiledHeaderFile="vc_x64_mswuddll\testprec_test_gui.pch"
+				ObjectFile="vc_x64_mswuddll\test_gui\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\test_gui.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -662,13 +662,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_webview.lib  wxmsw31ud_stc.lib imm32.lib wxmsw31ud_aui.lib  wxmsw31ud_richtext.lib  wxmsw31ud_media.lib  wxmsw31ud_xrc.lib  wxbase31ud_xml.lib  wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\test_gui.exe"
+				OutputFile="vc_x64_mswuddll\test_gui.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\test_gui.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\test_gui.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -683,7 +683,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\test_vc9_test_gui.bsc"
+				OutputFile="vc_x64_mswuddll\test_vc9_test_gui.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -698,8 +698,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\test_gui"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\test_gui"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -733,9 +733,9 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="testprec.h"
-				PrecompiledHeaderFile="vc_mswudll_x64\testprec_test_gui.pch"
-				ObjectFile="vc_mswudll_x64\test_gui\"
-				ProgramDataBaseFileName="vc_mswudll_x64\test_gui.pdb"
+				PrecompiledHeaderFile="vc_x64_mswudll\testprec_test_gui.pch"
+				ObjectFile="vc_x64_mswudll\test_gui\"
+				ProgramDataBaseFileName="vc_x64_mswudll\test_gui.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -756,13 +756,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_webview.lib  wxmsw31u_stc.lib imm32.lib wxmsw31u_aui.lib  wxmsw31u_richtext.lib  wxmsw31u_media.lib  wxmsw31u_xrc.lib  wxbase31u_xml.lib  wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\test_gui.exe"
+				OutputFile="vc_x64_mswudll\test_gui.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\test_gui.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\test_gui.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -779,7 +779,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\test_vc9_test_gui.bsc"
+				OutputFile="vc_x64_mswudll\test_vc9_test_gui.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/utils/emulator/src/emulator_vc8.vcproj b/utils/emulator/src/emulator_vc8.vcproj
index 2a29411f2f..4dbfa66985 100644
--- a/utils/emulator/src/emulator_vc8.vcproj
+++ b/utils/emulator/src/emulator_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\wxemulator"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\wxemulator"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\wxemulator\"
-				ProgramDataBaseFileName="vc_mswud_x64\wxemulator.pdb"
+				ObjectFile="vc_x64_mswud\wxemulator\"
+				ProgramDataBaseFileName="vc_x64_mswud\wxemulator.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\wxemulator.exe"
+				OutputFile="vc_x64_mswud\wxemulator.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\wxemulator.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\wxemulator.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\emulator_vc8.bsc"
+				OutputFile="vc_x64_mswud\emulator_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\wxemulator"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\wxemulator"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\wxemulator\"
-				ProgramDataBaseFileName="vc_mswu_x64\wxemulator.pdb"
+				ObjectFile="vc_x64_mswu\wxemulator\"
+				ProgramDataBaseFileName="vc_x64_mswu\wxemulator.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\wxemulator.exe"
+				OutputFile="vc_x64_mswu\wxemulator.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\wxemulator.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\wxemulator.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\emulator_vc8.bsc"
+				OutputFile="vc_x64_mswu\emulator_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\wxemulator"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\wxemulator"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\wxemulator\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\wxemulator.pdb"
+				ObjectFile="vc_x64_mswuddll\wxemulator\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\wxemulator.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\wxemulator.exe"
+				OutputFile="vc_x64_mswuddll\wxemulator.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\wxemulator.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\wxemulator.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\emulator_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\emulator_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\wxemulator"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\wxemulator"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\wxemulator\"
-				ProgramDataBaseFileName="vc_mswudll_x64\wxemulator.pdb"
+				ObjectFile="vc_x64_mswudll\wxemulator\"
+				ProgramDataBaseFileName="vc_x64_mswudll\wxemulator.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\wxemulator.exe"
+				OutputFile="vc_x64_mswudll\wxemulator.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\wxemulator.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\wxemulator.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\emulator_vc8.bsc"
+				OutputFile="vc_x64_mswudll\emulator_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/utils/emulator/src/emulator_vc9.vcproj b/utils/emulator/src/emulator_vc9.vcproj
index 557e5cf7a5..1617ae6cfa 100644
--- a/utils/emulator/src/emulator_vc9.vcproj
+++ b/utils/emulator/src/emulator_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\wxemulator"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\wxemulator"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\wxemulator\"
-				ProgramDataBaseFileName="vc_mswud_x64\wxemulator.pdb"
+				ObjectFile="vc_x64_mswud\wxemulator\"
+				ProgramDataBaseFileName="vc_x64_mswud\wxemulator.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\wxemulator.exe"
+				OutputFile="vc_x64_mswud\wxemulator.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\wxemulator.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\wxemulator.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\emulator_vc9.bsc"
+				OutputFile="vc_x64_mswud\emulator_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\wxemulator"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\wxemulator"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\wxemulator\"
-				ProgramDataBaseFileName="vc_mswu_x64\wxemulator.pdb"
+				ObjectFile="vc_x64_mswu\wxemulator\"
+				ProgramDataBaseFileName="vc_x64_mswu\wxemulator.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\wxemulator.exe"
+				OutputFile="vc_x64_mswu\wxemulator.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\wxemulator.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\wxemulator.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\emulator_vc9.bsc"
+				OutputFile="vc_x64_mswu\emulator_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\wxemulator"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\wxemulator"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\wxemulator\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\wxemulator.pdb"
+				ObjectFile="vc_x64_mswuddll\wxemulator\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\wxemulator.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\wxemulator.exe"
+				OutputFile="vc_x64_mswuddll\wxemulator.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\wxemulator.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\wxemulator.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\emulator_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\emulator_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\wxemulator"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\wxemulator"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\wxemulator\"
-				ProgramDataBaseFileName="vc_mswudll_x64\wxemulator.pdb"
+				ObjectFile="vc_x64_mswudll\wxemulator\"
+				ProgramDataBaseFileName="vc_x64_mswudll\wxemulator.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\wxemulator.exe"
+				OutputFile="vc_x64_mswudll\wxemulator.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\wxemulator.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\wxemulator.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\emulator_vc9.bsc"
+				OutputFile="vc_x64_mswudll\emulator_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/utils/emulator/src/makefile.vc b/utils/emulator/src/makefile.vc
index ba356d4387..384dd0c6e2 100644
--- a/utils/emulator/src/makefile.vc
+++ b/utils/emulator/src/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/utils/execmon/execmon_vc8.vcproj b/utils/execmon/execmon_vc8.vcproj
index 13ee634d56..df89d99a1a 100644
--- a/utils/execmon/execmon_vc8.vcproj
+++ b/utils/execmon/execmon_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\execmon"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\execmon"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\execmon\"
-				ProgramDataBaseFileName="vc_mswud_x64\execmon.pdb"
+				ObjectFile="vc_x64_mswud\execmon\"
+				ProgramDataBaseFileName="vc_x64_mswud\execmon.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\execmon.exe"
+				OutputFile="vc_x64_mswud\execmon.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\execmon.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\execmon.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\execmon_vc8.bsc"
+				OutputFile="vc_x64_mswud\execmon_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\execmon"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\execmon"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\execmon\"
-				ProgramDataBaseFileName="vc_mswu_x64\execmon.pdb"
+				ObjectFile="vc_x64_mswu\execmon\"
+				ProgramDataBaseFileName="vc_x64_mswu\execmon.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\execmon.exe"
+				OutputFile="vc_x64_mswu\execmon.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\execmon.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\execmon.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\execmon_vc8.bsc"
+				OutputFile="vc_x64_mswu\execmon_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\execmon"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\execmon"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\execmon\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\execmon.pdb"
+				ObjectFile="vc_x64_mswuddll\execmon\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\execmon.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\execmon.exe"
+				OutputFile="vc_x64_mswuddll\execmon.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\execmon.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\execmon.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\execmon_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\execmon_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\execmon"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\execmon"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\execmon\"
-				ProgramDataBaseFileName="vc_mswudll_x64\execmon.pdb"
+				ObjectFile="vc_x64_mswudll\execmon\"
+				ProgramDataBaseFileName="vc_x64_mswudll\execmon.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\execmon.exe"
+				OutputFile="vc_x64_mswudll\execmon.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\execmon.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\execmon.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\execmon_vc8.bsc"
+				OutputFile="vc_x64_mswudll\execmon_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/utils/execmon/execmon_vc9.vcproj b/utils/execmon/execmon_vc9.vcproj
index 964918d9fe..bd35ac5150 100644
--- a/utils/execmon/execmon_vc9.vcproj
+++ b/utils/execmon/execmon_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\execmon"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\execmon"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\execmon\"
-				ProgramDataBaseFileName="vc_mswud_x64\execmon.pdb"
+				ObjectFile="vc_x64_mswud\execmon\"
+				ProgramDataBaseFileName="vc_x64_mswud\execmon.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\execmon.exe"
+				OutputFile="vc_x64_mswud\execmon.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\execmon.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\execmon.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\execmon_vc9.bsc"
+				OutputFile="vc_x64_mswud\execmon_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\execmon"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\execmon"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\execmon\"
-				ProgramDataBaseFileName="vc_mswu_x64\execmon.pdb"
+				ObjectFile="vc_x64_mswu\execmon\"
+				ProgramDataBaseFileName="vc_x64_mswu\execmon.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\execmon.exe"
+				OutputFile="vc_x64_mswu\execmon.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\execmon.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\execmon.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\execmon_vc9.bsc"
+				OutputFile="vc_x64_mswu\execmon_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\execmon"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\execmon"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\execmon\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\execmon.pdb"
+				ObjectFile="vc_x64_mswuddll\execmon\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\execmon.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\execmon.exe"
+				OutputFile="vc_x64_mswuddll\execmon.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\execmon.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\execmon.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\execmon_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\execmon_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\execmon"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\execmon"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\execmon\"
-				ProgramDataBaseFileName="vc_mswudll_x64\execmon.pdb"
+				ObjectFile="vc_x64_mswudll\execmon\"
+				ProgramDataBaseFileName="vc_x64_mswudll\execmon.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\execmon.exe"
+				OutputFile="vc_x64_mswudll\execmon.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\execmon.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\execmon.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\execmon_vc9.bsc"
+				OutputFile="vc_x64_mswudll\execmon_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/utils/execmon/makefile.vc b/utils/execmon/makefile.vc
index c73966c134..e48f0a5e50 100644
--- a/utils/execmon/makefile.vc
+++ b/utils/execmon/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/utils/helpview/src/helpview_vc8.vcproj b/utils/helpview/src/helpview_vc8.vcproj
index 17b2b48f7d..b418947a16 100644
--- a/utils/helpview/src/helpview_vc8.vcproj
+++ b/utils/helpview/src/helpview_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\helpview"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\helpview"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\helpview\"
-				ProgramDataBaseFileName="vc_mswud_x64\helpview.pdb"
+				ObjectFile="vc_x64_mswud\helpview\"
+				ProgramDataBaseFileName="vc_x64_mswud\helpview.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\helpview.exe"
+				OutputFile="vc_x64_mswud\helpview.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\helpview.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\helpview.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\helpview_vc8.bsc"
+				OutputFile="vc_x64_mswud\helpview_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\helpview"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\helpview"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\helpview\"
-				ProgramDataBaseFileName="vc_mswu_x64\helpview.pdb"
+				ObjectFile="vc_x64_mswu\helpview\"
+				ProgramDataBaseFileName="vc_x64_mswu\helpview.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\helpview.exe"
+				OutputFile="vc_x64_mswu\helpview.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\helpview.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\helpview.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\helpview_vc8.bsc"
+				OutputFile="vc_x64_mswu\helpview_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\helpview"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\helpview"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\helpview\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\helpview.pdb"
+				ObjectFile="vc_x64_mswuddll\helpview\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\helpview.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\helpview.exe"
+				OutputFile="vc_x64_mswuddll\helpview.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\helpview.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\helpview.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\helpview_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\helpview_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\helpview"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\helpview"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\helpview\"
-				ProgramDataBaseFileName="vc_mswudll_x64\helpview.pdb"
+				ObjectFile="vc_x64_mswudll\helpview\"
+				ProgramDataBaseFileName="vc_x64_mswudll\helpview.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\helpview.exe"
+				OutputFile="vc_x64_mswudll\helpview.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\helpview.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\helpview.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\helpview_vc8.bsc"
+				OutputFile="vc_x64_mswudll\helpview_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/utils/helpview/src/helpview_vc9.vcproj b/utils/helpview/src/helpview_vc9.vcproj
index f8a4751ae7..7dfd709734 100644
--- a/utils/helpview/src/helpview_vc9.vcproj
+++ b/utils/helpview/src/helpview_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\helpview"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\helpview"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\helpview\"
-				ProgramDataBaseFileName="vc_mswud_x64\helpview.pdb"
+				ObjectFile="vc_x64_mswud\helpview\"
+				ProgramDataBaseFileName="vc_x64_mswud\helpview.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\helpview.exe"
+				OutputFile="vc_x64_mswud\helpview.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\helpview.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\helpview.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\helpview_vc9.bsc"
+				OutputFile="vc_x64_mswud\helpview_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\helpview"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\helpview"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\helpview\"
-				ProgramDataBaseFileName="vc_mswu_x64\helpview.pdb"
+				ObjectFile="vc_x64_mswu\helpview\"
+				ProgramDataBaseFileName="vc_x64_mswu\helpview.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\helpview.exe"
+				OutputFile="vc_x64_mswu\helpview.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\helpview.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\helpview.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\helpview_vc9.bsc"
+				OutputFile="vc_x64_mswu\helpview_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\helpview"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\helpview"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\helpview\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\helpview.pdb"
+				ObjectFile="vc_x64_mswuddll\helpview\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\helpview.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\helpview.exe"
+				OutputFile="vc_x64_mswuddll\helpview.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\helpview.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\helpview.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\helpview_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\helpview_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\helpview"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\helpview"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\helpview\"
-				ProgramDataBaseFileName="vc_mswudll_x64\helpview.pdb"
+				ObjectFile="vc_x64_mswudll\helpview\"
+				ProgramDataBaseFileName="vc_x64_mswudll\helpview.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\helpview.exe"
+				OutputFile="vc_x64_mswudll\helpview.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\helpview.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\helpview.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\helpview_vc9.bsc"
+				OutputFile="vc_x64_mswudll\helpview_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/utils/helpview/src/makefile.vc b/utils/helpview/src/makefile.vc
index 012ad17ea2..40835b63b1 100644
--- a/utils/helpview/src/makefile.vc
+++ b/utils/helpview/src/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/utils/hhp2cached/hhp2cached_vc8.vcproj b/utils/hhp2cached/hhp2cached_vc8.vcproj
index 4b39012611..7b314cc3c7 100644
--- a/utils/hhp2cached/hhp2cached_vc8.vcproj
+++ b/utils/hhp2cached/hhp2cached_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\hhp2cached"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\hhp2cached"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\hhp2cached\"
-				ProgramDataBaseFileName="vc_mswud_x64\hhp2cached.pdb"
+				ObjectFile="vc_x64_mswud\hhp2cached\"
+				ProgramDataBaseFileName="vc_x64_mswud\hhp2cached.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\hhp2cached.exe"
+				OutputFile="vc_x64_mswud\hhp2cached.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\hhp2cached.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\hhp2cached.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\hhp2cached_vc8.bsc"
+				OutputFile="vc_x64_mswud\hhp2cached_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\hhp2cached"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\hhp2cached"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\hhp2cached\"
-				ProgramDataBaseFileName="vc_mswu_x64\hhp2cached.pdb"
+				ObjectFile="vc_x64_mswu\hhp2cached\"
+				ProgramDataBaseFileName="vc_x64_mswu\hhp2cached.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\hhp2cached.exe"
+				OutputFile="vc_x64_mswu\hhp2cached.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\hhp2cached.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\hhp2cached.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\hhp2cached_vc8.bsc"
+				OutputFile="vc_x64_mswu\hhp2cached_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\hhp2cached"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\hhp2cached"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\hhp2cached\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\hhp2cached.pdb"
+				ObjectFile="vc_x64_mswuddll\hhp2cached\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\hhp2cached.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\hhp2cached.exe"
+				OutputFile="vc_x64_mswuddll\hhp2cached.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\hhp2cached.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\hhp2cached.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\hhp2cached_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\hhp2cached_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\hhp2cached"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\hhp2cached"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\hhp2cached\"
-				ProgramDataBaseFileName="vc_mswudll_x64\hhp2cached.pdb"
+				ObjectFile="vc_x64_mswudll\hhp2cached\"
+				ProgramDataBaseFileName="vc_x64_mswudll\hhp2cached.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\hhp2cached.exe"
+				OutputFile="vc_x64_mswudll\hhp2cached.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\hhp2cached.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\hhp2cached.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\hhp2cached_vc8.bsc"
+				OutputFile="vc_x64_mswudll\hhp2cached_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/utils/hhp2cached/hhp2cached_vc9.vcproj b/utils/hhp2cached/hhp2cached_vc9.vcproj
index 9f76a43889..608a3f24db 100644
--- a/utils/hhp2cached/hhp2cached_vc9.vcproj
+++ b/utils/hhp2cached/hhp2cached_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\hhp2cached"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\hhp2cached"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\hhp2cached\"
-				ProgramDataBaseFileName="vc_mswud_x64\hhp2cached.pdb"
+				ObjectFile="vc_x64_mswud\hhp2cached\"
+				ProgramDataBaseFileName="vc_x64_mswud\hhp2cached.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\hhp2cached.exe"
+				OutputFile="vc_x64_mswud\hhp2cached.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\hhp2cached.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\hhp2cached.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\hhp2cached_vc9.bsc"
+				OutputFile="vc_x64_mswud\hhp2cached_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\hhp2cached"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\hhp2cached"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\hhp2cached\"
-				ProgramDataBaseFileName="vc_mswu_x64\hhp2cached.pdb"
+				ObjectFile="vc_x64_mswu\hhp2cached\"
+				ProgramDataBaseFileName="vc_x64_mswu\hhp2cached.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\hhp2cached.exe"
+				OutputFile="vc_x64_mswu\hhp2cached.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\hhp2cached.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\hhp2cached.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\hhp2cached_vc9.bsc"
+				OutputFile="vc_x64_mswu\hhp2cached_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\hhp2cached"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\hhp2cached"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\hhp2cached\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\hhp2cached.pdb"
+				ObjectFile="vc_x64_mswuddll\hhp2cached\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\hhp2cached.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\hhp2cached.exe"
+				OutputFile="vc_x64_mswuddll\hhp2cached.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\hhp2cached.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\hhp2cached.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\hhp2cached_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\hhp2cached_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\hhp2cached"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\hhp2cached"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\hhp2cached\"
-				ProgramDataBaseFileName="vc_mswudll_x64\hhp2cached.pdb"
+				ObjectFile="vc_x64_mswudll\hhp2cached\"
+				ProgramDataBaseFileName="vc_x64_mswudll\hhp2cached.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\hhp2cached.exe"
+				OutputFile="vc_x64_mswudll\hhp2cached.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\hhp2cached.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\hhp2cached.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\hhp2cached_vc9.bsc"
+				OutputFile="vc_x64_mswudll\hhp2cached_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/utils/hhp2cached/makefile.vc b/utils/hhp2cached/makefile.vc
index d2c7c3ecd0..bcb1330f1e 100644
--- a/utils/hhp2cached/makefile.vc
+++ b/utils/hhp2cached/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/utils/ifacecheck/src/ifacecheck_vc8.vcproj b/utils/ifacecheck/src/ifacecheck_vc8.vcproj
index 4f2dacb058..60374c8681 100644
--- a/utils/ifacecheck/src/ifacecheck_vc8.vcproj
+++ b/utils/ifacecheck/src/ifacecheck_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\ifacecheck"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\ifacecheck"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\ifacecheck\"
-				ProgramDataBaseFileName="vc_mswud_x64\ifacecheck.pdb"
+				ObjectFile="vc_x64_mswud\ifacecheck\"
+				ProgramDataBaseFileName="vc_x64_mswud\ifacecheck.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud_xml.lib  wxbase31ud.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\ifacecheck.exe"
+				OutputFile="vc_x64_mswud\ifacecheck.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\ifacecheck.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\ifacecheck.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\ifacecheck_vc8.bsc"
+				OutputFile="vc_x64_mswud\ifacecheck_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\ifacecheck"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\ifacecheck"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\ifacecheck\"
-				ProgramDataBaseFileName="vc_mswu_x64\ifacecheck.pdb"
+				ObjectFile="vc_x64_mswu\ifacecheck\"
+				ProgramDataBaseFileName="vc_x64_mswu\ifacecheck.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u_xml.lib  wxbase31u.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\ifacecheck.exe"
+				OutputFile="vc_x64_mswu\ifacecheck.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\ifacecheck.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\ifacecheck.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\ifacecheck_vc8.bsc"
+				OutputFile="vc_x64_mswu\ifacecheck_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\ifacecheck"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\ifacecheck"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\ifacecheck\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\ifacecheck.pdb"
+				ObjectFile="vc_x64_mswuddll\ifacecheck\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\ifacecheck.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud_xml.lib  wxbase31ud.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\ifacecheck.exe"
+				OutputFile="vc_x64_mswuddll\ifacecheck.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\ifacecheck.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\ifacecheck.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\ifacecheck_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\ifacecheck_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\ifacecheck"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\ifacecheck"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\ifacecheck\"
-				ProgramDataBaseFileName="vc_mswudll_x64\ifacecheck.pdb"
+				ObjectFile="vc_x64_mswudll\ifacecheck\"
+				ProgramDataBaseFileName="vc_x64_mswudll\ifacecheck.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u_xml.lib  wxbase31u.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\ifacecheck.exe"
+				OutputFile="vc_x64_mswudll\ifacecheck.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\ifacecheck.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\ifacecheck.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\ifacecheck_vc8.bsc"
+				OutputFile="vc_x64_mswudll\ifacecheck_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/utils/ifacecheck/src/ifacecheck_vc9.vcproj b/utils/ifacecheck/src/ifacecheck_vc9.vcproj
index e5d28d9580..9a1a87452d 100644
--- a/utils/ifacecheck/src/ifacecheck_vc9.vcproj
+++ b/utils/ifacecheck/src/ifacecheck_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\ifacecheck"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\ifacecheck"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\ifacecheck\"
-				ProgramDataBaseFileName="vc_mswud_x64\ifacecheck.pdb"
+				ObjectFile="vc_x64_mswud\ifacecheck\"
+				ProgramDataBaseFileName="vc_x64_mswud\ifacecheck.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud_xml.lib  wxbase31ud.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\ifacecheck.exe"
+				OutputFile="vc_x64_mswud\ifacecheck.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\ifacecheck.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\ifacecheck.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\ifacecheck_vc9.bsc"
+				OutputFile="vc_x64_mswud\ifacecheck_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\ifacecheck"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\ifacecheck"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\ifacecheck\"
-				ProgramDataBaseFileName="vc_mswu_x64\ifacecheck.pdb"
+				ObjectFile="vc_x64_mswu\ifacecheck\"
+				ProgramDataBaseFileName="vc_x64_mswu\ifacecheck.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u_xml.lib  wxbase31u.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\ifacecheck.exe"
+				OutputFile="vc_x64_mswu\ifacecheck.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\ifacecheck.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\ifacecheck.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\ifacecheck_vc9.bsc"
+				OutputFile="vc_x64_mswu\ifacecheck_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\ifacecheck"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\ifacecheck"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\ifacecheck\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\ifacecheck.pdb"
+				ObjectFile="vc_x64_mswuddll\ifacecheck\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\ifacecheck.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud_xml.lib  wxbase31ud.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\ifacecheck.exe"
+				OutputFile="vc_x64_mswuddll\ifacecheck.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\ifacecheck.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\ifacecheck.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\ifacecheck_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\ifacecheck_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\ifacecheck"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\ifacecheck"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\ifacecheck\"
-				ProgramDataBaseFileName="vc_mswudll_x64\ifacecheck.pdb"
+				ObjectFile="vc_x64_mswudll\ifacecheck\"
+				ProgramDataBaseFileName="vc_x64_mswudll\ifacecheck.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u_xml.lib  wxbase31u.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\ifacecheck.exe"
+				OutputFile="vc_x64_mswudll\ifacecheck.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\ifacecheck.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\ifacecheck.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\ifacecheck_vc9.bsc"
+				OutputFile="vc_x64_mswudll\ifacecheck_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/utils/ifacecheck/src/makefile.vc b/utils/ifacecheck/src/makefile.vc
index 08b74edc60..623e219c51 100644
--- a/utils/ifacecheck/src/makefile.vc
+++ b/utils/ifacecheck/src/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/utils/screenshotgen/src/makefile.vc b/utils/screenshotgen/src/makefile.vc
index 2c828e5284..5aaeda54ee 100644
--- a/utils/screenshotgen/src/makefile.vc
+++ b/utils/screenshotgen/src/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/utils/screenshotgen/src/screenshotgen_vc8.vcproj b/utils/screenshotgen/src/screenshotgen_vc8.vcproj
index aa475fa09d..c33b95194f 100644
--- a/utils/screenshotgen/src/screenshotgen_vc8.vcproj
+++ b/utils/screenshotgen/src/screenshotgen_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\screenshotgen"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\screenshotgen"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\screenshotgen\"
-				ProgramDataBaseFileName="vc_mswud_x64\screenshotgen.pdb"
+				ObjectFile="vc_x64_mswud\screenshotgen\"
+				ProgramDataBaseFileName="vc_x64_mswud\screenshotgen.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_aui.lib  wxmsw31ud_richtext.lib  wxmsw31ud_html.lib  wxbase31ud_xml.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\screenshotgen.exe"
+				OutputFile="vc_x64_mswud\screenshotgen.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\screenshotgen.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\screenshotgen.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\screenshotgen_vc8.bsc"
+				OutputFile="vc_x64_mswud\screenshotgen_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\screenshotgen"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\screenshotgen"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\screenshotgen\"
-				ProgramDataBaseFileName="vc_mswu_x64\screenshotgen.pdb"
+				ObjectFile="vc_x64_mswu\screenshotgen\"
+				ProgramDataBaseFileName="vc_x64_mswu\screenshotgen.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_aui.lib  wxmsw31u_richtext.lib  wxmsw31u_html.lib  wxbase31u_xml.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\screenshotgen.exe"
+				OutputFile="vc_x64_mswu\screenshotgen.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\screenshotgen.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\screenshotgen.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\screenshotgen_vc8.bsc"
+				OutputFile="vc_x64_mswu\screenshotgen_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\screenshotgen"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\screenshotgen"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\screenshotgen\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\screenshotgen.pdb"
+				ObjectFile="vc_x64_mswuddll\screenshotgen\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\screenshotgen.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_aui.lib  wxmsw31ud_richtext.lib  wxmsw31ud_html.lib  wxbase31ud_xml.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\screenshotgen.exe"
+				OutputFile="vc_x64_mswuddll\screenshotgen.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\screenshotgen.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\screenshotgen.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\screenshotgen_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\screenshotgen_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\screenshotgen"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\screenshotgen"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\screenshotgen\"
-				ProgramDataBaseFileName="vc_mswudll_x64\screenshotgen.pdb"
+				ObjectFile="vc_x64_mswudll\screenshotgen\"
+				ProgramDataBaseFileName="vc_x64_mswudll\screenshotgen.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_aui.lib  wxmsw31u_richtext.lib  wxmsw31u_html.lib  wxbase31u_xml.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\screenshotgen.exe"
+				OutputFile="vc_x64_mswudll\screenshotgen.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\screenshotgen.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\screenshotgen.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\screenshotgen_vc8.bsc"
+				OutputFile="vc_x64_mswudll\screenshotgen_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/utils/screenshotgen/src/screenshotgen_vc9.vcproj b/utils/screenshotgen/src/screenshotgen_vc9.vcproj
index 5c1fb4e5ff..865236bfb9 100644
--- a/utils/screenshotgen/src/screenshotgen_vc9.vcproj
+++ b/utils/screenshotgen/src/screenshotgen_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\screenshotgen"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\screenshotgen"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\screenshotgen\"
-				ProgramDataBaseFileName="vc_mswud_x64\screenshotgen.pdb"
+				ObjectFile="vc_x64_mswud\screenshotgen\"
+				ProgramDataBaseFileName="vc_x64_mswud\screenshotgen.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_aui.lib  wxmsw31ud_richtext.lib  wxmsw31ud_html.lib  wxbase31ud_xml.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\screenshotgen.exe"
+				OutputFile="vc_x64_mswud\screenshotgen.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\screenshotgen.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\screenshotgen.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\screenshotgen_vc9.bsc"
+				OutputFile="vc_x64_mswud\screenshotgen_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\screenshotgen"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\screenshotgen"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\screenshotgen\"
-				ProgramDataBaseFileName="vc_mswu_x64\screenshotgen.pdb"
+				ObjectFile="vc_x64_mswu\screenshotgen\"
+				ProgramDataBaseFileName="vc_x64_mswu\screenshotgen.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_aui.lib  wxmsw31u_richtext.lib  wxmsw31u_html.lib  wxbase31u_xml.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\screenshotgen.exe"
+				OutputFile="vc_x64_mswu\screenshotgen.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\screenshotgen.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\screenshotgen.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\screenshotgen_vc9.bsc"
+				OutputFile="vc_x64_mswu\screenshotgen_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\screenshotgen"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\screenshotgen"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\screenshotgen\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\screenshotgen.pdb"
+				ObjectFile="vc_x64_mswuddll\screenshotgen\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\screenshotgen.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_aui.lib  wxmsw31ud_richtext.lib  wxmsw31ud_html.lib  wxbase31ud_xml.lib  wxmsw31ud_core.lib  wxbase31ud.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\screenshotgen.exe"
+				OutputFile="vc_x64_mswuddll\screenshotgen.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\screenshotgen.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\screenshotgen.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\screenshotgen_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\screenshotgen_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\screenshotgen"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\screenshotgen"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\screenshotgen\"
-				ProgramDataBaseFileName="vc_mswudll_x64\screenshotgen.pdb"
+				ObjectFile="vc_x64_mswudll\screenshotgen\"
+				ProgramDataBaseFileName="vc_x64_mswudll\screenshotgen.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_aui.lib  wxmsw31u_richtext.lib  wxmsw31u_html.lib  wxbase31u_xml.lib  wxmsw31u_core.lib  wxbase31u.lib    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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\screenshotgen.exe"
+				OutputFile="vc_x64_mswudll\screenshotgen.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\screenshotgen.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\screenshotgen.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\screenshotgen_vc9.bsc"
+				OutputFile="vc_x64_mswudll\screenshotgen_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/utils/wxrc/makefile.vc b/utils/wxrc/makefile.vc
index 69864dffce..628163edad 100644
--- a/utils/wxrc/makefile.vc
+++ b/utils/wxrc/makefile.vc
@@ -15,7 +15,7 @@
 WX_RELEASE_NODOT = 31
 COMPILER_PREFIX = vc
 OBJS = \
-	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
 	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
diff --git a/utils/wxrc/wxrc_vc8.vcproj b/utils/wxrc/wxrc_vc8.vcproj
index 088386ebf6..bfda88c773 100644
--- a/utils/wxrc/wxrc_vc8.vcproj
+++ b/utils/wxrc/wxrc_vc8.vcproj
@@ -412,8 +412,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\wxrc"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\wxrc"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\wxrc\"
-				ProgramDataBaseFileName="vc_mswud_x64\wxrc.pdb"
+				ObjectFile="vc_x64_mswud\wxrc\"
+				ProgramDataBaseFileName="vc_x64_mswud\wxrc.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud_xml.lib  wxbase31ud.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\wxrc.exe"
+				OutputFile="vc_x64_mswud\wxrc.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\wxrc.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\wxrc.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -491,7 +491,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\wxrc_vc8.bsc"
+				OutputFile="vc_x64_mswud\wxrc_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -509,8 +509,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\wxrc"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\wxrc"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\wxrc\"
-				ProgramDataBaseFileName="vc_mswu_x64\wxrc.pdb"
+				ObjectFile="vc_x64_mswu\wxrc\"
+				ProgramDataBaseFileName="vc_x64_mswu\wxrc.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u_xml.lib  wxbase31u.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\wxrc.exe"
+				OutputFile="vc_x64_mswu\wxrc.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\wxrc.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\wxrc.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -587,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\wxrc_vc8.bsc"
+				OutputFile="vc_x64_mswu\wxrc_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -605,8 +605,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\wxrc"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\wxrc"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\wxrc\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\wxrc.pdb"
+				ObjectFile="vc_x64_mswuddll\wxrc\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\wxrc.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud_xml.lib  wxbase31ud.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\wxrc.exe"
+				OutputFile="vc_x64_mswuddll\wxrc.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\wxrc.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\wxrc.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\wxrc_vc8.bsc"
+				OutputFile="vc_x64_mswuddll\wxrc_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -702,8 +702,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\wxrc"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\wxrc"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\wxrc\"
-				ProgramDataBaseFileName="vc_mswudll_x64\wxrc.pdb"
+				ObjectFile="vc_x64_mswudll\wxrc\"
+				ProgramDataBaseFileName="vc_x64_mswudll\wxrc.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u_xml.lib  wxbase31u.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\wxrc.exe"
+				OutputFile="vc_x64_mswudll\wxrc.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\wxrc.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\wxrc.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -780,7 +780,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\wxrc_vc8.bsc"
+				OutputFile="vc_x64_mswudll\wxrc_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/utils/wxrc/wxrc_vc9.vcproj b/utils/wxrc/wxrc_vc9.vcproj
index 467d0474ea..d76b1f0c11 100644
--- a/utils/wxrc/wxrc_vc9.vcproj
+++ b/utils/wxrc/wxrc_vc9.vcproj
@@ -398,8 +398,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="vc_mswud_x64"
-			IntermediateDirectory="vc_mswud_x64\wxrc"
+			OutputDirectory="vc_x64_mswud"
+			IntermediateDirectory="vc_x64_mswud\wxrc"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswud_x64\wxrc\"
-				ProgramDataBaseFileName="vc_mswud_x64\wxrc.pdb"
+				ObjectFile="vc_x64_mswud\wxrc\"
+				ProgramDataBaseFileName="vc_x64_mswud\wxrc.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -455,13 +455,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud_xml.lib  wxbase31ud.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswud_x64\wxrc.exe"
+				OutputFile="vc_x64_mswud\wxrc.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud_x64\wxrc.pdb"
+				ProgramDatabaseFile="vc_x64_mswud\wxrc.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud_x64\wxrc_vc9.bsc"
+				OutputFile="vc_x64_mswud\wxrc_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -491,8 +491,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="vc_mswu_x64"
-			IntermediateDirectory="vc_mswu_x64\wxrc"
+			OutputDirectory="vc_x64_mswu"
+			IntermediateDirectory="vc_x64_mswu\wxrc"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswu_x64\wxrc\"
-				ProgramDataBaseFileName="vc_mswu_x64\wxrc.pdb"
+				ObjectFile="vc_x64_mswu\wxrc\"
+				ProgramDataBaseFileName="vc_x64_mswu\wxrc.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -546,13 +546,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u_xml.lib  wxbase31u.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswu_x64\wxrc.exe"
+				OutputFile="vc_x64_mswu\wxrc.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu_x64\wxrc.pdb"
+				ProgramDatabaseFile="vc_x64_mswu\wxrc.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -569,7 +569,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu_x64\wxrc_vc9.bsc"
+				OutputFile="vc_x64_mswu\wxrc_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -584,8 +584,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|x64"
-			OutputDirectory="vc_mswuddll_x64"
-			IntermediateDirectory="vc_mswuddll_x64\wxrc"
+			OutputDirectory="vc_x64_mswuddll"
+			IntermediateDirectory="vc_x64_mswuddll\wxrc"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswuddll_x64\wxrc\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\wxrc.pdb"
+				ObjectFile="vc_x64_mswuddll\wxrc\"
+				ProgramDataBaseFileName="vc_x64_mswuddll\wxrc.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -641,13 +641,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31ud_xml.lib  wxbase31ud.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\wxrc.exe"
+				OutputFile="vc_x64_mswuddll\wxrc.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\wxrc.pdb"
+				ProgramDatabaseFile="vc_x64_mswuddll\wxrc.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -662,7 +662,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll_x64\wxrc_vc9.bsc"
+				OutputFile="vc_x64_mswuddll\wxrc_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -677,8 +677,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Release|x64"
-			OutputDirectory="vc_mswudll_x64"
-			IntermediateDirectory="vc_mswudll_x64\wxrc"
+			OutputDirectory="vc_x64_mswudll"
+			IntermediateDirectory="vc_x64_mswudll\wxrc"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswudll_x64\wxrc\"
-				ProgramDataBaseFileName="vc_mswudll_x64\wxrc.pdb"
+				ObjectFile="vc_x64_mswudll\wxrc\"
+				ProgramDataBaseFileName="vc_x64_mswudll\wxrc.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -732,13 +732,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxbase31u_xml.lib  wxbase31u.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 ws2_32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\wxrc.exe"
+				OutputFile="vc_x64_mswudll\wxrc.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\wxrc.pdb"
+				ProgramDatabaseFile="vc_x64_mswudll\wxrc.pdb"
 				SubSystem="1"
 				TargetMachine="17"
 				OptimizeReferences="2"
@@ -755,7 +755,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll_x64\wxrc_vc9.bsc"
+				OutputFile="vc_x64_mswudll\wxrc_vc9.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool