X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8ece421c6c40b0977dc2a7f91f9eff7234b814dd..76e7cfab8fdb0c7862fd07e427af54181717fc62:/build/msw/wx_vc7_net.vcproj?ds=inline
diff --git a/build/msw/wx_vc7_net.vcproj b/build/msw/wx_vc7_net.vcproj
index 0efcc5126c..15cbd5efb1 100644
--- a/build/msw/wx_vc7_net.vcproj
+++ b/build/msw/wx_vc7_net.vcproj
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="Windows-1252"?>
<!--
- This makefile was generated by
- Bakefile 0.2.4 (http://www.bakefile.org)
+ This project was generated by
+ Bakefile 0.2.9 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -17,82 +17,18 @@
</Platforms>
<Configurations>
<Configuration
- Name="DLL Universal Release|Win32"
- OutputDirectory="..\..\lib\vc_dll"
- IntermediateDirectory="vc_mswunivudll\net"
- ConfigurationType="2"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="1">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
- ExceptionHandling="TRUE"
- RuntimeLibrary="2"
- RuntimeTypeInfo="TRUE"
- UsePrecompiledHeader="3"
- PrecompiledHeaderThrough="wx/wxprec.h"
- PrecompiledHeaderFile="vc_mswunivudll\wxprec_netdll.pch"
- AssemblerListingLocation="vc_mswunivudll\net\"
- ObjectFile="vc_mswunivudll\net\"
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase290u_net_vc_custom.pdb"
- WarningLevel="4"
- SuppressStartupBanner="TRUE"
- Detect64BitPortabilityProblems="TRUE"
- DebugInformationFormat="3"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- AdditionalOptions=""
- 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"
- OutputFile="..\..\lib\vc_dll\wxbase290u_net_vc_custom.dll"
- LinkIncremental="2"
- ImportLibrary="..\..\lib\vc_dll\wxbase29u_net.lib"
- SuppressStartupBanner="TRUE"
- AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="TRUE"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxbase290u_net_vc_custom.pdb"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- <Configuration
- Name="DLL Universal Debug|Win32"
- OutputDirectory="..\..\lib\vc_dll"
- IntermediateDirectory="vc_mswunivuddll\net"
- ConfigurationType="2"
+ Name="Debug|Win32"
+ OutputDirectory="..\..\lib\vc_lib"
+ IntermediateDirectory="vc_mswud\net"
+ ConfigurationType="4"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
MinimalRebuild="TRUE"
ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
@@ -101,10 +37,9 @@
RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
- PrecompiledHeaderFile="vc_mswunivuddll\wxprec_netdll.pch"
- AssemblerListingLocation="vc_mswunivuddll\net\"
- ObjectFile="vc_mswunivuddll\net\"
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase290ud_net_vc_custom.pdb"
+ PrecompiledHeaderFile="vc_mswud\wxprec_netlib.pch"
+ ObjectFile="vc_mswud\net\"
+ ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29ud_net.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -112,19 +47,13 @@
<Tool
Name="VCCustomBuildTool"/>
<Tool
- Name="VCLinkerTool"
- AdditionalOptions=""
- 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"
- OutputFile="..\..\lib\vc_dll\wxbase290ud_net_vc_custom.dll"
- LinkIncremental="2"
- ImportLibrary="..\..\lib\vc_dll\wxbase29ud_net.lib"
- SuppressStartupBanner="TRUE"
- AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="TRUE"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxbase290ud_net_vc_custom.pdb"
- TargetMachine="1"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxbase29ud_net.lib"
+ SuppressStartupBanner="TRUE"/>
<Tool
- Name="VCMIDLTool"/>
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -133,9 +62,9 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
@@ -148,27 +77,26 @@
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
- Name="DLL Release|Win32"
- OutputDirectory="..\..\lib\vc_dll"
- IntermediateDirectory="vc_mswudll\net"
- ConfigurationType="2"
+ Name="Release|Win32"
+ OutputDirectory="..\..\lib\vc_lib"
+ IntermediateDirectory="vc_mswu\net"
+ ConfigurationType="4"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0"
ExceptionHandling="TRUE"
RuntimeLibrary="2"
RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
- PrecompiledHeaderFile="vc_mswudll\wxprec_netdll.pch"
- AssemblerListingLocation="vc_mswudll\net\"
- ObjectFile="vc_mswudll\net\"
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase290u_net_vc_custom.pdb"
+ PrecompiledHeaderFile="vc_mswu\wxprec_netlib.pch"
+ ObjectFile="vc_mswu\net\"
+ ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29u_net.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -176,19 +104,13 @@
<Tool
Name="VCCustomBuildTool"/>
<Tool
- Name="VCLinkerTool"
- AdditionalOptions=""
- 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"
- OutputFile="..\..\lib\vc_dll\wxbase290u_net_vc_custom.dll"
- LinkIncremental="2"
- ImportLibrary="..\..\lib\vc_dll\wxbase29u_net.lib"
- SuppressStartupBanner="TRUE"
- AdditionalLibraryDirectories="..\..\lib\vc_dll"
- GenerateDebugInformation="TRUE"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxbase290u_net_vc_custom.pdb"
- TargetMachine="1"/>
+ Name="VCLibrarianTool"
+ OutputFile="..\..\lib\vc_lib\wxbase29u_net.lib"
+ SuppressStartupBanner="TRUE"/>
<Tool
- Name="VCMIDLTool"/>
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0"
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -197,9 +119,9 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
+ PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0"
Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
@@ -223,7 +145,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
+ PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
MinimalRebuild="TRUE"
ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
@@ -233,9 +155,8 @@
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_netdll.pch"
- AssemblerListingLocation="vc_mswuddll\net\"
ObjectFile="vc_mswuddll\net\"
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase290ud_net_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase295ud_net_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -245,132 +166,19 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
- 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"
- OutputFile="..\..\lib\vc_dll\wxbase290ud_net_vc_custom.dll"
+ 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"
+ OutputFile="..\..\lib\vc_dll\wxbase295ud_net_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxbase29ud_net.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxbase290ud_net_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxbase295ud_net_vc_custom.pdb"
TargetMachine="1"/>
<Tool
- Name="VCMIDLTool"/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
- Culture="1033"
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- <Configuration
- Name="Universal Release|Win32"
- OutputDirectory="..\..\lib\vc_lib"
- IntermediateDirectory="vc_mswunivu\net"
- ConfigurationType="4"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="1">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
- ExceptionHandling="TRUE"
- RuntimeLibrary="2"
- RuntimeTypeInfo="TRUE"
- UsePrecompiledHeader="3"
- PrecompiledHeaderThrough="wx/wxprec.h"
- PrecompiledHeaderFile="vc_mswunivu\wxprec_netlib.pch"
- AssemblerListingLocation="vc_mswunivu\net\"
- ObjectFile="vc_mswunivu\net\"
- ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29u_net.pdb"
- WarningLevel="4"
- SuppressStartupBanner="TRUE"
- Detect64BitPortabilityProblems="TRUE"
- DebugInformationFormat="3"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxbase29u_net.lib"
- SuppressStartupBanner="TRUE"/>
- <Tool
- Name="VCMIDLTool"/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- <Configuration
- Name="Universal Debug|Win32"
- OutputDirectory="..\..\lib\vc_lib"
- IntermediateDirectory="vc_mswunivud\net"
- ConfigurationType="4"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="1">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
- MinimalRebuild="TRUE"
- ExceptionHandling="TRUE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- BufferSecurityCheck="TRUE"
- RuntimeTypeInfo="TRUE"
- UsePrecompiledHeader="3"
- PrecompiledHeaderThrough="wx/wxprec.h"
- PrecompiledHeaderFile="vc_mswunivud\wxprec_netlib.pch"
- AssemblerListingLocation="vc_mswunivud\net\"
- ObjectFile="vc_mswunivud\net\"
- ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29ud_net.pdb"
- WarningLevel="4"
- SuppressStartupBanner="TRUE"
- Detect64BitPortabilityProblems="TRUE"
- DebugInformationFormat="3"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxbase29ud_net.lib"
- SuppressStartupBanner="TRUE"/>
- <Tool
- Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -379,9 +187,9 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase295ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
@@ -394,27 +202,26 @@
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
- Name="Release|Win32"
- OutputDirectory="..\..\lib\vc_lib"
- IntermediateDirectory="vc_mswu\net"
- ConfigurationType="4"
+ Name="DLL Release|Win32"
+ OutputDirectory="..\..\lib\vc_dll"
+ IntermediateDirectory="vc_mswudll\net"
+ ConfigurationType="2"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+ PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
ExceptionHandling="TRUE"
RuntimeLibrary="2"
RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="wx/wxprec.h"
- PrecompiledHeaderFile="vc_mswu\wxprec_netlib.pch"
- AssemblerListingLocation="vc_mswu\net\"
- ObjectFile="vc_mswu\net\"
- ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29u_net.pdb"
+ PrecompiledHeaderFile="vc_mswudll\wxprec_netdll.pch"
+ ObjectFile="vc_mswudll\net\"
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase295u_net_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -422,70 +229,23 @@
<Tool
Name="VCCustomBuildTool"/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxbase29u_net.lib"
- SuppressStartupBanner="TRUE"/>
- <Tool
- Name="VCMIDLTool"/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
- Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="..\..\lib\vc_lib"
- IntermediateDirectory="vc_mswud\net"
- ConfigurationType="4"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="1">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
- PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
- MinimalRebuild="TRUE"
- ExceptionHandling="TRUE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- BufferSecurityCheck="TRUE"
- RuntimeTypeInfo="TRUE"
- UsePrecompiledHeader="3"
- PrecompiledHeaderThrough="wx/wxprec.h"
- PrecompiledHeaderFile="vc_mswud\wxprec_netlib.pch"
- AssemblerListingLocation="vc_mswud\net\"
- ObjectFile="vc_mswud\net\"
- ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29ud_net.pdb"
- WarningLevel="4"
+ Name="VCLinkerTool"
+ AdditionalOptions=""
+ 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"
+ OutputFile="..\..\lib\vc_dll\wxbase295u_net_vc_custom.dll"
+ LinkIncremental="1"
+ ImportLibrary="..\..\lib\vc_dll\wxbase29u_net.lib"
SuppressStartupBanner="TRUE"
- Detect64BitPortabilityProblems="TRUE"
- DebugInformationFormat="3"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\vc_lib\wxbase29ud_net.lib"
- SuppressStartupBanner="TRUE"/>
+ AdditionalLibraryDirectories="..\..\lib\vc_dll"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxbase295u_net_vc_custom.pdb"
+ TargetMachine="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"/>
<Tool
- Name="VCMIDLTool"/>
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -494,9 +254,9 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0"
+ PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase295u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
Culture="1033"
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
@@ -519,19 +279,13 @@
<File
RelativePath="..\..\src\common\dummy.cpp">
<FileConfiguration
- Name="DLL Universal Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="DLL Universal Debug|Win32">
+ Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"/>
</FileConfiguration>
<FileConfiguration
- Name="DLL Release|Win32">
+ Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"/>
@@ -543,25 +297,7 @@
UsePrecompiledHeader="1"/>
</FileConfiguration>
<FileConfiguration
- Name="Universal Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Universal Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
+ Name="DLL Release|Win32">
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"/>
@@ -602,10 +338,7 @@
Name="MSW Sources"
UniqueIdentifier="{D030D8C2-53EE-5B96-8F89-D78157B06140}">
<File
- RelativePath="..\..\src\msw\gsocket.cpp">
- </File>
- <File
- RelativePath="..\..\src\msw\gsockmsw.cpp">
+ RelativePath="..\..\src\msw\sockmsw.cpp">
</File>
<File
RelativePath="..\..\src\msw\urlmsw.cpp">
@@ -613,115 +346,61 @@
<File
RelativePath="..\..\src\msw\version.rc">
<FileConfiguration
- Name="Universal Release|Win32"
- ExcludedFromBuild="TRUE"/>
- <FileConfiguration
- Name="Universal Debug|Win32"
+ Name="Debug|Win32"
ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Release|Win32"
ExcludedFromBuild="TRUE"/>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="TRUE"/>
</File>
</Filter>
<Filter
Name="Setup Headers"
UniqueIdentifier="{63537534-1833-5C1F-8DBD-359A84F294C8}">
<File
- RelativePath="..\..\include\wx\univ\setup.h">
- <FileConfiguration
- Name="DLL Universal Release|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h"
- CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h"
- Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h"
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""/>
- </FileConfiguration>
+ RelativePath="..\..\include\wx\msw\setup.h">
<FileConfiguration
- Name="DLL Universal Debug|Win32">
+ Name="Debug|Win32">
<Tool
Name="VCCustomBuildTool"
- Description="Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h"
- CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h"
- Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h"
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""/>
+ Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h"
+ CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h"
+ Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"/>
</FileConfiguration>
<FileConfiguration
- Name="DLL Release|Win32"/>
- <FileConfiguration
- Name="DLL Debug|Win32"/>
- <FileConfiguration
- Name="Universal Release|Win32">
+ Name="Release|Win32">
<Tool
Name="VCCustomBuildTool"
- Description="Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h"
- CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h"
- Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h"
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""/>
+ Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"
+ CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h"
+ Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"/>
</FileConfiguration>
<FileConfiguration
- Name="Universal Debug|Win32">
+ Name="DLL Debug|Win32">
<Tool
Name="VCCustomBuildTool"
- Description="Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h"
- CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h"
- Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h"
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""/>
+ Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h"
+ CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h"
+ Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"/>
</FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"/>
- <FileConfiguration
- Name="Debug|Win32"/>
- </File>
- <File
- RelativePath="..\..\include\wx\msw\setup.h">
- <FileConfiguration
- Name="DLL Universal Release|Win32"/>
- <FileConfiguration
- Name="DLL Universal Debug|Win32"/>
<FileConfiguration
Name="DLL Release|Win32">
<Tool
Name="VCCustomBuildTool"
Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h"
CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h"
- Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""/>
- </FileConfiguration>
- <FileConfiguration
- Name="DLL Debug|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h"
- CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h"
- Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""/>
+ Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"/>
</FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\..\include\wx\univ\setup.h">
<FileConfiguration
- Name="Universal Release|Win32"/>
+ Name="Debug|Win32"/>
<FileConfiguration
- Name="Universal Debug|Win32"/>
+ Name="Release|Win32"/>
<FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"
- CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h"
- Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""/>
- </FileConfiguration>
+ Name="DLL Debug|Win32"/>
<FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h"
- CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h"
- Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""/>
- </FileConfiguration>
+ Name="DLL Release|Win32"/>
</File>
</Filter>
<Filter
@@ -730,31 +409,22 @@
<File
RelativePath="..\..\include\wx\msw\genrcdefs.h">
<FileConfiguration
- Name="DLL Universal Release|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
- CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h""
- Outputs="..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
- AdditionalDependencies=""..\..\lib\vc_dll\mswunivu\wx\msw""/>
- </FileConfiguration>
- <FileConfiguration
- Name="DLL Universal Debug|Win32">
+ Name="Debug|Win32">
<Tool
Name="VCCustomBuildTool"
- Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
- CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h""
- Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
- AdditionalDependencies=""..\..\lib\vc_dll\mswunivud\wx\msw""/>
+ Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
+ CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h""
+ Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
+ AdditionalDependencies=""..\..\lib\vc_lib\mswud\wx\msw""/>
</FileConfiguration>
<FileConfiguration
- Name="DLL Release|Win32">
+ Name="Release|Win32">
<Tool
Name="VCCustomBuildTool"
- Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
- CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h""
- Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
- AdditionalDependencies=""..\..\lib\vc_dll\mswu\wx\msw""/>
+ Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
+ CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h""
+ Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
+ AdditionalDependencies=""..\..\lib\vc_lib\mswu\wx\msw""/>
</FileConfiguration>
<FileConfiguration
Name="DLL Debug|Win32">
@@ -766,45 +436,15 @@
AdditionalDependencies=""..\..\lib\vc_dll\mswud\wx\msw""/>
</FileConfiguration>
<FileConfiguration
- Name="Universal Release|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
- CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h""
- Outputs="..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
- AdditionalDependencies=""..\..\lib\vc_lib\mswunivu\wx\msw""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Universal Debug|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
- CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h""
- Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
- AdditionalDependencies=""..\..\lib\vc_lib\mswunivud\wx\msw""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
- CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h""
- Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
- AdditionalDependencies=""..\..\lib\vc_lib\mswu\wx\msw""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
+ Name="DLL Release|Win32">
<Tool
Name="VCCustomBuildTool"
- Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
- CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h""
- Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
- AdditionalDependencies=""..\..\lib\vc_lib\mswud\wx\msw""/>
+ Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
+ CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h""
+ Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
+ AdditionalDependencies=""..\..\lib\vc_dll\mswu\wx\msw""/>
</FileConfiguration>
</File>
- <File
- RelativePath="..\..\include\wx\msw\gsockmsw.h">
- </File>
</Filter>
<Filter
Name="Common Headers"
@@ -819,10 +459,10 @@
RelativePath="..\..\include\wx\protocol\ftp.h">
</File>
<File
- RelativePath="..\..\include\wx\gsocket.h">
+ RelativePath="..\..\include\wx\protocol\http.h">
</File>
<File
- RelativePath="..\..\include\wx\protocol\http.h">
+ RelativePath="..\..\include\wx\protocol\log.h">
</File>
<File
RelativePath="..\..\include\wx\protocol\protocol.h">