X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e520c3f75cbfb0ed6a751576d7032ef196a1817d..3f45b63e4d54e0db4731add90bbf0a95fe2b8814:/build/msw/wx_vc7_adv.vcproj?ds=sidebyside diff --git a/build/msw/wx_vc7_adv.vcproj b/build/msw/wx_vc7_adv.vcproj index ecfa5714ff..70b26bb8f8 100644 --- a/build/msw/wx_vc7_adv.vcproj +++ b/build/msw/wx_vc7_adv.vcproj @@ -133,123 +133,6 @@ <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> - <Configuration - Name="Universal Debug|Win32" - OutputDirectory="..\..\lib\vc_lib" - IntermediateDirectory="vc_mswunivud\adv" - 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" - MinimalRebuild="TRUE" - ExceptionHandling="TRUE" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - BufferSecurityCheck="TRUE" - RuntimeTypeInfo="TRUE" - UsePrecompiledHeader="3" - PrecompiledHeaderThrough="wx/wxprec.h" - PrecompiledHeaderFile="vc_mswunivud\wxprec_advlib.pch" - ObjectFile="vc_mswunivud\adv\" - ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_adv.pdb" - WarningLevel="4" - SuppressStartupBanner="TRUE" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_adv.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool" - PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING" - 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" - 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\adv" - 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" - ExceptionHandling="TRUE" - RuntimeLibrary="2" - RuntimeTypeInfo="TRUE" - UsePrecompiledHeader="3" - PrecompiledHeaderThrough="wx/wxprec.h" - PrecompiledHeaderFile="vc_mswunivu\wxprec_advlib.pch" - ObjectFile="vc_mswunivu\adv\" - ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_adv.pdb" - WarningLevel="4" - SuppressStartupBanner="TRUE" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\lib\vc_lib\wxmswuniv29u_adv.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool" - PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING" - 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" - 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_advdll.pch" ObjectFile="vc_mswuddll\adv\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_adv_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw295ud_adv_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="TRUE" Detect64BitPortabilityProblems="TRUE" @@ -283,14 +166,14 @@ <Tool Name="VCLinkerTool" AdditionalOptions="" - AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw293ud_adv_vc_custom.dll" + AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" + OutputFile="..\..\lib\vc_dll\wxmsw295ud_adv_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_adv.lib" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateDebugInformation="TRUE" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_adv_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw295ud_adv_vc_custom.pdb" TargetMachine="1"/> <Tool Name="VCMIDLTool" @@ -304,7 +187,7 @@ Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV" + PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV" 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_advdll.pch" ObjectFile="vc_mswudll\adv\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293u_adv_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw295u_adv_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="TRUE" Detect64BitPortabilityProblems="TRUE" @@ -348,14 +231,14 @@ <Tool Name="VCLinkerTool" AdditionalOptions="" - AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw293u_adv_vc_custom.dll" + AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib" + OutputFile="..\..\lib\vc_dll\wxmsw295u_adv_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw29u_adv.lib" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateDebugInformation="TRUE" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_adv_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw295u_adv_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2"/> @@ -371,7 +254,7 @@ Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV" + PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV" 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\adv" - 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;WXUSINGDLL;WXMAKINGDLL_ADV" - MinimalRebuild="TRUE" - ExceptionHandling="TRUE" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - BufferSecurityCheck="TRUE" - RuntimeTypeInfo="TRUE" - UsePrecompiledHeader="3" - PrecompiledHeaderThrough="wx/wxprec.h" - PrecompiledHeaderFile="vc_mswunivuddll\wxprec_advdll.pch" - ObjectFile="vc_mswunivuddll\adv\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_adv_vc_custom.pdb" - WarningLevel="4" - SuppressStartupBanner="TRUE" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLinkerTool" - AdditionalOptions="" - AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_adv_vc_custom.dll" - LinkIncremental="2" - ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_adv.lib" - SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="..\..\lib\vc_dll" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_adv_vc_custom.pdb" - TargetMachine="1"/> - <Tool - Name="VCMIDLTool" - PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV" - 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=wxmswuniv293ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV" - 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\adv" - 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;WXUSINGDLL;WXMAKINGDLL_ADV" - ExceptionHandling="TRUE" - RuntimeLibrary="2" - RuntimeTypeInfo="TRUE" - UsePrecompiledHeader="3" - PrecompiledHeaderThrough="wx/wxprec.h" - PrecompiledHeaderFile="vc_mswunivudll\wxprec_advdll.pch" - ObjectFile="vc_mswunivudll\adv\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293u_adv_vc_custom.pdb" - WarningLevel="4" - SuppressStartupBanner="TRUE" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLinkerTool" - AdditionalOptions="" - AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv293u_adv_vc_custom.dll" - LinkIncremental="1" - ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_adv.lib" - SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="..\..\lib\vc_dll" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_adv_vc_custom.pdb" - TargetMachine="1" - OptimizeReferences="2" - EnableCOMDATFolding="2"/> - <Tool - Name="VCMIDLTool" - PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV" - 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=wxmswuniv293u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV" - 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> @@ -554,18 +302,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 @@ -578,18 +314,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\gridcmn.cpp"> @@ -601,9 +325,9 @@ RelativePath="..\..\src\common\odcombocmn.cpp"> </File> <File - RelativePath="..\..\src\common\richtooltipcmn.cpp"> - </File> - <File + RelativePath="..\..\src\common\richtooltipcmn.cpp"> + </File> + <File RelativePath="..\..\src\common\taskbarcmn.cpp"> </File> </Filter> @@ -615,108 +339,24 @@ </File> <File RelativePath="..\..\src\msw\bmpcbox.cpp"> - <FileConfiguration - Name="Universal Debug|Win32" - ExcludedFromBuild="TRUE"/> - <FileConfiguration - Name="Universal Release|Win32" - ExcludedFromBuild="TRUE"/> - <FileConfiguration - Name="DLL Universal Debug|Win32" - ExcludedFromBuild="TRUE"/> - <FileConfiguration - Name="DLL Universal Release|Win32" - ExcludedFromBuild="TRUE"/> </File> <File RelativePath="..\..\src\msw\calctrl.cpp"> - <FileConfiguration - Name="Universal Debug|Win32" - ExcludedFromBuild="TRUE"/> - <FileConfiguration - Name="Universal Release|Win32" - ExcludedFromBuild="TRUE"/> - <FileConfiguration - Name="DLL Universal Debug|Win32" - ExcludedFromBuild="TRUE"/> - <FileConfiguration - Name="DLL Universal Release|Win32" - ExcludedFromBuild="TRUE"/> </File> <File RelativePath="..\..\src\msw\commandlinkbutton.cpp"> - <FileConfiguration - Name="Universal Debug|Win32" - ExcludedFromBuild="TRUE"/> - <FileConfiguration - Name="Universal Release|Win32" - ExcludedFromBuild="TRUE"/> - <FileConfiguration - Name="DLL Universal Debug|Win32" - ExcludedFromBuild="TRUE"/> - <FileConfiguration - Name="DLL Universal Release|Win32" - ExcludedFromBuild="TRUE"/> </File> <File RelativePath="..\..\src\msw\datecontrols.cpp"> - <FileConfiguration - Name="Universal Debug|Win32" - ExcludedFromBuild="TRUE"/> - <FileConfiguration - Name="Universal Release|Win32" - ExcludedFromBuild="TRUE"/> - <FileConfiguration - Name="DLL Universal Debug|Win32" - ExcludedFromBuild="TRUE"/> - <FileConfiguration - Name="DLL Universal Release|Win32" - ExcludedFromBuild="TRUE"/> </File> <File RelativePath="..\..\src\msw\datectrl.cpp"> - <FileConfiguration - Name="Universal Debug|Win32" - ExcludedFromBuild="TRUE"/> - <FileConfiguration - Name="Universal Release|Win32" - ExcludedFromBuild="TRUE"/> - <FileConfiguration - Name="DLL Universal Debug|Win32" - ExcludedFromBuild="TRUE"/> - <FileConfiguration - Name="DLL Universal Release|Win32" - ExcludedFromBuild="TRUE"/> </File> <File - RelativePath="..\..\src\msw\datetimectrl.cpp"> - <FileConfiguration - Name="Universal Debug|Win32" - ExcludedFromBuild="TRUE"/> - <FileConfiguration - Name="Universal Release|Win32" - ExcludedFromBuild="TRUE"/> - <FileConfiguration - Name="DLL Universal Debug|Win32" - ExcludedFromBuild="TRUE"/> - <FileConfiguration - Name="DLL Universal Release|Win32" - ExcludedFromBuild="TRUE"/> - </File> - <File + RelativePath="..\..\src\msw\datetimectrl.cpp"> + </File> + <File RelativePath="..\..\src\msw\hyperlink.cpp"> - <FileConfiguration - Name="Universal Debug|Win32" - ExcludedFromBuild="TRUE"/> - <FileConfiguration - Name="Universal Release|Win32" - ExcludedFromBuild="TRUE"/> - <FileConfiguration - Name="DLL Universal Debug|Win32" - ExcludedFromBuild="TRUE"/> - <FileConfiguration - Name="DLL Universal Release|Win32" - ExcludedFromBuild="TRUE"/> </File> <File RelativePath="..\..\src\msw\joystick.cpp"> @@ -725,102 +365,18 @@ RelativePath="..\..\src\msw\notifmsg.cpp"> </File> <File - RelativePath="..\..\src\msw\richtooltip.cpp"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="vc_mswud\adv\msw_richtooltip.obj"/> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="vc_mswu\adv\msw_richtooltip.obj"/> - </FileConfiguration> - <FileConfiguration - Name="Universal Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="vc_mswunivud\adv\msw_richtooltip.obj"/> - </FileConfiguration> - <FileConfiguration - Name="Universal Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="vc_mswunivu\adv\msw_richtooltip.obj"/> - </FileConfiguration> - <FileConfiguration - Name="DLL Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="vc_mswuddll\adv\msw_richtooltip.obj"/> - </FileConfiguration> - <FileConfiguration - Name="DLL Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="vc_mswudll\adv\msw_richtooltip.obj"/> - </FileConfiguration> - <FileConfiguration - Name="DLL Universal Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="vc_mswunivuddll\adv\msw_richtooltip.obj"/> - </FileConfiguration> - <FileConfiguration - Name="DLL Universal Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="vc_mswunivudll\adv\msw_richtooltip.obj"/> - </FileConfiguration> - </File> - <File + RelativePath="..\..\src\msw\richtooltip.cpp"> + </File> + <File RelativePath="..\..\src\msw\sound.cpp"> </File> <File RelativePath="..\..\src\msw\taskbar.cpp"> </File> <File - RelativePath="..\..\src\msw\timectrl.cpp"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="vc_mswud\adv\msw_timectrl.obj"/> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="vc_mswu\adv\msw_timectrl.obj"/> - </FileConfiguration> - <FileConfiguration - Name="Universal Debug|Win32" - ExcludedFromBuild="TRUE"/> - <FileConfiguration - Name="Universal Release|Win32" - ExcludedFromBuild="TRUE"/> - <FileConfiguration - Name="DLL Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="vc_mswuddll\adv\msw_timectrl.obj"/> - </FileConfiguration> - <FileConfiguration - Name="DLL Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="vc_mswudll\adv\msw_timectrl.obj"/> - </FileConfiguration> - <FileConfiguration - Name="DLL Universal Debug|Win32" - ExcludedFromBuild="TRUE"/> - <FileConfiguration - Name="DLL Universal Release|Win32" - ExcludedFromBuild="TRUE"/> - </File> - <File + RelativePath="..\..\src\msw\timectrl.cpp"> + </File> + <File RelativePath="..\..\src\msw\version.rc"> <FileConfiguration Name="Debug|Win32" @@ -828,12 +384,6 @@ <FileConfiguration Name="Release|Win32" ExcludedFromBuild="TRUE"/> - <FileConfiguration - Name="Universal Debug|Win32" - ExcludedFromBuild="TRUE"/> - <FileConfiguration - Name="Universal Release|Win32" - ExcludedFromBuild="TRUE"/> </File> </Filter> <Filter @@ -897,114 +447,18 @@ RelativePath="..\..\src\generic\propdlg.cpp"> </File> <File - RelativePath="..\..\src\generic\richtooltip.cpp"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="vc_mswud\adv\generic_richtooltip.obj"/> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="vc_mswu\adv\generic_richtooltip.obj"/> - </FileConfiguration> - <FileConfiguration - Name="Universal Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="vc_mswunivud\adv\generic_richtooltip.obj"/> - </FileConfiguration> - <FileConfiguration - Name="Universal Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="vc_mswunivu\adv\generic_richtooltip.obj"/> - </FileConfiguration> - <FileConfiguration - Name="DLL Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="vc_mswuddll\adv\generic_richtooltip.obj"/> - </FileConfiguration> - <FileConfiguration - Name="DLL Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="vc_mswudll\adv\generic_richtooltip.obj"/> - </FileConfiguration> - <FileConfiguration - Name="DLL Universal Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="vc_mswunivuddll\adv\generic_richtooltip.obj"/> - </FileConfiguration> - <FileConfiguration - Name="DLL Universal Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="vc_mswunivudll\adv\generic_richtooltip.obj"/> - </FileConfiguration> - </File> - <File + RelativePath="..\..\src\generic\richtooltipg.cpp"> + </File> + <File RelativePath="..\..\src\generic\sashwin.cpp"> </File> <File RelativePath="..\..\src\generic\splash.cpp"> </File> <File - RelativePath="..\..\src\generic\timectrl.cpp"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="vc_mswud\adv\generic_timectrl.obj"/> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="vc_mswu\adv\generic_timectrl.obj"/> - </FileConfiguration> - <FileConfiguration - Name="Universal Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="vc_mswunivud\adv\generic_timectrl.obj"/> - </FileConfiguration> - <FileConfiguration - Name="Universal Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="vc_mswunivu\adv\generic_timectrl.obj"/> - </FileConfiguration> - <FileConfiguration - Name="DLL Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="vc_mswuddll\adv\generic_timectrl.obj"/> - </FileConfiguration> - <FileConfiguration - Name="DLL Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="vc_mswudll\adv\generic_timectrl.obj"/> - </FileConfiguration> - <FileConfiguration - Name="DLL Universal Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="vc_mswunivuddll\adv\generic_timectrl.obj"/> - </FileConfiguration> - <FileConfiguration - Name="DLL Universal Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="vc_mswunivudll\adv\generic_timectrl.obj"/> - </FileConfiguration> - </File> - <File + RelativePath="..\..\src\generic\timectrlg.cpp"> + </File> + <File RelativePath="..\..\src\generic\tipdlg.cpp"> </File> <File @@ -1035,10 +489,6 @@ CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h" 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 @@ -1055,10 +505,6 @@ CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h" 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"> @@ -1066,42 +512,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"/> - </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"/> - </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"/> - </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"/> - </FileConfiguration> </File> </Filter> <Filter @@ -1120,9 +534,9 @@ RelativePath="..\..\include\wx\msw\datectrl.h"> </File> <File - RelativePath="..\..\include\wx\msw\datetimectrl.h"> - </File> - <File + RelativePath="..\..\include\wx\msw\datetimectrl.h"> + </File> + <File RelativePath="..\..\include\wx\msw\genrcdefs.h"> <FileConfiguration Name="Debug|Win32"> @@ -1142,24 +556,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 @@ -1178,24 +574,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\hyperlink.h"> @@ -1212,9 +590,9 @@ <File RelativePath="..\..\include\wx\msw\taskbar.h"> </File> - <File - RelativePath="..\..\include\wx\msw\timectrl.h"> - </File> + <File + RelativePath="..\..\include\wx\msw\timectrl.h"> + </File> </Filter> <Filter Name="Generic Headers" @@ -1277,9 +655,9 @@ RelativePath="..\..\include\wx\generic\splash.h"> </File> <File - RelativePath="..\..\include\wx\generic\timectrl.h"> - </File> - <File + RelativePath="..\..\include\wx\generic\timectrl.h"> + </File> + <File RelativePath="..\..\include\wx\generic\wizard.h"> </File> </Filter> @@ -1313,6 +691,9 @@ <File RelativePath="..\..\include\wx\dateevt.h"> </File> + <File + RelativePath="..\..\include\wx\datetimectrl.h"> + </File> <File RelativePath="..\..\include\wx\dcbuffer.h"> </File> @@ -1344,9 +725,9 @@ RelativePath="..\..\include\wx\propdlg.h"> </File> <File - RelativePath="..\..\include\wx\richtooltip.h"> - </File> - <File + RelativePath="..\..\include\wx\richtooltip.h"> + </File> + <File RelativePath="..\..\include\wx\sashwin.h"> </File> <File @@ -1359,9 +740,9 @@ RelativePath="..\..\include\wx\taskbar.h"> </File> <File - RelativePath="..\..\include\wx\timectrl.h"> - </File> - <File + RelativePath="..\..\include\wx\timectrl.h"> + </File> + <File RelativePath="..\..\include\wx\tipdlg.h"> </File> <File