X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cdaed652d7d2b20bc9f508d45f77a280f88279d9..e1efca652844273c3e8d32c7e5f442b87e455ca7:/build/msw/wx_vc7_richtext.vcproj?ds=sidebyside
diff --git a/build/msw/wx_vc7_richtext.vcproj b/build/msw/wx_vc7_richtext.vcproj
index cce08cd91b..94ed2f5db9 100644
--- a/build/msw/wx_vc7_richtext.vcproj
+++ b/build/msw/wx_vc7_richtext.vcproj
@@ -2,7 +2,7 @@
<!--
This project was generated by
- Bakefile 0.2.8 (http://www.bakefile.org)
+ Bakefile 0.2.9 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -273,7 +273,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_richtextdll.pch"
ObjectFile="vc_mswuddll\richtext\"
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw292ud_richtext_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_richtext_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -284,13 +284,13 @@
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\wxmsw292ud_richtext_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw293ud_richtext_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_richtext.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292ud_richtext_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_richtext_vc_custom.pdb"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"
@@ -304,7 +304,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw292ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_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"/>
<Tool
@@ -338,7 +338,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_richtextdll.pch"
ObjectFile="vc_mswudll\richtext\"
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw292u_richtext_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293u_richtext_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -349,13 +349,13 @@
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\wxmsw292u_richtext_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw293u_richtext_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw29u_richtext.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292u_richtext_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_richtext_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"/>
@@ -371,7 +371,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw292u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
+ PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_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"/>
<Tool
@@ -408,7 +408,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivuddll\wxprec_richtextdll.pch"
ObjectFile="vc_mswunivuddll\richtext\"
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv292ud_richtext_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_richtext_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -419,13 +419,13 @@
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\wxmswuniv292ud_richtext_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_richtext_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_richtext.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292ud_richtext_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_richtext_vc_custom.pdb"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"
@@ -439,7 +439,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv292ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293ud_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
@@ -473,7 +473,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivudll\wxprec_richtextdll.pch"
ObjectFile="vc_mswunivudll\richtext\"
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv292u_richtext_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293u_richtext_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -484,13 +484,13 @@
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\wxmswuniv292u_richtext_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmswuniv293u_richtext_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_richtext.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292u_richtext_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_richtext_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"/>
@@ -506,7 +506,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv292u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_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
@@ -603,98 +603,90 @@
Name="Setup Headers"
UniqueIdentifier="{63537534-1833-5C1F-8DBD-359A84F294C8}">
<File
- RelativePath="..\..\include\wx\univ\setup.h">
- <FileConfiguration
- Name="Debug|Win32"/>
- <FileConfiguration
- Name="Release|Win32"/>
+ RelativePath="..\..\include\wx\msw\setup.h">
<FileConfiguration
- Name="Universal Debug|Win32">
+ Name="Debug|Win32">
<Tool
Name="VCCustomBuildTool"
- Description="Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h"
- CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h"
- Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h"
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""/>
+ Description="Creating ..\..\lib\vc_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="Universal Release|Win32">
+ Name="Release|Win32">
<Tool
Name="VCCustomBuildTool"
- Description="Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h"
- CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h"
- Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h"
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""/>
+ Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"
+ CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h"
+ Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"/>
</FileConfiguration>
<FileConfiguration
- Name="DLL Debug|Win32"/>
+ Name="Universal Debug|Win32"/>
<FileConfiguration
- Name="DLL Release|Win32"/>
+ Name="Universal Release|Win32"/>
<FileConfiguration
- Name="DLL Universal Debug|Win32">
+ Name="DLL Debug|Win32">
<Tool
Name="VCCustomBuildTool"
- Description="Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h"
- CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h"
- Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h"
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""/>
+ Description="Creating ..\..\lib\vc_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="DLL Universal Release|Win32">
+ Name="DLL 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)""/>
+ 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\msw\setup.h">
+ RelativePath="..\..\include\wx\univ\setup.h">
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"/>
+ <FileConfiguration
+ Name="Release|Win32"/>
+ <FileConfiguration
+ Name="Universal Debug|Win32">
<Tool
Name="VCCustomBuildTool"
- Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h"
- CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h"
- Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""/>
+ 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="Release|Win32">
+ Name="Universal Release|Win32">
<Tool
Name="VCCustomBuildTool"
- Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"
- CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h"
- Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""/>
+ 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="Universal Debug|Win32"/>
+ Name="DLL Debug|Win32"/>
<FileConfiguration
- Name="Universal Release|Win32"/>
+ Name="DLL Release|Win32"/>
<FileConfiguration
- Name="DLL Debug|Win32">
+ Name="DLL Universal Debug|Win32">
<Tool
Name="VCCustomBuildTool"
- Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h"
- CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h"
- Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""/>
+ 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 Release|Win32">
+ Name="DLL Universal Release|Win32">
<Tool
Name="VCCustomBuildTool"
- Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h"
- CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h"
- Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""/>
+ 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="DLL Universal Debug|Win32"/>
- <FileConfiguration
- Name="DLL Universal Release|Win32"/>
</File>
</Filter>
<Filter
@@ -779,12 +771,27 @@
<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">
</File>
@@ -794,18 +801,36 @@
<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">
</File>
<File
RelativePath="..\..\include\wx\richtext\richtextsymboldlg.h">
</File>
+ <File
+ RelativePath="..\..\include\wx\richtext\richtextuicustomization.h">
+ </File>
<File
RelativePath="..\..\include\wx\richtext\richtextxml.h">
</File>