Add wxUSE_RIBBON to wx/setup_inc.h and wx/chkconf.h.

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

diff --git a/build/msw/wx_vc9_wxexpat.vcproj b/build/msw/wx_vc9_wxexpat.vcproj
index 565b19c602556de68fe572abb0217fef83d46c56..b7a8f33b0777739b7e191dbde219e4f9703f00e9 100644 (file)
--- a/build/msw/wx_vc9_wxexpat.vcproj
+++ b/build/msw/wx_vc9_wxexpat.vcproj
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="Windows-1252"?>\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.6 (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,19 +43,22 @@
                        />\r
                        <Tool\r
                                Name="VCIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\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;COMPILED_FROM_DSP"
                                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
                                DebugInformationFormat="3"\r
@@ -65,16 +68,16 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;COMPILED_FROM_DSP"
                                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 +91,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_dll\wx_vc9_wxexpat.bsc"\r
+                               OutputFile="..\..\lib\vc_lib\wx_vc9_wxexpat.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -99,9 +102,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 +123,20 @@
                        />\r
                        <Tool\r
                                Name="VCIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG;COMPILED_FROM_DSP"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
                                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
                                DebugInformationFormat="3"\r
@@ -144,16 +146,16 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP"
                                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
@@ -167,7 +169,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_dll\wx_vc9_wxexpat.bsc"\r
+                               OutputFile="..\..\lib\vc_lib\wx_vc9_wxexpat.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -178,9 +180,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
@@ -199,19 +201,22 @@
                        />\r
                        <Tool\r
                                Name="VCIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\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;COMPILED_FROM_DSP"
                                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
                                DebugInformationFormat="3"\r
@@ -221,16 +226,16 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;COMPILED_FROM_DSP"
                                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
@@ -244,7 +249,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_dll\wx_vc9_wxexpat.bsc"\r
+                               OutputFile="..\..\lib\vc_lib\wx_vc9_wxexpat.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -255,9 +260,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
@@ -276,21 +281,20 @@
                        />\r
                        <Tool\r
                                Name="VCIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG;COMPILED_FROM_DSP"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
                                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
                                DebugInformationFormat="3"\r
@@ -300,16 +304,16 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP"
                                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
@@ -323,7 +327,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_dll\wx_vc9_wxexpat.bsc"\r
+                               OutputFile="..\..\lib\vc_lib\wx_vc9_wxexpat.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -334,9 +338,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
@@ -355,19 +359,22 @@
                        />\r
                        <Tool\r
                                Name="VCIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\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;COMPILED_FROM_DSP"
                                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
                                DebugInformationFormat="3"\r
@@ -377,16 +384,16 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;COMPILED_FROM_DSP"
                                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
@@ -400,7 +407,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc9_wxexpat.bsc"\r
+                               OutputFile="..\..\lib\vc_dll\wx_vc9_wxexpat.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -411,9 +418,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
@@ -432,21 +439,20 @@
                        />\r
                        <Tool\r
                                Name="VCIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG;COMPILED_FROM_DSP"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
                                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
                                DebugInformationFormat="3"\r
@@ -456,16 +462,16 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP"
                                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
@@ -479,7 +485,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc9_wxexpat.bsc"\r
+                               OutputFile="..\..\lib\vc_dll\wx_vc9_wxexpat.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -490,9 +496,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
@@ -511,19 +517,22 @@
                        />\r
                        <Tool\r
                                Name="VCIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\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;COMPILED_FROM_DSP"
                                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
                                DebugInformationFormat="3"\r
@@ -533,16 +542,16 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;COMPILED_FROM_DSP"
                                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
@@ -556,7 +565,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc9_wxexpat.bsc"\r
+                               OutputFile="..\..\lib\vc_dll\wx_vc9_wxexpat.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -567,9 +576,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
@@ -588,21 +597,20 @@
                        />\r
                        <Tool\r
                                Name="VCIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG;COMPILED_FROM_DSP"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
                                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
                                DebugInformationFormat="3"\r
@@ -612,16 +620,16 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP"
                                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
@@ -635,7 +643,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc9_wxexpat.bsc"\r
+                               OutputFile="..\..\lib\vc_dll\wx_vc9_wxexpat.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r