]> git.saurik.com Git - wxWidgets.git/blobdiff - build/msw/wx_vc8_net.vcproj
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
add missing headers for PCH-less build
[wxWidgets.git] / build / msw / wx_vc8_net.vcproj
diff --git a/build/msw/wx_vc8_net.vcproj b/build/msw/wx_vc8_net.vcproj
index eef9d782dd75279cfb6a425ae660c7eb2c7a460c..9f9af1b089c590473681d1d43b1a03da2a261ac3 100644 (file)
--- a/build/msw/wx_vc8_net.vcproj
+++ b/build/msw/wx_vc8_net.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>\r
+<?xml version="1.0" encoding="Windows-1252"?>\r
 <!--\r
 \r
   This makefile was generated by\r
-  Bakefile 0.2.3 (http://www.bakefile.org)\r
+  Bakefile 0.2.5 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,21 +43,15 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\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
+                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"\r
                                ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
                                RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
@@ -67,23 +61,25 @@
                                ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase290u_net_vc_custom.pdb"\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
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"\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=wxbase290u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="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 ..\..\lib\vc_dll\wxbase29u.lib"\r
                                AdditionalOptions=""\r
+                               AdditionalDependencies="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 ..\..\lib\vc_dll\wxbase29u.lib"\r
                                OutputFile="..\..\lib\vc_dll\wxbase290u_net_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxbase29u_net.lib"\r
@@ -97,6 +93,9 @@
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
@@ -134,21 +133,18 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\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
+                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"\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
@@ -158,23 +154,25 @@
                                ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase290ud_net_vc_custom.pdb"\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
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"\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=wxbase290ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="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 ..\..\lib\vc_dll\wxbase29ud.lib"\r
                                AdditionalOptions=""\r
+                               AdditionalDependencies="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 ..\..\lib\vc_dll\wxbase29ud.lib"\r
                                OutputFile="..\..\lib\vc_dll\wxbase290ud_net_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxbase29ud_net.lib"\r
@@ -188,6 +186,9 @@
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
@@ -225,21 +226,15 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\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
+                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"\r
                                ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
                                RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
@@ -249,23 +244,25 @@
                                ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase290u_net_vc_custom.pdb"\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
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"\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=wxbase290u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="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 ..\..\lib\vc_dll\wxbase29u.lib"\r
                                AdditionalOptions=""\r
+                               AdditionalDependencies="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 ..\..\lib\vc_dll\wxbase29u.lib"\r
                                OutputFile="..\..\lib\vc_dll\wxbase290u_net_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxbase29u_net.lib"\r
@@ -279,6 +276,9 @@
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
@@ -316,21 +316,18 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\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
+                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"\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
@@ -340,23 +337,25 @@
                                ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase290ud_net_vc_custom.pdb"\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
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"\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=wxbase290ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="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 ..\..\lib\vc_dll\wxbase29ud.lib"\r
                                AdditionalOptions=""\r
+                               AdditionalDependencies="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 ..\..\lib\vc_dll\wxbase29ud.lib"\r
                                OutputFile="..\..\lib\vc_dll\wxbase290ud_net_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxbase29ud_net.lib"\r
@@ -370,6 +369,9 @@
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
@@ -407,21 +409,15 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\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
+                               PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0"\r
                                ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
                                RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
@@ -431,15 +427,17 @@
                                ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29u_net.pdb"\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
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0"\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;wxUSE_GUI=0"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -452,6 +450,9 @@
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
@@ -489,21 +490,18 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\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
+                               PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0"\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
@@ -513,15 +511,17 @@
                                ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29ud_net.pdb"\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
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0"\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;wxUSE_GUI=0"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -534,6 +534,9 @@
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
@@ -571,21 +574,15 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\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
+                               PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0"\r
                                ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
                                RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
@@ -595,15 +592,17 @@
                                ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29u_net.pdb"\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
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0"\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;wxUSE_GUI=0"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -616,6 +615,9 @@
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
@@ -653,21 +655,18 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\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
+                               PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0"\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
@@ -677,15 +676,17 @@
                                ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29ud_net.pdb"\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
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0"\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;wxUSE_GUI=0"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -698,6 +699,9 @@
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
@@ -792,48 +796,57 @@
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\common\fs_inet.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\common\ftp.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\common\http.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\common\protocol.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\common\sckaddr.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\common\sckfile.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\common\sckipc.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\common\sckstrm.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\common\socket.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\common\url.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                </Filter>\r
                <Filter\r
                        Name="MSW Sources"\r
                        UniqueIdentifier="{D030D8C2-53EE-5B96-8F89-D78157B06140}"\r
                        >\r
                        <File\r
-                               RelativePath="..\..\src\msw\gsocket.cpp"\r
-                       />\r
-                       <File\r
-                               RelativePath="..\..\src\msw\gsockmsw.cpp"\r
-                       />\r
+                               RelativePath="..\..\src\msw\sockmsw.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\urlmsw.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\version.rc"\r
                                >\r
@@ -870,7 +883,7 @@
                                                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
+                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -881,7 +894,7 @@
                                                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
+                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -898,7 +911,7 @@
                                                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
+                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -909,7 +922,7 @@
                                                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
+                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -936,7 +949,7 @@
                                                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
+                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -947,7 +960,7 @@
                                                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
+                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -964,7 +977,7 @@
                                                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
+                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -975,7 +988,7 @@
                                                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
+                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
                                        />\r
                                </FileConfiguration>\r
                        </File>\r
@@ -995,7 +1008,7 @@
                                                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
+                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivu\wx\msw&quot;"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -1006,7 +1019,7 @@
                                                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
+                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivud\wx\msw&quot;"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -1017,7 +1030,7 @@
                                                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
+                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswu\wx\msw&quot;"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -1028,7 +1041,7 @@
                                                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
+                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswud\wx\msw&quot;"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -1039,7 +1052,7 @@
                                                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
+                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivu\wx\msw&quot;"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -1050,7 +1063,7 @@
                                                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
+                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivud\wx\msw&quot;"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -1061,7 +1074,7 @@
                                                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
+                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswu\wx\msw&quot;"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -1072,13 +1085,14 @@
                                                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
+                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswud\wx\msw&quot;"\r
                                        />\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\wx\msw\gsockmsw.h"\r
-                       />\r
+                               RelativePath="..\..\include\wx\msw\private\sockmsw.h"\r
+                               >\r
+                       </File>\r
                </Filter>\r
                <Filter\r
                        Name="Common Headers"\r
@@ -1086,37 +1100,44 @@
                        >\r
                        <File\r
                                RelativePath="..\..\include\wx\protocol\file.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\fs_inet.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\protocol\ftp.h"\r
-                       />\r
-                       <File\r
-                               RelativePath="..\..\include\wx\gsocket.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\protocol\http.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\protocol\protocol.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\sckaddr.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\sckipc.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\sckstrm.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\socket.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\url.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                </Filter>\r
        </Files>\r
        <Globals>\r
wxWidgets (Impactor)