Add wxRibbonButtonBar::InsertXXXButton() methods.

[wxWidgets.git] / build / msw / wx_vc7_wxregex.vcproj

diff --git a/build/msw/wx_vc7_wxregex.vcproj b/build/msw/wx_vc7_wxregex.vcproj
index a3e95f456f48adfba86a38cb13f0bfa19f0bb6e8..ce65c0b26e5edeaab1352e49d922aa22750418c3 100644 (file)
--- a/build/msw/wx_vc7_wxregex.vcproj
+++ b/build/msw/wx_vc7_wxregex.vcproj
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="Windows-1252"?>\r
 <!--\r
 \r
-  This makefile was generated by\r
-  Bakefile 0.2.5 (http://www.bakefile.org)\r
+  This project was generated by\r
+  Bakefile 0.2.9 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -17,24 +17,26 @@
        </Platforms>\r
        <Configurations>\r
                <Configuration\r
-                       Name="DLL Universal Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswunivudll\wxregex"\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswud\wxregex"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                        CharacterSet="1">\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivu"\r
-                               PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswud"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE"\r
+                               MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
                                RuntimeTypeInfo="TRUE"\r
-                               AssemblerListingLocation="vc_mswunivudll\wxregex\"\r
-                               ObjectFile="vc_mswunivudll\wxregex\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxregexu.pdb"\r
+                               ObjectFile="vc_mswud\wxregex\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxregexud.pdb"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
@@ -43,10 +45,12 @@
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_dll\wxregexu.lib"\r
+                               OutputFile="..\..\lib\vc_lib\wxregexud.lib"\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE"\r
+                               AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswud"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r
@@ -55,9 +59,9 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivu"/>\r
+                               AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswud"/>\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
@@ -70,27 +74,23 @@
                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                </Configuration>\r
                <Configuration\r
-                       Name="DLL Universal Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswunivuddll\wxregex"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswu\wxregex"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                        CharacterSet="1">\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivud"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
-                               MinimalRebuild="TRUE"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswu"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE"\r
                                ExceptionHandling="TRUE"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="TRUE"\r
+                               RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
-                               AssemblerListingLocation="vc_mswunivuddll\wxregex\"\r
-                               ObjectFile="vc_mswunivuddll\wxregex\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxregexud.pdb"\r
+                               ObjectFile="vc_mswu\wxregex\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxregexu.pdb"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
@@ -99,10 +99,12 @@
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_dll\wxregexud.lib"\r
+                               OutputFile="..\..\lib\vc_lib\wxregexu.lib"\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE"\r
+                               AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswu"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r
@@ -111,9 +113,9 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivud"/>\r
+                               AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswu"/>\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
@@ -126,24 +128,26 @@
                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                </Configuration>\r
                <Configuration\r
-                       Name="DLL Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswudll\wxregex"\r
+                       Name="Universal Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswunivud\wxregex"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                        CharacterSet="1">\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswu"\r
-                               PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivud"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
                                RuntimeTypeInfo="TRUE"\r
-                               AssemblerListingLocation="vc_mswudll\wxregex\"\r
-                               ObjectFile="vc_mswudll\wxregex\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxregexu.pdb"\r
+                               ObjectFile="vc_mswunivud\wxregex\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxregexud.pdb"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
@@ -152,10 +156,12 @@
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_dll\wxregexu.lib"\r
+                               OutputFile="..\..\lib\vc_lib\wxregexud.lib"\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivud"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r
@@ -164,9 +170,9 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswu"/>\r
+                               AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivud"/>\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
@@ -179,27 +185,23 @@
                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                </Configuration>\r
                <Configuration\r
-                       Name="DLL Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswuddll\wxregex"\r
+                       Name="Universal Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswunivu\wxregex"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                        CharacterSet="1">\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswud"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;_UNICODE"\r
-                               MinimalRebuild="TRUE"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivu"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                ExceptionHandling="TRUE"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="TRUE"\r
+                               RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
-                               AssemblerListingLocation="vc_mswuddll\wxregex\"\r
-                               ObjectFile="vc_mswuddll\wxregex\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxregexud.pdb"\r
+                               ObjectFile="vc_mswunivu\wxregex\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxregexu.pdb"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
@@ -208,10 +210,12 @@
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_dll\wxregexud.lib"\r
+                               OutputFile="..\..\lib\vc_lib\wxregexu.lib"\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivu"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r
@@ -220,9 +224,9 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswud"/>\r
+                               AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivu"/>\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
@@ -235,24 +239,26 @@
                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                </Configuration>\r
                <Configuration\r
-                       Name="Universal Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswunivu\wxregex"\r
+                       Name="DLL Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswuddll\wxregex"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                        CharacterSet="1">\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivu"\r
-                               PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswud"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE"\r
+                               MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
                                RuntimeTypeInfo="TRUE"\r
-                               AssemblerListingLocation="vc_mswunivu\wxregex\"\r
-                               ObjectFile="vc_mswunivu\wxregex\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxregexu.pdb"\r
+                               ObjectFile="vc_mswuddll\wxregex\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxregexud.pdb"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
@@ -261,10 +267,12 @@
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxregexu.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxregexud.lib"\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE"\r
+                               AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswud"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r
@@ -273,9 +281,9 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivu"/>\r
+                               AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswud"/>\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
@@ -288,27 +296,23 @@
                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                </Configuration>\r
                <Configuration\r
-                       Name="Universal Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswunivud\wxregex"\r
+                       Name="DLL Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswudll\wxregex"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                        CharacterSet="1">\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivud"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
-                               MinimalRebuild="TRUE"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswu"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE"\r
                                ExceptionHandling="TRUE"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="TRUE"\r
+                               RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
-                               AssemblerListingLocation="vc_mswunivud\wxregex\"\r
-                               ObjectFile="vc_mswunivud\wxregex\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxregexud.pdb"\r
+                               ObjectFile="vc_mswudll\wxregex\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxregexu.pdb"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
@@ -317,10 +321,12 @@
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxregexud.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxregexu.lib"\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE"\r
+                               AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswu"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r
@@ -329,9 +335,9 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivud"/>\r
+                               AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswu"/>\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
@@ -344,24 +350,26 @@
                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswu\wxregex"\r
+                       Name="DLL Universal Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswunivuddll\wxregex"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                        CharacterSet="1">\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswu"\r
-                               PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivud"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
                                RuntimeTypeInfo="TRUE"\r
-                               AssemblerListingLocation="vc_mswu\wxregex\"\r
-                               ObjectFile="vc_mswu\wxregex\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxregexu.pdb"\r
+                               ObjectFile="vc_mswunivuddll\wxregex\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxregexud.pdb"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
@@ -370,10 +378,12 @@
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxregexu.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxregexud.lib"\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivud"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r
@@ -382,9 +392,9 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswu"/>\r
+                               AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivud"/>\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
@@ -397,27 +407,23 @@
                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswud\wxregex"\r
+                       Name="DLL Universal Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswunivudll\wxregex"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                        CharacterSet="1">\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswud"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;_UNICODE"\r
-                               MinimalRebuild="TRUE"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivu"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                ExceptionHandling="TRUE"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="TRUE"\r
+                               RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
-                               AssemblerListingLocation="vc_mswud\wxregex\"\r
-                               ObjectFile="vc_mswud\wxregex\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxregexud.pdb"\r
+                               ObjectFile="vc_mswunivudll\wxregex\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxregexu.pdb"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
@@ -426,10 +432,12 @@
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxregexud.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxregexu.lib"\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivu"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r
@@ -438,9 +446,9 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswud"/>\r
+                               AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivu"/>\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
@@ -481,40 +489,31 @@
                        <File\r
                                RelativePath="..\..\include\wx\msw\genrcdefs.h">\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivu\wx\msw&quot;"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32">\r
+                                       Name="Debug|Win32">\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivud\wx\msw&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswud\wx\msw&quot;"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32">\r
+                                       Name="Release|Win32">\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswu\wx\msw&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswu\wx\msw&quot;"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32">\r
+                                       Name="Universal Debug|Win32">\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswud\wx\msw&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivud\wx\msw&quot;"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="Universal Release|Win32">\r
@@ -526,125 +525,126 @@
                                                AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivu\wx\msw&quot;"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32">\r
+                                       Name="DLL Debug|Win32">\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivud\wx\msw&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswud\wx\msw&quot;"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32">\r
+                                       Name="DLL Release|Win32">\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswu\wx\msw&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswu\wx\msw&quot;"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32">\r
+                                       Name="DLL Universal Debug|Win32">\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswud\wx\msw&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivud\wx\msw&quot;"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivu\wx\msw&quot;"/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\wx\univ\setup.h">\r
+                               RelativePath="..\..\include\wx\msw\setup.h">\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32">\r
+                                       Name="Debug|Win32">\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswud\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32">\r
+                                       Name="Release|Win32">\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswu\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"/>\r
+                                       Name="Universal Debug|Win32"/>\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"/>\r
+                                       Name="Universal Release|Win32"/>\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32">\r
+                                       Name="DLL Debug|Win32">\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswud\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32">\r
+                                       Name="DLL Release|Win32">\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswu\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"/>\r
+                                       Name="DLL Universal Debug|Win32"/>\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"/>\r
+                                       Name="DLL Universal Release|Win32"/>\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\wx\msw\setup.h">\r
+                               RelativePath="..\..\include\wx\univ\setup.h">\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"/>\r
+                                       Name="Debug|Win32"/>\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"/>\r
+                                       Name="Release|Win32"/>\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32">\r
+                                       Name="Universal Debug|Win32">\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswu\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32">\r
+                                       Name="Universal Release|Win32">\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswud\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"/>\r
+                                       Name="DLL Debug|Win32"/>\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"/>\r
+                                       Name="DLL Release|Win32"/>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32">\r
+                                       Name="DLL Universal Debug|Win32">\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswu\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32">\r
+                                       Name="DLL Universal Release|Win32">\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswud\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h"/>\r
                                </FileConfiguration>\r
                        </File>\r
                </Filter>\r