X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/289532452089421ddadbd4726a8469511a19ab76..76e7cfab8fdb0c7862fd07e427af54181717fc62:/build/msw/wx_vc7_base.vcproj diff --git a/build/msw/wx_vc7_base.vcproj b/build/msw/wx_vc7_base.vcproj index dc7b035939..da4a27793e 100644 --- a/build/msw/wx_vc7_base.vcproj +++ b/build/msw/wx_vc7_base.vcproj @@ -2,7 +2,7 @@ <!-- This project was generated by - Bakefile 0.2.8 (http://www.bakefile.org) + Bakefile 0.2.9 (http://www.bakefile.org) Do not modify, all changes will be overwritten! --> @@ -133,123 +133,6 @@ <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> - <Configuration - Name="Universal Debug|Win32" - OutputDirectory="..\..\lib\vc_lib" - IntermediateDirectory="vc_mswunivud\base" - 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="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1" - MinimalRebuild="TRUE" - ExceptionHandling="TRUE" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - BufferSecurityCheck="TRUE" - RuntimeTypeInfo="TRUE" - UsePrecompiledHeader="3" - PrecompiledHeaderThrough="wx/wxprec.h" - PrecompiledHeaderFile="vc_mswunivud\wxprec_baselib.pch" - ObjectFile="vc_mswunivud\base\" - ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29ud.pdb" - WarningLevel="4" - SuppressStartupBanner="TRUE" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\lib\vc_lib\wxbase29ud.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool" - PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1" - AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> - <Tool - Name="VCPostBuildEventTool"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1" - Culture="1033" - AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\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\base" - 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="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1" - ExceptionHandling="TRUE" - RuntimeLibrary="2" - RuntimeTypeInfo="TRUE" - UsePrecompiledHeader="3" - PrecompiledHeaderThrough="wx/wxprec.h" - PrecompiledHeaderFile="vc_mswunivu\wxprec_baselib.pch" - ObjectFile="vc_mswunivu\base\" - ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29u.pdb" - WarningLevel="4" - SuppressStartupBanner="TRUE" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\lib\vc_lib\wxbase29u.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool" - PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1" - AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> - <Tool - Name="VCPostBuildEventTool"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1" - 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="DLL Debug|Win32" OutputDirectory="..\..\lib\vc_dll" @@ -273,7 +156,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_basedll.pch" ObjectFile="vc_mswuddll\base\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase292ud_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase295ud_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="TRUE" Detect64BitPortabilityProblems="TRUE" @@ -284,13 +167,13 @@ 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 wininet.lib" - OutputFile="..\..\lib\vc_dll\wxbase292ud_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxbase295ud_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxbase29ud.lib" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateDebugInformation="TRUE" - ProgramDatabaseFile="..\..\lib\vc_dll\wxbase292ud_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase295ud_vc_custom.pdb" TargetMachine="1"/> <Tool Name="VCMIDLTool" @@ -304,7 +187,7 @@ Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase292ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1" + PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase295ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1" Culture="1033" AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> <Tool @@ -338,7 +221,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswudll\wxprec_basedll.pch" ObjectFile="vc_mswudll\base\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase292u_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase295u_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="TRUE" Detect64BitPortabilityProblems="TRUE" @@ -349,13 +232,13 @@ 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" - OutputFile="..\..\lib\vc_dll\wxbase292u_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxbase295u_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxbase29u.lib" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateDebugInformation="TRUE" - ProgramDatabaseFile="..\..\lib\vc_dll\wxbase292u_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase295u_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2"/> @@ -371,7 +254,7 @@ Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase292u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1" + PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase295u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1" Culture="1033" AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> <Tool @@ -385,141 +268,6 @@ <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> - <Configuration - Name="DLL Universal Debug|Win32" - OutputDirectory="..\..\lib\vc_dll" - IntermediateDirectory="vc_mswunivuddll\base" - ConfigurationType="2" - 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="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1" - MinimalRebuild="TRUE" - ExceptionHandling="TRUE" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - BufferSecurityCheck="TRUE" - RuntimeTypeInfo="TRUE" - UsePrecompiledHeader="3" - PrecompiledHeaderThrough="wx/wxprec.h" - PrecompiledHeaderFile="vc_mswunivuddll\wxprec_basedll.pch" - ObjectFile="vc_mswunivuddll\base\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase292ud_vc_custom.pdb" - WarningLevel="4" - SuppressStartupBanner="TRUE" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3"/> - <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 wininet.lib" - OutputFile="..\..\lib\vc_dll\wxbase292ud_vc_custom.dll" - LinkIncremental="2" - ImportLibrary="..\..\lib\vc_dll\wxbase29ud.lib" - SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="..\..\lib\vc_dll" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile="..\..\lib\vc_dll\wxbase292ud_vc_custom.pdb" - TargetMachine="1"/> - <Tool - Name="VCMIDLTool" - PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1" - AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> - <Tool - Name="VCPostBuildEventTool"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase292ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1" - Culture="1033" - AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\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 Release|Win32" - OutputDirectory="..\..\lib\vc_dll" - IntermediateDirectory="vc_mswunivudll\base" - 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="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1" - ExceptionHandling="TRUE" - RuntimeLibrary="2" - RuntimeTypeInfo="TRUE" - UsePrecompiledHeader="3" - PrecompiledHeaderThrough="wx/wxprec.h" - PrecompiledHeaderFile="vc_mswunivudll\wxprec_basedll.pch" - ObjectFile="vc_mswunivudll\base\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase292u_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 wininet.lib" - OutputFile="..\..\lib\vc_dll\wxbase292u_vc_custom.dll" - LinkIncremental="1" - ImportLibrary="..\..\lib\vc_dll\wxbase29u.lib" - SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="..\..\lib\vc_dll" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile="..\..\lib\vc_dll\wxbase292u_vc_custom.pdb" - TargetMachine="1" - OptimizeReferences="2" - EnableCOMDATFolding="2"/> - <Tool - Name="VCMIDLTool" - PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1" - AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> - <Tool - Name="VCPostBuildEventTool"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase292u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1" - 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> </Configurations> <References> @@ -587,18 +335,6 @@ Name="VCCLCompilerTool" UsePrecompiledHeader="1"/> </FileConfiguration> - <FileConfiguration - Name="Universal Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - UsePrecompiledHeader="1"/> - </FileConfiguration> - <FileConfiguration - Name="Universal Release|Win32"> - <Tool - Name="VCCLCompilerTool" - UsePrecompiledHeader="1"/> - </FileConfiguration> <FileConfiguration Name="DLL Debug|Win32"> <Tool @@ -611,18 +347,6 @@ Name="VCCLCompilerTool" UsePrecompiledHeader="1"/> </FileConfiguration> - <FileConfiguration - Name="DLL Universal Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - UsePrecompiledHeader="1"/> - </FileConfiguration> - <FileConfiguration - Name="DLL Universal Release|Win32"> - <Tool - Name="VCCLCompilerTool" - UsePrecompiledHeader="1"/> - </FileConfiguration> </File> <File RelativePath="..\..\src\common\dynarray.cpp"> @@ -656,18 +380,6 @@ Name="VCCLCompilerTool" UsePrecompiledHeader="0"/> </FileConfiguration> - <FileConfiguration - Name="Universal Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - UsePrecompiledHeader="0"/> - </FileConfiguration> - <FileConfiguration - Name="Universal Release|Win32"> - <Tool - Name="VCCLCompilerTool" - UsePrecompiledHeader="0"/> - </FileConfiguration> <FileConfiguration Name="DLL Debug|Win32"> <Tool @@ -680,18 +392,6 @@ Name="VCCLCompilerTool" UsePrecompiledHeader="0"/> </FileConfiguration> - <FileConfiguration - Name="DLL Universal Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - UsePrecompiledHeader="0"/> - </FileConfiguration> - <FileConfiguration - Name="DLL Universal Release|Win32"> - <Tool - Name="VCCLCompilerTool" - UsePrecompiledHeader="0"/> - </FileConfiguration> </File> <File RelativePath="..\..\src\common\ffile.cpp"> @@ -777,6 +477,9 @@ <File RelativePath="..\..\src\common\mstream.cpp"> </File> + <File + RelativePath="..\..\src\common\numformatter.cpp"> + </File> <File RelativePath="..\..\src\common\object.cpp"> </File> @@ -834,6 +537,9 @@ <File RelativePath="..\..\src\common\textfile.cpp"> </File> + <File + RelativePath="..\..\src\common\time.cpp"> + </File> <File RelativePath="..\..\src\common\timercmn.cpp"> </File> @@ -911,7 +617,7 @@ RelativePath="..\..\src\msw\dlmsw.cpp"> </File> <File - RelativePath="..\..\src\msw\evtloop.cpp"> + RelativePath="..\..\src\msw\evtloopconsole.cpp"> </File> <File RelativePath="..\..\src\msw\fswatcher.cpp"> @@ -963,12 +669,6 @@ <FileConfiguration Name="Release|Win32" ExcludedFromBuild="TRUE"/> - <FileConfiguration - Name="Universal Debug|Win32" - ExcludedFromBuild="TRUE"/> - <FileConfiguration - Name="Universal Release|Win32" - ExcludedFromBuild="TRUE"/> </File> <File RelativePath="..\..\src\msw\volume.cpp"> @@ -992,8 +692,7 @@ 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)""/> + Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"/> </FileConfiguration> <FileConfiguration Name="Release|Win32"> @@ -1001,21 +700,15 @@ 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)""/> + Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"/> </FileConfiguration> - <FileConfiguration - Name="Universal Debug|Win32"/> - <FileConfiguration - Name="Universal Release|Win32"/> <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\mswud\wx\setup.h"/> </FileConfiguration> <FileConfiguration Name="DLL Release|Win32"> @@ -1023,13 +716,8 @@ 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)""/> + Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"/> </FileConfiguration> - <FileConfiguration - Name="DLL Universal Debug|Win32"/> - <FileConfiguration - Name="DLL Universal Release|Win32"/> </File> <File RelativePath="..\..\include\wx\univ\setup.h"> @@ -1037,46 +725,10 @@ Name="Debug|Win32"/> <FileConfiguration Name="Release|Win32"/> - <FileConfiguration - Name="Universal 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)""/> - </FileConfiguration> - <FileConfiguration - Name="Universal 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)""/> - </FileConfiguration> <FileConfiguration Name="DLL Debug|Win32"/> <FileConfiguration Name="DLL Release|Win32"/> - <FileConfiguration - Name="DLL Universal 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)""/> - </FileConfiguration> - <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> </File> </Filter> <Filter @@ -1100,6 +752,9 @@ <File RelativePath="..\..\include\wx\msw\debughlp.h"> </File> + <File + RelativePath="..\..\include\wx\msw\evtloopconsole.h"> + </File> <File RelativePath="..\..\include\wx\msw\fswatcher.h"> </File> @@ -1126,24 +781,6 @@ Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" AdditionalDependencies=""..\..\lib\vc_lib\mswu\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="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="DLL Debug|Win32"> <Tool @@ -1162,24 +799,6 @@ Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" AdditionalDependencies=""..\..\lib\vc_dll\mswu\wx\msw""/> </FileConfiguration> - <FileConfiguration - Name="DLL Universal 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""/> - </FileConfiguration> - <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> </File> <File RelativePath="..\..\include\wx\msw\libraries.h"> @@ -1292,6 +911,9 @@ <File RelativePath="..\..\include\wx\cmdline.h"> </File> + <File + RelativePath="..\..\include\wx\compiler.h"> + </File> <File RelativePath="..\..\include\wx\confbase.h"> </File> @@ -1352,6 +974,9 @@ <File RelativePath="..\..\include\wx\event.h"> </File> + <File + RelativePath="..\..\include\wx\eventfilter.h"> + </File> <File RelativePath="..\..\include\wx\evtloop.h"> </File> @@ -1493,6 +1118,9 @@ <File RelativePath="..\..\include\wx\mstream.h"> </File> + <File + RelativePath="..\..\include\wx\numformatter.h"> + </File> <File RelativePath="..\..\include\wx\object.h"> </File> @@ -1523,6 +1151,9 @@ <File RelativePath="..\..\include\wx\regex.h"> </File> + <File + RelativePath="..\..\include\wx\meta\removeref.h"> + </File> <File RelativePath="..\..\include\wx\rtti.h"> </File> @@ -1595,6 +1226,9 @@ <File RelativePath="..\..\include\wx\thread.h"> </File> + <File + RelativePath="..\..\include\wx\time.h"> + </File> <File RelativePath="..\..\include\wx\timer.h"> </File> @@ -1676,6 +1310,9 @@ <File RelativePath="..\..\include\wx\xti.h"> </File> + <File + RelativePath="..\..\include\wx\xti2.h"> + </File> <File RelativePath="..\..\include\wx\xtictor.h"> </File>