X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/506e9b7ed2bee097fd3674061f6962e54bdea7bf..0e1f8ea4a3c2764ec89d95f4edef40257e32ac5b:/build/msw/wx_vc9_wxexpat.vcproj

diff --git a/build/msw/wx_vc9_wxexpat.vcproj b/build/msw/wx_vc9_wxexpat.vcproj
index 565b19c602..194022bf0f 100644
--- a/build/msw/wx_vc9_wxexpat.vcproj
+++ b/build/msw/wx_vc9_wxexpat.vcproj
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <!--
 
-  This makefile was generated by
-  Bakefile 0.2.5 (http://www.bakefile.org)
+  This project was generated by
+  Bakefile 0.2.9 (http://www.bakefile.org)
   Do not modify, all changes will be overwritten!
 
 -->
@@ -22,9 +22,9 @@
 	</ToolFiles>
 	<Configurations>
 		<Configuration
-			Name="DLL Universal Release|Win32"
-			OutputDirectory="..\..\lib\vc_dll"
-			IntermediateDirectory="vc_mswunivudll\wxexpat"
+			Name="Debug|Win32"
+			OutputDirectory="..\..\lib\vc_lib"
+			IntermediateDirectory="vc_mswud\wxexpat"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -42,20 +42,23 @@
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
 			<Tool
-				Name="VCIDLTool"
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\..\lib\vc_dll"
-				PreprocessorDefinitions="_LIB;COMPILED_FROM_DSP"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"
 				ExceptionHandling="1"
-				RuntimeLibrary="2"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswunivudll\wxexpat\"
-				ObjectFile="vc_mswunivudll\wxexpat\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxexpat.pdb"
+				ObjectFile="vc_mswud\wxexpat\"
+				ProgramDataBaseFileName="..\..\lib\vc_lib\wxexpatd.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -65,16 +68,16 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="COMPILED_FROM_DSP"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_dll"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_dll\wxexpat.lib"
+				OutputFile="..\..\lib\vc_lib\wxexpatd.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -88,7 +91,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_vc9_wxexpat.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc9_wxexpat.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -99,9 +102,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="DLL Universal Debug|Win32"
-			OutputDirectory="..\..\lib\vc_dll"
-			IntermediateDirectory="vc_mswunivuddll\wxexpat"
+			Name="Release|Win32"
+			OutputDirectory="..\..\lib\vc_lib"
+			IntermediateDirectory="vc_mswu\wxexpat"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -119,22 +122,21 @@
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
 			<Tool
-				Name="VCIDLTool"
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\lib\vc_dll"
-				PreprocessorDefinitions="_LIB;_DEBUG;COMPILED_FROM_DSP"
+				Optimization="2"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib"
+				PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"
 				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
+				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswunivuddll\wxexpat\"
-				ObjectFile="vc_mswunivuddll\wxexpat\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxexpatd.pdb"
+				ObjectFile="vc_mswu\wxexpat\"
+				ProgramDataBaseFileName="..\..\lib\vc_lib\wxexpat.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -144,16 +146,16 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_dll"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_dll\wxexpatd.lib"
+				OutputFile="..\..\lib\vc_lib\wxexpat.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -167,7 +169,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_vc9_wxexpat.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc9_wxexpat.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -178,9 +180,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="DLL Release|Win32"
-			OutputDirectory="..\..\lib\vc_dll"
-			IntermediateDirectory="vc_mswudll\wxexpat"
+			Name="Universal Debug|Win32"
+			OutputDirectory="..\..\lib\vc_lib"
+			IntermediateDirectory="vc_mswunivud\wxexpat"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -198,20 +200,23 @@
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
 			<Tool
-				Name="VCIDLTool"
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\..\lib\vc_dll"
-				PreprocessorDefinitions="_LIB;COMPILED_FROM_DSP"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"
 				ExceptionHandling="1"
-				RuntimeLibrary="2"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswudll\wxexpat\"
-				ObjectFile="vc_mswudll\wxexpat\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxexpat.pdb"
+				ObjectFile="vc_mswunivud\wxexpat\"
+				ProgramDataBaseFileName="..\..\lib\vc_lib\wxexpatd.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -221,16 +226,16 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="COMPILED_FROM_DSP"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_dll"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_dll\wxexpat.lib"
+				OutputFile="..\..\lib\vc_lib\wxexpatd.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -244,7 +249,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_vc9_wxexpat.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc9_wxexpat.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -255,9 +260,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="DLL Debug|Win32"
-			OutputDirectory="..\..\lib\vc_dll"
-			IntermediateDirectory="vc_mswuddll\wxexpat"
+			Name="Universal Release|Win32"
+			OutputDirectory="..\..\lib\vc_lib"
+			IntermediateDirectory="vc_mswunivu\wxexpat"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -275,22 +280,21 @@
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
 			<Tool
-				Name="VCIDLTool"
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\lib\vc_dll"
-				PreprocessorDefinitions="_LIB;_DEBUG;COMPILED_FROM_DSP"
+				Optimization="2"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib"
+				PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"
 				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
+				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswuddll\wxexpat\"
-				ObjectFile="vc_mswuddll\wxexpat\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxexpatd.pdb"
+				ObjectFile="vc_mswunivu\wxexpat\"
+				ProgramDataBaseFileName="..\..\lib\vc_lib\wxexpat.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -300,16 +304,16 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_dll"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_dll\wxexpatd.lib"
+				OutputFile="..\..\lib\vc_lib\wxexpat.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -323,7 +327,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_vc9_wxexpat.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc9_wxexpat.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -334,9 +338,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Universal Release|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswunivu\wxexpat"
+			Name="DLL Debug|Win32"
+			OutputDirectory="..\..\lib\vc_dll"
+			IntermediateDirectory="vc_mswuddll\wxexpat"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -354,20 +358,23 @@
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
 			<Tool
-				Name="VCIDLTool"
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib"
-				PreprocessorDefinitions="_LIB;COMPILED_FROM_DSP"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"
 				ExceptionHandling="1"
-				RuntimeLibrary="2"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswunivu\wxexpat\"
-				ObjectFile="vc_mswunivu\wxexpat\"
-				ProgramDataBaseFileName="..\..\lib\vc_lib\wxexpat.pdb"
+				ObjectFile="vc_mswuddll\wxexpat\"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxexpatd.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -377,16 +384,16 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="COMPILED_FROM_DSP"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxexpat.lib"
+				OutputFile="..\..\lib\vc_dll\wxexpatd.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -400,7 +407,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_vc9_wxexpat.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc9_wxexpat.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -411,9 +418,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Universal Debug|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswunivud\wxexpat"
+			Name="DLL Release|Win32"
+			OutputDirectory="..\..\lib\vc_dll"
+			IntermediateDirectory="vc_mswudll\wxexpat"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -431,22 +438,21 @@
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
 			<Tool
-				Name="VCIDLTool"
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib"
-				PreprocessorDefinitions="_LIB;_DEBUG;COMPILED_FROM_DSP"
+				Optimization="2"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll"
+				PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"
 				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
+				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswunivud\wxexpat\"
-				ObjectFile="vc_mswunivud\wxexpat\"
-				ProgramDataBaseFileName="..\..\lib\vc_lib\wxexpatd.pdb"
+				ObjectFile="vc_mswudll\wxexpat\"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxexpat.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -456,16 +462,16 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxexpatd.lib"
+				OutputFile="..\..\lib\vc_dll\wxexpat.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -479,7 +485,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_vc9_wxexpat.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc9_wxexpat.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -490,9 +496,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswu\wxexpat"
+			Name="DLL Universal Debug|Win32"
+			OutputDirectory="..\..\lib\vc_dll"
+			IntermediateDirectory="vc_mswunivuddll\wxexpat"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -510,20 +516,23 @@
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
 			<Tool
-				Name="VCIDLTool"
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib"
-				PreprocessorDefinitions="_LIB;COMPILED_FROM_DSP"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"
 				ExceptionHandling="1"
-				RuntimeLibrary="2"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswu\wxexpat\"
-				ObjectFile="vc_mswu\wxexpat\"
-				ProgramDataBaseFileName="..\..\lib\vc_lib\wxexpat.pdb"
+				ObjectFile="vc_mswunivuddll\wxexpat\"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxexpatd.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -533,16 +542,16 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="COMPILED_FROM_DSP"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxexpat.lib"
+				OutputFile="..\..\lib\vc_dll\wxexpatd.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -556,7 +565,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_vc9_wxexpat.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc9_wxexpat.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -567,9 +576,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswud\wxexpat"
+			Name="DLL Universal Release|Win32"
+			OutputDirectory="..\..\lib\vc_dll"
+			IntermediateDirectory="vc_mswunivudll\wxexpat"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -587,22 +596,21 @@
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
 			<Tool
-				Name="VCIDLTool"
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib"
-				PreprocessorDefinitions="_LIB;_DEBUG;COMPILED_FROM_DSP"
+				Optimization="2"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll"
+				PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"
 				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
+				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswud\wxexpat\"
-				ObjectFile="vc_mswud\wxexpat\"
-				ProgramDataBaseFileName="..\..\lib\vc_lib\wxexpatd.pdb"
+				ObjectFile="vc_mswunivudll\wxexpat\"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxexpat.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -612,16 +620,16 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxexpatd.lib"
+				OutputFile="..\..\lib\vc_dll\wxexpat.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -635,7 +643,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_vc9_wxexpat.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc9_wxexpat.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool