adding defaults for Xcode builds

[wxWidgets.git] / build / msw / wx_vc8_gl.vcproj
diff --git a/build/msw/wx_vc8_gl.vcproj b/build/msw/wx_vc8_gl.vcproj

index be99037dd9101092fc72027237e39d5d8b9ae5ef..7b9741c8729fdfdb8d66f2a3436238500965f462 100644 (file)
--- a/build/msw/wx_vc8_gl.vcproj
+++ b/build/msw/wx_vc8_gl.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>\r
+<?xml version="1.0" encoding="Windows-1252"?>\r
  <!--\r
  \r
  <!--\r
  \r
-  This makefile was generated by\r
-  Bakefile 0.2.3 (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
    Do not modify, all changes will be overwritten!\r
  \r
  -->\r
@@ -22,10 +22,10 @@
         </ToolFiles>\r
         <Configurations>\r
                 <Configuration\r
         </ToolFiles>\r
         <Configurations>\r
                 <Configuration\r
-                       Name="DLL Universal Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswunivudll\gl"\r
-                       ConfigurationType="2"\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswud\gl"\r
+                       ConfigurationType="4"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
@@ -43,66 +43,60 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               MinimalRebuild="false"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING"\r
+                               MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivudll\wxprec_gldll.pch"\r
-                               AssemblerListingLocation="vc_mswunivudll\gl\"\r
-                               ObjectFile="vc_mswunivudll\gl\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290u_gl_vc_custom.pdb"\r
+                               PrecompiledHeaderFile="vc_mswud\wxprec_gllib.pch"\r
+                               ObjectFile="vc_mswud\gl\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_gl.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
-                               Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv29u_core.lib wxbase29u.lib  opengl32.lib glu32.lib"\r
-                               AdditionalOptions=""\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv290u_gl_vc_custom.dll"\r
-                               LinkIncremental="2"\r
-                               ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_gl.lib"\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxmsw29ud_gl.lib"\r
                                 SuppressStartupBanner="true"\r
                                 SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateManifest="true"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290u_gl_vc_custom.pdb"\r
-                               TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_dll\wx_vc8_gl.bsc"\r
+                               OutputFile="..\..\lib\vc_lib\wx_vc8_gl.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -113,10 +107,10 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="DLL Universal Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswunivuddll\gl"\r
-                       ConfigurationType="2"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswu\gl"\r
+                       ConfigurationType="4"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
@@ -134,66 +128,57 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               MinimalRebuild="true"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivuddll\wxprec_gldll.pch"\r
-                               AssemblerListingLocation="vc_mswunivuddll\gl\"\r
-                               ObjectFile="vc_mswunivuddll\gl\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290ud_gl_vc_custom.pdb"\r
+                               PrecompiledHeaderFile="vc_mswu\wxprec_gllib.pch"\r
+                               ObjectFile="vc_mswu\gl\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_gl.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
-                               Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv29ud_core.lib wxbase29ud.lib  opengl32.lib glu32.lib"\r
-                               AdditionalOptions=""\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_gl_vc_custom.dll"\r
-                               LinkIncremental="2"\r
-                               ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_gl.lib"\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxmsw29u_gl.lib"\r
                                 SuppressStartupBanner="true"\r
                                 SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateManifest="true"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290ud_gl_vc_custom.pdb"\r
-                               TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_dll\wx_vc8_gl.bsc"\r
+                               OutputFile="..\..\lib\vc_lib\wx_vc8_gl.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -204,10 +189,10 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="DLL Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswudll\gl"\r
-                       ConfigurationType="2"\r
+                       Name="Universal Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswunivud\gl"\r
+                       ConfigurationType="4"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
@@ -225,66 +210,60 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               MinimalRebuild="false"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
+                               MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswudll\wxprec_gldll.pch"\r
-                               AssemblerListingLocation="vc_mswudll\gl\"\r
-                               ObjectFile="vc_mswudll\gl\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290u_gl_vc_custom.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivud\wxprec_gllib.pch"\r
+                               ObjectFile="vc_mswunivud\gl\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_gl.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
-                               Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw29u_core.lib wxbase29u.lib  opengl32.lib glu32.lib"\r
-                               AdditionalOptions=""\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw290u_gl_vc_custom.dll"\r
-                               LinkIncremental="2"\r
-                               ImportLibrary="..\..\lib\vc_dll\wxmsw29u_gl.lib"\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_gl.lib"\r
                                 SuppressStartupBanner="true"\r
                                 SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateManifest="true"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290u_gl_vc_custom.pdb"\r
-                               TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_dll\wx_vc8_gl.bsc"\r
+                               OutputFile="..\..\lib\vc_lib\wx_vc8_gl.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -295,10 +274,10 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="DLL Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswuddll\gl"\r
-                       ConfigurationType="2"\r
+                       Name="Universal Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswunivu\gl"\r
+                       ConfigurationType="4"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
@@ -316,66 +295,57 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               MinimalRebuild="true"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswuddll\wxprec_gldll.pch"\r
-                               AssemblerListingLocation="vc_mswuddll\gl\"\r
-                               ObjectFile="vc_mswuddll\gl\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290ud_gl_vc_custom.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivu\wxprec_gllib.pch"\r
+                               ObjectFile="vc_mswunivu\gl\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_gl.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
-                               Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw29ud_core.lib wxbase29ud.lib  opengl32.lib glu32.lib"\r
-                               AdditionalOptions=""\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw290ud_gl_vc_custom.dll"\r
-                               LinkIncremental="2"\r
-                               ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_gl.lib"\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxmswuniv29u_gl.lib"\r
                                 SuppressStartupBanner="true"\r
                                 SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateManifest="true"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290ud_gl_vc_custom.pdb"\r
-                               TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_dll\wx_vc8_gl.bsc"\r
+                               OutputFile="..\..\lib\vc_lib\wx_vc8_gl.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -386,10 +356,10 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Universal Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswunivu\gl"\r
-                       ConfigurationType="4"\r
+                       Name="DLL Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswuddll\gl"\r
+                       ConfigurationType="2"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
@@ -407,57 +377,69 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               MinimalRebuild="false"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL"\r
+                               MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivu\wxprec_gllib.pch"\r
-                               AssemblerListingLocation="vc_mswunivu\gl\"\r
-                               ObjectFile="vc_mswunivu\gl\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_gl.pdb"\r
+                               PrecompiledHeaderFile="vc_mswuddll\wxprec_gldll.pch"\r
+                               ObjectFile="vc_mswuddll\gl\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_gl_vc_custom.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmswuniv29u_gl.lib"\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmsw29ud_core.lib wxbase29ud.lib  opengl32.lib glu32.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw293ud_gl_vc_custom.dll"\r
+                               LinkIncremental="2"\r
+                               ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_gl.lib"\r
                                 SuppressStartupBanner="true"\r
                                 SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+                               GenerateManifest="true"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_gl_vc_custom.pdb"\r
+                               TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc8_gl.bsc"\r
+                               OutputFile="..\..\lib\vc_dll\wx_vc8_gl.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -468,10 +450,10 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Universal Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswunivud\gl"\r
-                       ConfigurationType="4"\r
+                       Name="DLL Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswudll\gl"\r
+                       ConfigurationType="2"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
@@ -489,57 +471,68 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               MinimalRebuild="true"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivud\wxprec_gllib.pch"\r
-                               AssemblerListingLocation="vc_mswunivud\gl\"\r
-                               ObjectFile="vc_mswunivud\gl\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_gl.pdb"\r
+                               PrecompiledHeaderFile="vc_mswudll\wxprec_gldll.pch"\r
+                               ObjectFile="vc_mswudll\gl\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293u_gl_vc_custom.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_gl.lib"\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmsw29u_core.lib wxbase29u.lib  opengl32.lib glu32.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw293u_gl_vc_custom.dll"\r
+                               LinkIncremental="1"\r
+                               ImportLibrary="..\..\lib\vc_dll\wxmsw29u_gl.lib"\r
                                 SuppressStartupBanner="true"\r
                                 SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+                               GenerateManifest="true"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_gl_vc_custom.pdb"\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc8_gl.bsc"\r
+                               OutputFile="..\..\lib\vc_dll\wx_vc8_gl.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -550,10 +543,10 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswu\gl"\r
-                       ConfigurationType="4"\r
+                       Name="DLL Universal Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswunivuddll\gl"\r
+                       ConfigurationType="2"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
@@ -571,57 +564,69 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               MinimalRebuild="false"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL"\r
+                               MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING"\r
                                 BasicRuntimeChecks="3"\r
                                 BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswu\wxprec_gllib.pch"\r
-                               AssemblerListingLocation="vc_mswu\gl\"\r
-                               ObjectFile="vc_mswu\gl\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_gl.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivuddll\wxprec_gldll.pch"\r
+                               ObjectFile="vc_mswunivuddll\gl\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_gl_vc_custom.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmsw29u_gl.lib"\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmswuniv29ud_core.lib wxbase29ud.lib  opengl32.lib glu32.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_gl_vc_custom.dll"\r
+                               LinkIncremental="2"\r
+                               ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_gl.lib"\r
                                 SuppressStartupBanner="true"\r
                                 SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+                               GenerateManifest="true"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_gl_vc_custom.pdb"\r
+                               TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc8_gl.bsc"\r
+                               OutputFile="..\..\lib\vc_dll\wx_vc8_gl.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -632,10 +637,10 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswud\gl"\r
-                       ConfigurationType="4"\r
+                       Name="DLL Universal Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswunivudll\gl"\r
+                       ConfigurationType="2"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
@@ -653,57 +658,68 @@
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"\r
                         />\r
                         <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               MinimalRebuild="true"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL"\r
                                 ExceptionHandling="1"\r
                                 ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswud\wxprec_gllib.pch"\r
-                               AssemblerListingLocation="vc_mswud\gl\"\r
-                               ObjectFile="vc_mswud\gl\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_gl.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivudll\wxprec_gldll.pch"\r
+                               ObjectFile="vc_mswunivudll\gl\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293u_gl_vc_custom.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCManagedResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"\r
                                 Culture="1033"\r
                                 Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmsw29ud_gl.lib"\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmswuniv29u_core.lib wxbase29u.lib  opengl32.lib glu32.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv293u_gl_vc_custom.dll"\r
+                               LinkIncremental="1"\r
+                               ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_gl.lib"\r
                                 SuppressStartupBanner="true"\r
                                 SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+                               GenerateManifest="true"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_gl_vc_custom.pdb"\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
                         <Tool\r
                                 Name="VCXDCMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc8_gl.bsc"\r
+                               OutputFile="..\..\lib\vc_dll\wx_vc8_gl.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -726,7 +742,7 @@
                                 RelativePath="..\..\src\common\dummy.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 RelativePath="..\..\src\common\dummy.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -734,7 +750,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -742,7 +758,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -750,7 +766,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -758,7 +774,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -766,7 +782,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -774,7 +790,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -782,7 +798,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -792,7 +808,8 @@
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\glcmn.cpp"\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\glcmn.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                 </Filter>\r
                 <Filter\r
                         Name="MSW Sources"\r
                 </Filter>\r
                 <Filter\r
                         Name="MSW Sources"\r
@@ -800,24 +817,25 @@
                         >\r
                         <File\r
                                 RelativePath="..\..\src\msw\glcanvas.cpp"\r
                         >\r
                         <File\r
                                 RelativePath="..\..\src\msw\glcanvas.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\version.rc"\r
                                 >\r
                                 <FileConfiguration\r
                         <File\r
                                 RelativePath="..\..\src\msw\version.rc"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
@@ -827,122 +845,114 @@
                         UniqueIdentifier="{63537534-1833-5C1F-8DBD-359A84F294C8}"\r
                         >\r
                         <File\r
                         UniqueIdentifier="{63537534-1833-5C1F-8DBD-359A84F294C8}"\r
                         >\r
                         <File\r
-                               RelativePath="..\..\include\wx\univ\setup.h"\r
+                               RelativePath="..\..\include\wx\msw\setup.h"\r
                                 >\r
                                 <FileConfiguration\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\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="$(SOURCE) &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
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\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="$(SOURCE) &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
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                 />\r
                                 <FileConfiguration\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                 />\r
                                 <FileConfiguration\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\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="$(SOURCE) &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
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\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="$(SOURCE) &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
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                 />\r
                                 <FileConfiguration\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                 />\r
                         </File>\r
                         <File\r
                                 />\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\msw\setup.h"\r
+                               RelativePath="..\..\include\wx\univ\setup.h"\r
                                 >\r
                                 <FileConfiguration\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                 />\r
                                 <FileConfiguration\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                 />\r
                                 <FileConfiguration\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\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="$(SOURCE) &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
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\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="$(SOURCE) &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
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                 />\r
                                 <FileConfiguration\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                 />\r
                                 <FileConfiguration\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\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="$(SOURCE) &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
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\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="$(SOURCE) &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
                                         />\r
                                 </FileConfiguration>\r
                         </File>\r
                                         />\r
                                 </FileConfiguration>\r
                         </File>\r
@@ -955,97 +965,98 @@
                                 RelativePath="..\..\include\wx\msw\genrcdefs.h"\r
                                 >\r
                                 <FileConfiguration\r
                                 RelativePath="..\..\include\wx\msw\genrcdefs.h"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\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;$(SOURCE)&quot; &quot;..\..\lib\vc_dll\mswunivu\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
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\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;$(SOURCE)&quot; &quot;..\..\lib\vc_dll\mswunivud\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
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\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;$(SOURCE)&quot; &quot;..\..\lib\vc_dll\mswu\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
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\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;$(SOURCE)&quot; &quot;..\..\lib\vc_dll\mswud\wx\msw&quot;"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivu\wx\msw&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;$(SOURCE)&quot; &quot;..\..\lib\vc_lib\mswunivu\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
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\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;$(SOURCE)&quot; &quot;..\..\lib\vc_lib\mswunivud\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
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\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;$(SOURCE)&quot; &quot;..\..\lib\vc_lib\mswu\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
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\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;$(SOURCE)&quot; &quot;..\..\lib\vc_lib\mswud\wx\msw&quot;"\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
                                         />\r
                                 </FileConfiguration>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\glcanvas.h"\r
                                         />\r
                                 </FileConfiguration>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\glcanvas.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                 </Filter>\r
                 <Filter\r
                         Name="Common Headers"\r
                 </Filter>\r
                 <Filter\r
                         Name="Common Headers"\r
@@ -1053,7 +1064,8 @@
                         >\r
                         <File\r
                                 RelativePath="..\..\include\wx\glcanvas.h"\r
                         >\r
                         <File\r
                                 RelativePath="..\..\include\wx\glcanvas.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                 </Filter>\r
         </Files>\r
         <Globals>\r
                 </Filter>\r
         </Files>\r
         <Globals>\r