X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/95ff11c4bb0b4a58f86f096871489b5723e2102c..866a7cd7caa8470f456b4868374c9a692943dd3e:/build/msw/wx_vc8_richtext.vcproj diff --git a/build/msw/wx_vc8_richtext.vcproj b/build/msw/wx_vc8_richtext.vcproj index 9409300db7..e4b1aaca1e 100644 --- a/build/msw/wx_vc8_richtext.vcproj +++ b/build/msw/wx_vc8_richtext.vcproj @@ -2,7 +2,7 @@ <!-- This project was generated by - Bakefile 0.2.6 (http://www.bakefile.org) + Bakefile 0.2.9 (http://www.bakefile.org) Do not modify, all changes will be overwritten! --> @@ -44,14 +44,14 @@ /> <Tool Name="VCMIDLTool" - PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__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="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__;__WXDEBUG__;_UNICODE;WXBUILDING" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING" MinimalRebuild="true" ExceptionHandling="1" BasicRuntimeChecks="3" @@ -62,7 +62,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswud\wxprec_richtextlib.pch" ObjectFile="vc_mswud\richtext\" - ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_richtext.pdb" + ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw30ud_richtext.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -73,7 +73,7 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING" + PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__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" /> @@ -82,7 +82,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\lib\vc_lib\wxmsw29ud_richtext.lib" + OutputFile="..\..\lib\vc_lib\wxmsw30ud_richtext.lib" SuppressStartupBanner="true" /> <Tool @@ -129,14 +129,14 @@ /> <Tool Name="VCMIDLTool" - PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE;WXBUILDING" + PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__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="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" - PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE;WXBUILDING" + PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING" ExceptionHandling="1" RuntimeLibrary="2" RuntimeTypeInfo="true" @@ -144,7 +144,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswu\wxprec_richtextlib.pch" ObjectFile="vc_mswu\richtext\" - ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_richtext.pdb" + ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw30u_richtext.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -155,7 +155,7 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING" Culture="1033" AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" /> @@ -164,174 +164,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\lib\vc_lib\wxmsw29u_richtext.lib" - SuppressStartupBanner="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - OutputFile="..\..\lib\vc_lib\wx_vc8_richtext.bsc" - SuppressStartupBanner="true" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Universal Debug|Win32" - OutputDirectory="..\..\lib\vc_lib" - IntermediateDirectory="vc_mswunivud\richtext" - ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING" - AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" - /> - <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__;__WXDEBUG__;_UNICODE;WXBUILDING" - MinimalRebuild="true" - ExceptionHandling="1" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - BufferSecurityCheck="true" - RuntimeTypeInfo="true" - UsePrecompiledHeader="2" - PrecompiledHeaderThrough="wx/wxprec.h" - PrecompiledHeaderFile="vc_mswunivud\wxprec_richtextlib.pch" - ObjectFile="vc_mswunivud\richtext\" - ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_richtext.pdb" - WarningLevel="4" - SuppressStartupBanner="true" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_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="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_richtext.lib" - SuppressStartupBanner="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - OutputFile="..\..\lib\vc_lib\wx_vc8_richtext.bsc" - SuppressStartupBanner="true" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Universal Release|Win32" - OutputDirectory="..\..\lib\vc_lib" - IntermediateDirectory="vc_mswunivu\richtext" - ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING" - AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" - /> - <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__;_UNICODE;WXBUILDING" - ExceptionHandling="1" - RuntimeLibrary="2" - RuntimeTypeInfo="true" - UsePrecompiledHeader="2" - PrecompiledHeaderThrough="wx/wxprec.h" - PrecompiledHeaderFile="vc_mswunivu\wxprec_richtextlib.pch" - ObjectFile="vc_mswunivu\richtext\" - ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_richtext.pdb" - WarningLevel="4" - SuppressStartupBanner="true" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_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="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\lib\vc_lib\wxmswuniv29u_richtext.lib" + OutputFile="..\..\lib\vc_lib\wxmsw30u_richtext.lib" SuppressStartupBanner="true" /> <Tool @@ -378,14 +211,14 @@ /> <Tool Name="VCMIDLTool" - PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT" AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" /> <Tool 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="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT" MinimalRebuild="true" ExceptionHandling="1" BasicRuntimeChecks="3" @@ -396,7 +229,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_richtextdll.pch" ObjectFile="vc_mswuddll\richtext\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290ud_richtext_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw30ud_richtext_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -407,7 +240,7 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT" + PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT" Culture="1033" AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" /> @@ -417,15 +250,15 @@ <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_adv.lib ..\..\lib\vc_dll\wxmsw29ud_html.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw290ud_richtext_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\wxmsw30ud_adv.lib ..\..\lib\vc_dll\wxmsw30ud_html.lib ..\..\lib\vc_dll\wxbase30ud_xml.lib ..\..\lib\vc_dll\wxmsw30ud_core.lib ..\..\lib\vc_dll\wxbase30ud.lib" + OutputFile="..\..\lib\vc_dll\wxmsw30ud_richtext_vc_custom.dll" LinkIncremental="2" - ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_richtext.lib" + ImportLibrary="..\..\lib\vc_dll\wxmsw30ud_richtext.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290ud_richtext_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw30ud_richtext_vc_custom.pdb" TargetMachine="1" /> <Tool @@ -472,14 +305,14 @@ /> <Tool Name="VCMIDLTool" - PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT" AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" /> <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="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT" ExceptionHandling="1" RuntimeLibrary="2" RuntimeTypeInfo="true" @@ -487,7 +320,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswudll\wxprec_richtextdll.pch" ObjectFile="vc_mswudll\richtext\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290u_richtext_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw30u_richtext_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -498,7 +331,7 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT" Culture="1033" AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" /> @@ -508,201 +341,18 @@ <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_adv.lib ..\..\lib\vc_dll\wxmsw29u_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw290u_richtext_vc_custom.dll" - LinkIncremental="2" - ImportLibrary="..\..\lib\vc_dll\wxmsw29u_richtext.lib" + 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\wxmsw30u_adv.lib ..\..\lib\vc_dll\wxmsw30u_html.lib ..\..\lib\vc_dll\wxbase30u_xml.lib ..\..\lib\vc_dll\wxmsw30u_core.lib ..\..\lib\vc_dll\wxbase30u.lib" + OutputFile="..\..\lib\vc_dll\wxmsw30u_richtext_vc_custom.dll" + LinkIncremental="1" + ImportLibrary="..\..\lib\vc_dll\wxmsw30u_richtext.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290u_richtext_vc_custom.pdb" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - OutputFile="..\..\lib\vc_dll\wx_vc8_richtext.bsc" - SuppressStartupBanner="true" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="DLL Universal Debug|Win32" - OutputDirectory="..\..\lib\vc_dll" - IntermediateDirectory="vc_mswunivuddll\richtext" - ConfigurationType="2" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT" - AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" - /> - <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__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT" - MinimalRebuild="true" - ExceptionHandling="1" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - BufferSecurityCheck="true" - RuntimeTypeInfo="true" - UsePrecompiledHeader="2" - PrecompiledHeaderThrough="wx/wxprec.h" - PrecompiledHeaderFile="vc_mswunivuddll\wxprec_richtextdll.pch" - ObjectFile="vc_mswunivuddll\richtext\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290ud_richtext_vc_custom.pdb" - WarningLevel="4" - SuppressStartupBanner="true" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT" - Culture="1033" - AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <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_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_html.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_richtext_vc_custom.dll" - LinkIncremental="2" - ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_richtext.lib" - SuppressStartupBanner="true" - AdditionalLibraryDirectories="..\..\lib\vc_dll" - GenerateManifest="true" - GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290ud_richtext_vc_custom.pdb" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - OutputFile="..\..\lib\vc_dll\wx_vc8_richtext.bsc" - SuppressStartupBanner="true" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="DLL Universal Release|Win32" - OutputDirectory="..\..\lib\vc_dll" - IntermediateDirectory="vc_mswunivudll\richtext" - ConfigurationType="2" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT" - AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" - /> - <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__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT" - ExceptionHandling="1" - RuntimeLibrary="2" - RuntimeTypeInfo="true" - UsePrecompiledHeader="2" - PrecompiledHeaderThrough="wx/wxprec.h" - PrecompiledHeaderFile="vc_mswunivudll\wxprec_richtextdll.pch" - ObjectFile="vc_mswunivudll\richtext\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290u_richtext_vc_custom.pdb" - WarningLevel="4" - SuppressStartupBanner="true" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT" - Culture="1033" - AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <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_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv290u_richtext_vc_custom.dll" - LinkIncremental="2" - ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_richtext.lib" - SuppressStartupBanner="true" - AdditionalLibraryDirectories="..\..\lib\vc_dll" - GenerateManifest="true" - GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290u_richtext_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw30u_richtext_vc_custom.pdb" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> <Tool Name="VCALinkTool" @@ -753,22 +403,6 @@ 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" > @@ -785,22 +419,6 @@ 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> </Filter> <Filter @@ -818,80 +436,12 @@ Name="Release|Win32" ExcludedFromBuild="true" /> - <FileConfiguration - Name="Universal Debug|Win32" - ExcludedFromBuild="true" - /> - <FileConfiguration - Name="Universal Release|Win32" - ExcludedFromBuild="true" - /> </File> </Filter> <Filter Name="Setup Headers" UniqueIdentifier="{63537534-1833-5C1F-8DBD-359A84F294C8}" > - <File - RelativePath="..\..\include\wx\univ\setup.h" - > - <FileConfiguration - 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> <File RelativePath="..\..\include\wx\msw\setup.h" > @@ -903,7 +453,6 @@ Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h" CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h" Outputs="..\..\lib\vc_lib\mswud\wx\setup.h" - AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)"" /> </FileConfiguration> <FileConfiguration @@ -914,15 +463,8 @@ Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h" CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h" Outputs="..\..\lib\vc_lib\mswu\wx\setup.h" - AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)"" /> </FileConfiguration> - <FileConfiguration - Name="Universal Debug|Win32" - /> - <FileConfiguration - Name="Universal Release|Win32" - /> <FileConfiguration Name="DLL Debug|Win32" > @@ -931,7 +473,6 @@ 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)"" /> </FileConfiguration> <FileConfiguration @@ -942,14 +483,23 @@ Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h" CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h" Outputs="..\..\lib\vc_dll\mswu\wx\setup.h" - AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)"" /> </FileConfiguration> + </File> + <File + RelativePath="..\..\include\wx\univ\setup.h" + > <FileConfiguration - Name="DLL Universal Debug|Win32" + Name="Debug|Win32" /> <FileConfiguration - Name="DLL Universal Release|Win32" + Name="Release|Win32" + /> + <FileConfiguration + Name="DLL Debug|Win32" + /> + <FileConfiguration + Name="DLL Release|Win32" /> </File> </Filter> @@ -982,28 +532,6 @@ 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" > @@ -1026,42 +554,40 @@ 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> </Filter> <Filter Name="Common Headers" UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}" > + <File + RelativePath="..\..\include\wx\richtext\richtextbackgroundpage.h" + > + </File> + <File + RelativePath="..\..\include\wx\richtext\richtextborderspage.h" + > + </File> <File RelativePath="..\..\include\wx\richtext\richtextbuffer.h" > </File> + <File + RelativePath="..\..\include\wx\richtext\richtextbulletspage.h" + > + </File> <File RelativePath="..\..\include\wx\richtext\richtextctrl.h" > </File> + <File + RelativePath="..\..\include\wx\richtext\richtextdialogpage.h" + > + </File> + <File + RelativePath="..\..\include\wx\richtext\richtextfontpage.h" + > + </File> <File RelativePath="..\..\include\wx\richtext\richtextformatdlg.h" > @@ -1070,14 +596,38 @@ RelativePath="..\..\include\wx\richtext\richtexthtml.h" > </File> + <File + RelativePath="..\..\include\wx\richtext\richtextimagedlg.h" + > + </File> + <File + RelativePath="..\..\include\wx\richtext\richtextindentspage.h" + > + </File> + <File + RelativePath="..\..\include\wx\richtext\richtextliststylepage.h" + > + </File> + <File + RelativePath="..\..\include\wx\richtext\richtextmarginspage.h" + > + </File> <File RelativePath="..\..\include\wx\richtext\richtextprint.h" > </File> + <File + RelativePath="..\..\include\wx\richtext\richtextsizepage.h" + > + </File> <File RelativePath="..\..\include\wx\richtext\richtextstyledlg.h" > </File> + <File + RelativePath="..\..\include\wx\richtext\richtextstylepage.h" + > + </File> <File RelativePath="..\..\include\wx\richtext\richtextstyles.h" > @@ -1086,10 +636,22 @@ RelativePath="..\..\include\wx\richtext\richtextsymboldlg.h" > </File> + <File + RelativePath="..\..\include\wx\richtext\richtexttabspage.h" + > + </File> + <File + RelativePath="..\..\include\wx\richtext\richtextuicustomization.h" + > + </File> <File RelativePath="..\..\include\wx\richtext\richtextxml.h" > </File> + <File + RelativePath="..\..\include\wx\xrc\xh_richtext.h" + > + </File> </Filter> <Filter Name="Source Files" @@ -1112,6 +674,10 @@ RelativePath="..\..\src\richtext\richtexthtml.cpp" > </File> + <File + RelativePath="..\..\src\richtext\richtextimagedlg.cpp" + > + </File> <File RelativePath="..\..\src\richtext\richtextprint.cpp" > @@ -1132,6 +698,10 @@ RelativePath="..\..\src\richtext\richtextxml.cpp" > </File> + <File + RelativePath="..\..\src\xrc\xh_richtext.cpp" + > + </File> </Filter> </Files> <Globals>