X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8ece421c6c40b0977dc2a7f91f9eff7234b814dd..e28cc3ca0aa9bb1c7e9613c447ca94b13a8bc858:/build/msw/wx_vc8_wxregex.vcproj?ds=sidebyside

diff --git a/build/msw/wx_vc8_wxregex.vcproj b/build/msw/wx_vc8_wxregex.vcproj
index 82410cb0a4..6fc0cb31cc 100644
--- a/build/msw/wx_vc8_wxregex.vcproj
+++ b/build/msw/wx_vc8_wxregex.vcproj
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <!--
 
-  This makefile was generated by
-  Bakefile 0.2.4 (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\wxregex"
+			Name="Debug|Win32"
+			OutputDirectory="..\..\lib\vc_lib"
+			IntermediateDirectory="vc_mswud\wxregex"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -44,18 +44,22 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE"
+				AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswud"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivu"
-				PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswud"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE"
+				MinimalRebuild="true"
 				ExceptionHandling="1"
-				RuntimeLibrary="2"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswunivudll\wxregex\"
-				ObjectFile="vc_mswunivudll\wxregex\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxregexu.pdb"
+				ObjectFile="vc_mswud\wxregex\"
+				ProgramDataBaseFileName="..\..\lib\vc_lib\wxregexud.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -66,16 +70,16 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+				PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivu"
+				AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswud"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_dll\wxregexu.lib"
+				OutputFile="..\..\lib\vc_lib\wxregexud.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -89,7 +93,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_vc8_wxregex.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_wxregex.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -100,9 +104,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="DLL Universal Debug|Win32"
-			OutputDirectory="..\..\lib\vc_dll"
-			IntermediateDirectory="vc_mswunivuddll\wxregex"
+			Name="Release|Win32"
+			OutputDirectory="..\..\lib\vc_lib"
+			IntermediateDirectory="vc_mswu\wxregex"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -122,21 +126,19 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE"
+				AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswu"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivud"
-				PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
-				MinimalRebuild="true"
+				Optimization="2"
+				AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswu"
+				PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE"
 				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
+				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswunivuddll\wxregex\"
-				ObjectFile="vc_mswunivuddll\wxregex\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxregexud.pdb"
+				ObjectFile="vc_mswu\wxregex\"
+				ProgramDataBaseFileName="..\..\lib\vc_lib\wxregexu.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -147,16 +149,16 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivud"
+				AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswu"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_dll\wxregexud.lib"
+				OutputFile="..\..\lib\vc_lib\wxregexu.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -170,7 +172,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_vc8_wxregex.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_wxregex.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -181,9 +183,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="DLL Release|Win32"
-			OutputDirectory="..\..\lib\vc_dll"
-			IntermediateDirectory="vc_mswudll\wxregex"
+			Name="Universal Debug|Win32"
+			OutputDirectory="..\..\lib\vc_lib"
+			IntermediateDirectory="vc_mswunivud\wxregex"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -203,18 +205,22 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+				AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivud"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswu"
-				PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivud"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+				MinimalRebuild="true"
 				ExceptionHandling="1"
-				RuntimeLibrary="2"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswudll\wxregex\"
-				ObjectFile="vc_mswudll\wxregex\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxregexu.pdb"
+				ObjectFile="vc_mswunivud\wxregex\"
+				ProgramDataBaseFileName="..\..\lib\vc_lib\wxregexud.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -225,16 +231,16 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="__WXMSW__;_UNICODE"
+				PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswu"
+				AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivud"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_dll\wxregexu.lib"
+				OutputFile="..\..\lib\vc_lib\wxregexud.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -248,7 +254,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_vc8_wxregex.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_wxregex.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -259,9 +265,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="DLL Debug|Win32"
-			OutputDirectory="..\..\lib\vc_dll"
-			IntermediateDirectory="vc_mswuddll\wxregex"
+			Name="Universal Release|Win32"
+			OutputDirectory="..\..\lib\vc_lib"
+			IntermediateDirectory="vc_mswunivu\wxregex"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -281,21 +287,19 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+				AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivu"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswud"
-				PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;_UNICODE"
-				MinimalRebuild="true"
+				Optimization="2"
+				AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivu"
+				PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
 				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
+				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswuddll\wxregex\"
-				ObjectFile="vc_mswuddll\wxregex\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxregexud.pdb"
+				ObjectFile="vc_mswunivu\wxregex\"
+				ProgramDataBaseFileName="..\..\lib\vc_lib\wxregexu.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -306,16 +310,16 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE"
+				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswud"
+				AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivu"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_dll\wxregexud.lib"
+				OutputFile="..\..\lib\vc_lib\wxregexu.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -329,7 +333,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_vc8_wxregex.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_wxregex.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -340,9 +344,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Universal Release|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswunivu\wxregex"
+			Name="DLL Debug|Win32"
+			OutputDirectory="..\..\lib\vc_dll"
+			IntermediateDirectory="vc_mswuddll\wxregex"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -362,18 +366,22 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE"
+				AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswud"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivu"
-				PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswud"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE"
+				MinimalRebuild="true"
 				ExceptionHandling="1"
-				RuntimeLibrary="2"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswunivu\wxregex\"
-				ObjectFile="vc_mswunivu\wxregex\"
-				ProgramDataBaseFileName="..\..\lib\vc_lib\wxregexu.pdb"
+				ObjectFile="vc_mswuddll\wxregex\"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxregexud.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -384,16 +392,16 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+				PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivu"
+				AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswud"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxregexu.lib"
+				OutputFile="..\..\lib\vc_dll\wxregexud.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -407,7 +415,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_vc8_wxregex.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_wxregex.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -418,9 +426,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Universal Debug|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswunivud\wxregex"
+			Name="DLL Release|Win32"
+			OutputDirectory="..\..\lib\vc_dll"
+			IntermediateDirectory="vc_mswudll\wxregex"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -440,21 +448,19 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE"
+				AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswu"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivud"
-				PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
-				MinimalRebuild="true"
+				Optimization="2"
+				AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswu"
+				PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE"
 				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
+				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswunivud\wxregex\"
-				ObjectFile="vc_mswunivud\wxregex\"
-				ProgramDataBaseFileName="..\..\lib\vc_lib\wxregexud.pdb"
+				ObjectFile="vc_mswudll\wxregex\"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxregexu.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -465,16 +471,16 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivud"
+				AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswu"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxregexud.lib"
+				OutputFile="..\..\lib\vc_dll\wxregexu.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -488,7 +494,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_vc8_wxregex.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_wxregex.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -499,9 +505,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswu\wxregex"
+			Name="DLL Universal Debug|Win32"
+			OutputDirectory="..\..\lib\vc_dll"
+			IntermediateDirectory="vc_mswunivuddll\wxregex"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -521,18 +527,22 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+				AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivud"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswu"
-				PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivud"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+				MinimalRebuild="true"
 				ExceptionHandling="1"
-				RuntimeLibrary="2"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswu\wxregex\"
-				ObjectFile="vc_mswu\wxregex\"
-				ProgramDataBaseFileName="..\..\lib\vc_lib\wxregexu.pdb"
+				ObjectFile="vc_mswunivuddll\wxregex\"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxregexud.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -543,16 +553,16 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="__WXMSW__;_UNICODE"
+				PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswu"
+				AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivud"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxregexu.lib"
+				OutputFile="..\..\lib\vc_dll\wxregexud.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -566,7 +576,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_vc8_wxregex.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_wxregex.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -577,9 +587,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswud\wxregex"
+			Name="DLL Universal Release|Win32"
+			OutputDirectory="..\..\lib\vc_dll"
+			IntermediateDirectory="vc_mswunivudll\wxregex"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -599,21 +609,19 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+				AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivu"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswud"
-				PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;_UNICODE"
-				MinimalRebuild="true"
+				Optimization="2"
+				AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivu"
+				PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
 				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
+				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswud\wxregex\"
-				ObjectFile="vc_mswud\wxregex\"
-				ProgramDataBaseFileName="..\..\lib\vc_lib\wxregexud.pdb"
+				ObjectFile="vc_mswunivudll\wxregex\"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxregexu.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -624,16 +632,16 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE"
+				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswud"
+				AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivu"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxregexud.lib"
+				OutputFile="..\..\lib\vc_dll\wxregexu.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -647,7 +655,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_vc8_wxregex.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_wxregex.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -693,211 +701,203 @@
 				RelativePath="..\..\include\wx\msw\genrcdefs.h"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
-						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h&quot;"
-						Outputs="..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
-						AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivu\wx\msw&quot;"
+						Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
+						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h&quot;"
+						Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
+						AdditionalDependencies="&quot;..\..\lib\vc_lib\mswud\wx\msw&quot;"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
-						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h&quot;"
-						Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
-						AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivud\wx\msw&quot;"
+						Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
+						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h&quot;"
+						Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
+						AdditionalDependencies="&quot;..\..\lib\vc_lib\mswu\wx\msw&quot;"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Universal Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
-						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h&quot;"
-						Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
-						AdditionalDependencies="&quot;..\..\lib\vc_dll\mswu\wx\msw&quot;"
+						Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
+						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h&quot;"
+						Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
+						AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivud\wx\msw&quot;"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Universal Release|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
-						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h&quot;"
-						Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
-						AdditionalDependencies="&quot;..\..\lib\vc_dll\mswud\wx\msw&quot;"
+						Description="Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
+						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h&quot;"
+						Outputs="..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
+						AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivu\wx\msw&quot;"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
-						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h&quot;"
-						Outputs="..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
-						AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivu\wx\msw&quot;"
+						Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
+						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h&quot;"
+						Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
+						AdditionalDependencies="&quot;..\..\lib\vc_dll\mswud\wx\msw&quot;"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Release|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
-						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h&quot;"
-						Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
-						AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivud\wx\msw&quot;"
+						Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
+						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h&quot;"
+						Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
+						AdditionalDependencies="&quot;..\..\lib\vc_dll\mswu\wx\msw&quot;"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Universal Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
-						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h&quot;"
-						Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
-						AdditionalDependencies="&quot;..\..\lib\vc_lib\mswu\wx\msw&quot;"
+						Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
+						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h&quot;"
+						Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
+						AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivud\wx\msw&quot;"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
-						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h&quot;"
-						Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
-						AdditionalDependencies="&quot;..\..\lib\vc_lib\mswud\wx\msw&quot;"
+						Description="Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
+						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h&quot;"
+						Outputs="..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
+						AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivu\wx\msw&quot;"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\include\wx\univ\setup.h"
+				RelativePath="..\..\include\wx\msw\setup.h"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivu\wx\setup.h"
-						Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h"
-						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"
+						Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h"
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswud\wx\setup.h"
+						Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivud\wx\setup.h"
-						Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h"
-						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"
+						Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswu\wx\setup.h"
+						Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Universal Debug|Win32"
 				/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Universal Release|Win32"
 				/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivu\wx\setup.h"
-						Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h"
-						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"
+						Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h"
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswud\wx\setup.h"
+						Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Release|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivud\wx\setup.h"
-						Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h"
-						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"
+						Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h"
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswu\wx\setup.h"
+						Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Universal Debug|Win32"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Universal Release|Win32"
 				/>
 			</File>
 			<File
-				RelativePath="..\..\include\wx\msw\setup.h"
+				RelativePath="..\..\include\wx\univ\setup.h"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Debug|Win32"
 				/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Release|Win32"
 				/>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Universal Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswu\wx\setup.h"
-						Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"
-						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"
+						Description="Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h"
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivud\wx\setup.h"
+						Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Universal Release|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswud\wx\setup.h"
-						Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"
-						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"
+						Description="Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h"
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivu\wx\setup.h"
+						Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Debug|Win32"
 				/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Release|Win32"
 				/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Universal Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswu\wx\setup.h"
-						Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"
-						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"
+						Description="Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h"
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivud\wx\setup.h"
+						Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswud\wx\setup.h"
-						Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"
-						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"
+						Description="Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h"
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivu\wx\setup.h"
+						Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h"
 					/>
 				</FileConfiguration>
 			</File>