X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/29efc6e4a478652d6f59fb3f5ca7990d78a8ead4..f4120538eb57333a8c71dd70063190fdfac53feb:/build/msw/wx_vc7_adv.vcproj diff --git a/build/msw/wx_vc7_adv.vcproj b/build/msw/wx_vc7_adv.vcproj index e8db43a161..eeb06c77df 100644 --- a/build/msw/wx_vc7_adv.vcproj +++ b/build/msw/wx_vc7_adv.vcproj @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="Windows-1252"?> <!-- - This makefile was generated by - Bakefile 0.2.5 (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,27 +17,86 @@ </Platforms> <Configurations> <Configuration - Name="DLL Universal Release|Win32" - OutputDirectory="..\..\lib\vc_dll" - IntermediateDirectory="vc_mswunivudll\adv" - ConfigurationType="2" + Name="Debug|Win32" + OutputDirectory="..\..\lib\vc_lib" + IntermediateDirectory="vc_mswud\adv" + 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="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING" + MinimalRebuild="TRUE" + ExceptionHandling="TRUE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="TRUE" + RuntimeTypeInfo="TRUE" + UsePrecompiledHeader="3" + PrecompiledHeaderThrough="wx/wxprec.h" + PrecompiledHeaderFile="vc_mswud\wxprec_advlib.pch" + ObjectFile="vc_mswud\adv\" + ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_adv.pdb" + WarningLevel="4" + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLibrarianTool" + OutputFile="..\..\lib\vc_lib\wxmsw29ud_adv.lib" + SuppressStartupBanner="TRUE"/> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\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__;_UNICODE;WXBUILDING" + Culture="1033" + AdditionalIncludeDirectories="..\..\lib\vc_lib\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="Release|Win32" + OutputDirectory="..\..\lib\vc_lib" + IntermediateDirectory="vc_mswu\adv" + ConfigurationType="4" 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;WXUSINGDLL;WXMAKINGDLL_ADV" + 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" ExceptionHandling="TRUE" RuntimeLibrary="2" RuntimeTypeInfo="TRUE" UsePrecompiledHeader="3" PrecompiledHeaderThrough="wx/wxprec.h" - PrecompiledHeaderFile="vc_mswunivudll\wxprec_advdll.pch" - AssemblerListingLocation="vc_mswunivudll\adv\" - ObjectFile="vc_mswunivudll\adv\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290u_adv_vc_custom.pdb" + PrecompiledHeaderFile="vc_mswu\wxprec_advlib.pch" + ObjectFile="vc_mswu\adv\" + ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_adv.pdb" WarningLevel="4" SuppressStartupBanner="TRUE" Detect64BitPortabilityProblems="TRUE" @@ -45,19 +104,13 @@ <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 ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv290u_adv_vc_custom.dll" - LinkIncremental="2" - ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_adv.lib" - SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="..\..\lib\vc_dll" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290u_adv_vc_custom.pdb" - TargetMachine="1"/> + Name="VCLibrarianTool" + OutputFile="..\..\lib\vc_lib\wxmsw29u_adv.lib" + SuppressStartupBanner="TRUE"/> <Tool - Name="VCMIDLTool"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> <Tool Name="VCPostBuildEventTool"/> <Tool @@ -66,9 +119,9 @@ Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV" + PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING" Culture="1033" - AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\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 @@ -81,18 +134,18 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration - Name="DLL Universal Debug|Win32" - OutputDirectory="..\..\lib\vc_dll" - IntermediateDirectory="vc_mswunivuddll\adv" - ConfigurationType="2" + 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_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;WXUSINGDLL;WXMAKINGDLL_ADV" + 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" @@ -101,10 +154,9 @@ RuntimeTypeInfo="TRUE" UsePrecompiledHeader="3" PrecompiledHeaderThrough="wx/wxprec.h" - PrecompiledHeaderFile="vc_mswunivuddll\wxprec_advdll.pch" - AssemblerListingLocation="vc_mswunivuddll\adv\" - ObjectFile="vc_mswunivuddll\adv\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290ud_adv_vc_custom.pdb" + PrecompiledHeaderFile="vc_mswunivud\wxprec_advlib.pch" + ObjectFile="vc_mswunivud\adv\" + ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_adv.pdb" WarningLevel="4" SuppressStartupBanner="TRUE" Detect64BitPortabilityProblems="TRUE" @@ -112,19 +164,13 @@ <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 ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_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\wxmswuniv290ud_adv_vc_custom.pdb" - TargetMachine="1"/> + Name="VCLibrarianTool" + OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_adv.lib" + SuppressStartupBanner="TRUE"/> <Tool - Name="VCMIDLTool"/> + 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 @@ -133,9 +179,9 @@ Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING" 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\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool @@ -148,27 +194,26 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration - Name="DLL Release|Win32" - OutputDirectory="..\..\lib\vc_dll" - IntermediateDirectory="vc_mswudll\adv" - ConfigurationType="2" + 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_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" - PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV" + 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_mswudll\wxprec_advdll.pch" - AssemblerListingLocation="vc_mswudll\adv\" - ObjectFile="vc_mswudll\adv\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290u_adv_vc_custom.pdb" + PrecompiledHeaderFile="vc_mswunivu\wxprec_advlib.pch" + ObjectFile="vc_mswunivu\adv\" + ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_adv.pdb" WarningLevel="4" SuppressStartupBanner="TRUE" Detect64BitPortabilityProblems="TRUE" @@ -176,19 +221,13 @@ <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 ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw290u_adv_vc_custom.dll" - LinkIncremental="2" - ImportLibrary="..\..\lib\vc_dll\wxmsw29u_adv.lib" - SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="..\..\lib\vc_dll" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290u_adv_vc_custom.pdb" - TargetMachine="1"/> + Name="VCLibrarianTool" + OutputFile="..\..\lib\vc_lib\wxmswuniv29u_adv.lib" + SuppressStartupBanner="TRUE"/> <Tool - Name="VCMIDLTool"/> + 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 @@ -197,9 +236,9 @@ Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV" + PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING" 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\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool @@ -223,7 +262,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;WXUSINGDLL;WXMAKINGDLL_ADV" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV" MinimalRebuild="TRUE" ExceptionHandling="TRUE" BasicRuntimeChecks="3" @@ -233,9 +272,8 @@ UsePrecompiledHeader="3" PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_advdll.pch" - AssemblerListingLocation="vc_mswuddll\adv\" ObjectFile="vc_mswuddll\adv\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290ud_adv_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw295ud_adv_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="TRUE" Detect64BitPortabilityProblems="TRUE" @@ -245,17 +283,19 @@ <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 ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw290ud_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\wxmsw290ud_adv_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw295ud_adv_vc_custom.pdb" TargetMachine="1"/> <Tool - Name="VCMIDLTool"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> <Tool Name="VCPostBuildEventTool"/> <Tool @@ -264,7 +304,7 @@ Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_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 @@ -279,27 +319,26 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration - Name="Universal Release|Win32" - OutputDirectory="..\..\lib\vc_lib" - IntermediateDirectory="vc_mswunivu\adv" - ConfigurationType="4" + Name="DLL Release|Win32" + OutputDirectory="..\..\lib\vc_dll" + IntermediateDirectory="vc_mswudll\adv" + ConfigurationType="2" 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" + 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;WXUSINGDLL;WXMAKINGDLL_ADV" ExceptionHandling="TRUE" RuntimeLibrary="2" RuntimeTypeInfo="TRUE" UsePrecompiledHeader="3" PrecompiledHeaderThrough="wx/wxprec.h" - PrecompiledHeaderFile="vc_mswunivu\wxprec_advlib.pch" - AssemblerListingLocation="vc_mswunivu\adv\" - ObjectFile="vc_mswunivu\adv\" - ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_adv.pdb" + PrecompiledHeaderFile="vc_mswudll\wxprec_advdll.pch" + ObjectFile="vc_mswudll\adv\" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw295u_adv_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="TRUE" Detect64BitPortabilityProblems="TRUE" @@ -307,11 +346,23 @@ <Tool Name="VCCustomBuildTool"/> <Tool - Name="VCLibrarianTool" - OutputFile="..\..\lib\vc_lib\wxmswuniv29u_adv.lib" - SuppressStartupBanner="TRUE"/> + 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\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\wxmsw295u_adv_vc_custom.pdb" + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> <Tool - Name="VCMIDLTool"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> <Tool Name="VCPostBuildEventTool"/> <Tool @@ -320,9 +371,9 @@ Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING" + PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV" Culture="1033" - AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\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 @@ -335,18 +386,18 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration - Name="Universal Debug|Win32" - OutputDirectory="..\..\lib\vc_lib" - IntermediateDirectory="vc_mswunivud\adv" - ConfigurationType="4" + 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_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" + 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" @@ -355,10 +406,9 @@ RuntimeTypeInfo="TRUE" UsePrecompiledHeader="3" PrecompiledHeaderThrough="wx/wxprec.h" - PrecompiledHeaderFile="vc_mswunivud\wxprec_advlib.pch" - AssemblerListingLocation="vc_mswunivud\adv\" - ObjectFile="vc_mswunivud\adv\" - ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_adv.pdb" + PrecompiledHeaderFile="vc_mswunivuddll\wxprec_advdll.pch" + ObjectFile="vc_mswunivuddll\adv\" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv295ud_adv_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="TRUE" Detect64BitPortabilityProblems="TRUE" @@ -366,11 +416,21 @@ <Tool Name="VCCustomBuildTool"/> <Tool - Name="VCLibrarianTool" - OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_adv.lib" - SuppressStartupBanner="TRUE"/> + 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\wxmswuniv295ud_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\wxmswuniv295ud_adv_vc_custom.pdb" + TargetMachine="1"/> <Tool - Name="VCMIDLTool"/> + 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 @@ -379,9 +439,9 @@ Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv295ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV" 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\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool @@ -394,27 +454,26 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration - Name="Release|Win32" - OutputDirectory="..\..\lib\vc_lib" - IntermediateDirectory="vc_mswu\adv" - ConfigurationType="4" + 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_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" - PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING" + 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_mswu\wxprec_advlib.pch" - AssemblerListingLocation="vc_mswu\adv\" - ObjectFile="vc_mswu\adv\" - ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_adv.pdb" + PrecompiledHeaderFile="vc_mswunivudll\wxprec_advdll.pch" + ObjectFile="vc_mswunivudll\adv\" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv295u_adv_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="TRUE" Detect64BitPortabilityProblems="TRUE" @@ -422,70 +481,23 @@ <Tool Name="VCCustomBuildTool"/> <Tool - Name="VCLibrarianTool" - OutputFile="..\..\lib\vc_lib\wxmsw29u_adv.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING" - 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\adv" - 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" - MinimalRebuild="TRUE" - ExceptionHandling="TRUE" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - BufferSecurityCheck="TRUE" - RuntimeTypeInfo="TRUE" - UsePrecompiledHeader="3" - PrecompiledHeaderThrough="wx/wxprec.h" - PrecompiledHeaderFile="vc_mswud\wxprec_advlib.pch" - AssemblerListingLocation="vc_mswud\adv\" - ObjectFile="vc_mswud\adv\" - ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_adv.pdb" - WarningLevel="4" + 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\wxmswuniv295u_adv_vc_custom.dll" + LinkIncremental="1" + ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_adv.lib" SuppressStartupBanner="TRUE" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\lib\vc_lib\wxmsw29ud_adv.lib" - SuppressStartupBanner="TRUE"/> + AdditionalLibraryDirectories="..\..\lib\vc_dll" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv295u_adv_vc_custom.pdb" + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> <Tool - Name="VCMIDLTool"/> + 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 @@ -494,9 +506,9 @@ Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING" + PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv295u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV" 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\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool @@ -531,57 +543,66 @@ <File RelativePath="..\..\src\common\dummy.cpp"> <FileConfiguration - Name="DLL Universal Release|Win32"> + Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/> </FileConfiguration> <FileConfiguration - Name="DLL Universal Debug|Win32"> + Name="Release|Win32"> <Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/> </FileConfiguration> <FileConfiguration - Name="DLL Release|Win32"> + Name="Universal Debug|Win32"> <Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/> </FileConfiguration> <FileConfiguration - Name="DLL Debug|Win32"> + Name="Universal Release|Win32"> <Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/> </FileConfiguration> <FileConfiguration - Name="Universal Release|Win32"> + Name="DLL Debug|Win32"> <Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/> </FileConfiguration> <FileConfiguration - Name="Universal Debug|Win32"> + Name="DLL Release|Win32"> <Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/> </FileConfiguration> <FileConfiguration - Name="Release|Win32"> + Name="DLL Universal Debug|Win32"> <Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/> </FileConfiguration> <FileConfiguration - Name="Debug|Win32"> + Name="DLL Universal Release|Win32"> <Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/> </FileConfiguration> </File> + <File + RelativePath="..\..\src\common\gridcmn.cpp"> + </File> <File RelativePath="..\..\src\common\hyperlnkcmn.cpp"> </File> + <File + RelativePath="..\..\src\common\odcombocmn.cpp"> + </File> + <File + RelativePath="..\..\src\common\richtooltipcmn.cpp"> + </File> <File RelativePath="..\..\src\common\taskbarcmn.cpp"> </File> @@ -594,63 +615,108 @@ </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="DLL Universal Debug|Win32" + Name="Universal Debug|Win32" ExcludedFromBuild="TRUE"/> <FileConfiguration Name="Universal Release|Win32" ExcludedFromBuild="TRUE"/> <FileConfiguration - Name="Universal Debug|Win32" + Name="DLL Universal Debug|Win32" ExcludedFromBuild="TRUE"/> - </File> - <File - RelativePath="..\..\src\msw\calctrl.cpp"> <FileConfiguration Name="DLL Universal Release|Win32" ExcludedFromBuild="TRUE"/> + </File> + <File + RelativePath="..\..\src\msw\datecontrols.cpp"> <FileConfiguration - Name="DLL Universal Debug|Win32" + Name="Universal Debug|Win32" ExcludedFromBuild="TRUE"/> <FileConfiguration Name="Universal Release|Win32" ExcludedFromBuild="TRUE"/> <FileConfiguration - Name="Universal Debug|Win32" + Name="DLL Universal Debug|Win32" ExcludedFromBuild="TRUE"/> - </File> - <File - RelativePath="..\..\src\msw\datecontrols.cpp"> <FileConfiguration Name="DLL Universal Release|Win32" ExcludedFromBuild="TRUE"/> + </File> + <File + RelativePath="..\..\src\msw\datectrl.cpp"> <FileConfiguration - Name="DLL Universal Debug|Win32" + Name="Universal Debug|Win32" ExcludedFromBuild="TRUE"/> <FileConfiguration Name="Universal Release|Win32" ExcludedFromBuild="TRUE"/> <FileConfiguration - Name="Universal Debug|Win32" + Name="DLL Universal Debug|Win32" + ExcludedFromBuild="TRUE"/> + <FileConfiguration + Name="DLL Universal Release|Win32" ExcludedFromBuild="TRUE"/> </File> <File - RelativePath="..\..\src\msw\datectrl.cpp"> + RelativePath="..\..\src\msw\datetimectrl.cpp"> <FileConfiguration - Name="DLL Universal Release|Win32" + Name="Universal Debug|Win32" + ExcludedFromBuild="TRUE"/> + <FileConfiguration + Name="Universal Release|Win32" ExcludedFromBuild="TRUE"/> <FileConfiguration Name="DLL Universal Debug|Win32" ExcludedFromBuild="TRUE"/> <FileConfiguration - Name="Universal Release|Win32" + Name="DLL Universal Release|Win32" ExcludedFromBuild="TRUE"/> + </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"> @@ -658,6 +724,9 @@ <File RelativePath="..\..\src\msw\notifmsg.cpp"> </File> + <File + RelativePath="..\..\src\msw\richtooltip.cpp"> + </File> <File RelativePath="..\..\src\msw\sound.cpp"> </File> @@ -665,19 +734,34 @@ RelativePath="..\..\src\msw\taskbar.cpp"> </File> <File - RelativePath="..\..\src\msw\version.rc"> + RelativePath="..\..\src\msw\timectrl.cpp"> + <FileConfiguration + Name="Universal Debug|Win32" + ExcludedFromBuild="TRUE"/> <FileConfiguration Name="Universal Release|Win32" ExcludedFromBuild="TRUE"/> <FileConfiguration - Name="Universal Debug|Win32" + Name="DLL Universal Debug|Win32" ExcludedFromBuild="TRUE"/> <FileConfiguration - Name="Release|Win32" + Name="DLL Universal Release|Win32" ExcludedFromBuild="TRUE"/> + </File> + <File + RelativePath="..\..\src\msw\version.rc"> <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="TRUE"/> + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="TRUE"/> + <FileConfiguration + Name="Universal Debug|Win32" + ExcludedFromBuild="TRUE"/> + <FileConfiguration + Name="Universal Release|Win32" + ExcludedFromBuild="TRUE"/> </File> </Filter> <Filter @@ -689,12 +773,18 @@ <File RelativePath="..\..\src\generic\animateg.cpp"> </File> + <File + RelativePath="..\..\src\generic\bannerwindow.cpp"> + </File> <File RelativePath="..\..\src\generic\bmpcboxg.cpp"> </File> <File RelativePath="..\..\src\generic\calctrlg.cpp"> </File> + <File + RelativePath="..\..\src\generic\commandlinkbuttong.cpp"> + </File> <File RelativePath="..\..\src\generic\datavgen.cpp"> </File> @@ -734,15 +824,24 @@ <File RelativePath="..\..\src\generic\propdlg.cpp"> </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\timectrlg.cpp"> + </File> <File RelativePath="..\..\src\generic\tipdlg.cpp"> </File> + <File + RelativePath="..\..\src\generic\treelist.cpp"> + </File> <File RelativePath="..\..\src\generic\wizard.cpp"> </File> @@ -753,96 +852,88 @@ <File RelativePath="..\..\include\wx\msw\setup.h"> <FileConfiguration - Name="DLL Universal Release|Win32"/> - <FileConfiguration - Name="DLL Universal Debug|Win32"/> - <FileConfiguration - Name="DLL Release|Win32"> + Name="Debug|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)""/> + 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 Debug|Win32"> + Name="Release|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)""/> + 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 Release|Win32"/> <FileConfiguration Name="Universal Debug|Win32"/> <FileConfiguration - Name="Release|Win32"> + Name="Universal Release|Win32"/> + <FileConfiguration + Name="DLL Debug|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)""/> + 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="Debug|Win32"> + Name="DLL Release|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)""/> + 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"/> </FileConfiguration> + <FileConfiguration + Name="DLL Universal Debug|Win32"/> + <FileConfiguration + Name="DLL Universal Release|Win32"/> </File> <File RelativePath="..\..\include\wx\univ\setup.h"> <FileConfiguration - Name="DLL Universal Release|Win32"> + Name="Debug|Win32"/> + <FileConfiguration + Name="Release|Win32"/> + <FileConfiguration + Name="Universal Debug|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)""/> + 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="DLL Universal Debug|Win32"> + Name="Universal Release|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\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 Release|Win32"/> <FileConfiguration Name="DLL Debug|Win32"/> <FileConfiguration - Name="Universal Release|Win32"> + Name="DLL Release|Win32"/> + <FileConfiguration + Name="DLL Universal Debug|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_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="Universal Debug|Win32"> + Name="DLL Universal Release|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\mswunivu\wx\setup.h" + CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h" + Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h"/> </FileConfiguration> - <FileConfiguration - Name="Release|Win32"/> - <FileConfiguration - Name="Debug|Win32"/> </File> </Filter> <Filter @@ -855,48 +946,42 @@ RelativePath="..\..\include\wx\msw\calctrl.h"> </File> <File - RelativePath="..\..\include\wx\msw\datecontrols.h"> + RelativePath="..\..\include\wx\msw\commandlinkbutton.h"> </File> <File RelativePath="..\..\include\wx\msw\datectrl.h"> </File> + <File + RelativePath="..\..\include\wx\msw\datetimectrl.h"> + </File> <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"> + Name="Universal Debug|Win32"> <Tool Name="VCCustomBuildTool" - Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" - CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"" - Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" - AdditionalDependencies=""..\..\lib\vc_dll\mswud\wx\msw""/> + 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"> @@ -908,33 +993,45 @@ AdditionalDependencies=""..\..\lib\vc_lib\mswunivu\wx\msw""/> </FileConfiguration> <FileConfiguration - Name="Universal Debug|Win32"> + Name="DLL 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""/> + Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_dll\mswud\wx\msw""/> </FileConfiguration> <FileConfiguration - Name="Release|Win32"> + Name="DLL 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""/> + 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> <FileConfiguration - Name="Debug|Win32"> + Name="DLL Universal Debug|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\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"> + </File> <File RelativePath="..\..\include\wx\msw\joystick.h"> </File> @@ -947,6 +1044,9 @@ <File RelativePath="..\..\include\wx\msw\taskbar.h"> </File> + <File + RelativePath="..\..\include\wx\msw\timectrl.h"> + </File> </Filter> <Filter Name="Generic Headers" @@ -969,6 +1069,12 @@ <File RelativePath="..\..\include\wx\generic\datectrl.h"> </File> + <File + RelativePath="..\..\include\wx\generic\dvrenderer.h"> + </File> + <File + RelativePath="..\..\include\wx\generic\dvrenderers.h"> + </File> <File RelativePath="..\..\include\wx\generic\grid.h"> </File> @@ -1002,6 +1108,9 @@ <File RelativePath="..\..\include\wx\generic\splash.h"> </File> + <File + RelativePath="..\..\include\wx\generic\timectrl.h"> + </File> <File RelativePath="..\..\include\wx\generic\wizard.h"> </File> @@ -1015,12 +1124,18 @@ <File RelativePath="..\..\include\wx\animate.h"> </File> + <File + RelativePath="..\..\include\wx\bannerwindow.h"> + </File> <File RelativePath="..\..\include\wx\bmpcbox.h"> </File> <File RelativePath="..\..\include\wx\calctrl.h"> </File> + <File + RelativePath="..\..\include\wx\commandlinkbutton.h"> + </File> <File RelativePath="..\..\include\wx\dataview.h"> </File> @@ -1030,9 +1145,15 @@ <File RelativePath="..\..\include\wx\dateevt.h"> </File> + <File + RelativePath="..\..\include\wx\datetimectrl.h"> + </File> <File RelativePath="..\..\include\wx\dcbuffer.h"> </File> + <File + RelativePath="..\..\include\wx\dvrenderers.h"> + </File> <File RelativePath="..\..\include\wx\editlbox.h"> </File> @@ -1057,6 +1178,9 @@ <File RelativePath="..\..\include\wx\propdlg.h"> </File> + <File + RelativePath="..\..\include\wx\richtooltip.h"> + </File> <File RelativePath="..\..\include\wx\sashwin.h"> </File> @@ -1069,9 +1193,15 @@ <File RelativePath="..\..\include\wx\taskbar.h"> </File> + <File + RelativePath="..\..\include\wx\timectrl.h"> + </File> <File RelativePath="..\..\include\wx\tipdlg.h"> </File> + <File + RelativePath="..\..\include\wx\treelist.h"> + </File> <File RelativePath="..\..\include\wx\wizard.h"> </File>