Add new definitions required by MinGW for webview. Re-enable custom schemes as a...

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

diff --git a/build/msw/wx_vc8_wxexpat.vcproj b/build/msw/wx_vc8_wxexpat.vcproj
index fcf65740c05ad295e9a06dbc5cc676b50437535d..79ba92ebe94caedf6a39ac8a49fb839bba4be0bf 100644 (file)
--- a/build/msw/wx_vc8_wxexpat.vcproj
+++ b/build/msw/wx_vc8_wxexpat.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
@@ -22,9 +22,9 @@
        </ToolFiles>\r
        <Configurations>\r
                <Configuration\r
-                       Name="DLL Universal Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswunivudll\wxexpat"\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswud\wxexpat"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -43,18 +43,22 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
-                               PreprocessorDefinitions="_LIB;COMPILED_FROM_DSP"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"\r
+                               MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc_mswunivudll\wxexpat\"\r
-                               ObjectFile="vc_mswunivudll\wxexpat\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxexpat.pdb"\r
+                               ObjectFile="vc_mswud\wxexpat\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxexpatd.pdb"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
@@ -65,16 +69,16 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_dll\wxexpat.lib"\r
+                               OutputFile="..\..\lib\vc_lib\wxexpatd.lib"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -88,7 +92,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_dll\wx_vc8_wxexpat.bsc"\r
+                               OutputFile="..\..\lib\vc_lib\wx_vc8_wxexpat.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -99,9 +103,9 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="DLL Universal Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswunivuddll\wxexpat"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswu\wxexpat"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -120,21 +124,19 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG;COMPILED_FROM_DSP"\r
-                               MinimalRebuild="true"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"\r
                                ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
+                               RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc_mswunivuddll\wxexpat\"\r
-                               ObjectFile="vc_mswunivuddll\wxexpat\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxexpatd.pdb"\r
+                               ObjectFile="vc_mswu\wxexpat\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxexpat.pdb"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
@@ -145,16 +147,16 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_dll\wxexpatd.lib"\r
+                               OutputFile="..\..\lib\vc_lib\wxexpat.lib"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -168,7 +170,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_dll\wx_vc8_wxexpat.bsc"\r
+                               OutputFile="..\..\lib\vc_lib\wx_vc8_wxexpat.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -179,9 +181,9 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="DLL Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswudll\wxexpat"\r
+                       Name="Universal Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswunivud\wxexpat"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -200,18 +202,22 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
-                               PreprocessorDefinitions="_LIB;COMPILED_FROM_DSP"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"\r
+                               MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc_mswudll\wxexpat\"\r
-                               ObjectFile="vc_mswudll\wxexpat\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxexpat.pdb"\r
+                               ObjectFile="vc_mswunivud\wxexpat\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxexpatd.pdb"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
@@ -222,16 +228,16 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_dll\wxexpat.lib"\r
+                               OutputFile="..\..\lib\vc_lib\wxexpatd.lib"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -245,7 +251,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_dll\wx_vc8_wxexpat.bsc"\r
+                               OutputFile="..\..\lib\vc_lib\wx_vc8_wxexpat.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -256,9 +262,9 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="DLL Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswuddll\wxexpat"\r
+                       Name="Universal Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswunivu\wxexpat"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -277,21 +283,19 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG;COMPILED_FROM_DSP"\r
-                               MinimalRebuild="true"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"\r
                                ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
+                               RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc_mswuddll\wxexpat\"\r
-                               ObjectFile="vc_mswuddll\wxexpat\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxexpatd.pdb"\r
+                               ObjectFile="vc_mswunivu\wxexpat\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxexpat.pdb"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
@@ -302,16 +306,16 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_dll\wxexpatd.lib"\r
+                               OutputFile="..\..\lib\vc_lib\wxexpat.lib"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -325,7 +329,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_dll\wx_vc8_wxexpat.bsc"\r
+                               OutputFile="..\..\lib\vc_lib\wx_vc8_wxexpat.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -336,9 +340,9 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Universal Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswunivu\wxexpat"\r
+                       Name="DLL Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswuddll\wxexpat"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -357,18 +361,22 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
-                               PreprocessorDefinitions="_LIB;COMPILED_FROM_DSP"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"\r
+                               MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc_mswunivu\wxexpat\"\r
-                               ObjectFile="vc_mswunivu\wxexpat\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxexpat.pdb"\r
+                               ObjectFile="vc_mswuddll\wxexpat\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxexpatd.pdb"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
@@ -379,16 +387,16 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxexpat.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxexpatd.lib"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -402,7 +410,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc8_wxexpat.bsc"\r
+                               OutputFile="..\..\lib\vc_dll\wx_vc8_wxexpat.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -413,9 +421,9 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Universal Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswunivud\wxexpat"\r
+                       Name="DLL Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswudll\wxexpat"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -434,21 +442,19 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG;COMPILED_FROM_DSP"\r
-                               MinimalRebuild="true"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"\r
                                ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
+                               RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc_mswunivud\wxexpat\"\r
-                               ObjectFile="vc_mswunivud\wxexpat\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxexpatd.pdb"\r
+                               ObjectFile="vc_mswudll\wxexpat\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxexpat.pdb"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
@@ -459,16 +465,16 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxexpatd.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxexpat.lib"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -482,7 +488,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc8_wxexpat.bsc"\r
+                               OutputFile="..\..\lib\vc_dll\wx_vc8_wxexpat.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -493,9 +499,9 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswu\wxexpat"\r
+                       Name="DLL Universal Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswunivuddll\wxexpat"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -514,18 +520,22 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
-                               PreprocessorDefinitions="_LIB;COMPILED_FROM_DSP"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"\r
+                               MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc_mswu\wxexpat\"\r
-                               ObjectFile="vc_mswu\wxexpat\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxexpat.pdb"\r
+                               ObjectFile="vc_mswunivuddll\wxexpat\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxexpatd.pdb"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
@@ -536,16 +546,16 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxexpat.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxexpatd.lib"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -559,7 +569,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc8_wxexpat.bsc"\r
+                               OutputFile="..\..\lib\vc_dll\wx_vc8_wxexpat.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -570,9 +580,9 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswud\wxexpat"\r
+                       Name="DLL Universal Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswunivudll\wxexpat"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -591,21 +601,19 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG;COMPILED_FROM_DSP"\r
-                               MinimalRebuild="true"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"\r
                                ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
+                               RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc_mswud\wxexpat\"\r
-                               ObjectFile="vc_mswud\wxexpat\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxexpatd.pdb"\r
+                               ObjectFile="vc_mswunivudll\wxexpat\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxexpat.pdb"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
@@ -616,16 +624,16 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxexpatd.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxexpat.lib"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -639,7 +647,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc8_wxexpat.bsc"\r
+                               OutputFile="..\..\lib\vc_dll\wx_vc8_wxexpat.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r