<!--\r
\r
This project was generated by\r
- Bakefile 0.2.8 (http://www.bakefile.org)\r
+ Bakefile 0.2.9 (http://www.bakefile.org)\r
Do not modify, all changes will be overwritten!\r
\r
-->\r
PrecompiledHeaderThrough="wx/wxprec.h"\r
PrecompiledHeaderFile="vc_mswuddll\wxprec_htmldll.pch"\r
ObjectFile="vc_mswuddll\html\"\r
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw291ud_html_vc_custom.pdb"\r
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_html_vc_custom.pdb"\r
WarningLevel="4"\r
SuppressStartupBanner="true"\r
DebugInformationFormat="3"\r
/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw291ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"\r
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"\r
Culture="1033"\r
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
/>\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalOptions=""\r
- 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"\r
- OutputFile="..\..\lib\vc_dll\wxmsw291ud_html_vc_custom.dll"\r
+ 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"\r
+ OutputFile="..\..\lib\vc_dll\wxmsw293ud_html_vc_custom.dll"\r
LinkIncremental="2"\r
ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_html.lib"\r
SuppressStartupBanner="true"\r
AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
GenerateManifest="true"\r
GenerateDebugInformation="true"\r
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291ud_html_vc_custom.pdb"\r
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_html_vc_custom.pdb"\r
TargetMachine="1"\r
/>\r
<Tool\r
PrecompiledHeaderThrough="wx/wxprec.h"\r
PrecompiledHeaderFile="vc_mswudll\wxprec_htmldll.pch"\r
ObjectFile="vc_mswudll\html\"\r
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw291u_html_vc_custom.pdb"\r
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293u_html_vc_custom.pdb"\r
WarningLevel="4"\r
SuppressStartupBanner="true"\r
DebugInformationFormat="3"\r
/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw291u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"\r
+ PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"\r
Culture="1033"\r
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
/>\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalOptions=""\r
- 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"\r
- OutputFile="..\..\lib\vc_dll\wxmsw291u_html_vc_custom.dll"\r
+ 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"\r
+ OutputFile="..\..\lib\vc_dll\wxmsw293u_html_vc_custom.dll"\r
LinkIncremental="1"\r
ImportLibrary="..\..\lib\vc_dll\wxmsw29u_html.lib"\r
SuppressStartupBanner="true"\r
AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
GenerateManifest="true"\r
GenerateDebugInformation="true"\r
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291u_html_vc_custom.pdb"\r
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_html_vc_custom.pdb"\r
TargetMachine="1"\r
OptimizeReferences="2"\r
EnableCOMDATFolding="2"\r
PrecompiledHeaderThrough="wx/wxprec.h"\r
PrecompiledHeaderFile="vc_mswunivuddll\wxprec_htmldll.pch"\r
ObjectFile="vc_mswunivuddll\html\"\r
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv291ud_html_vc_custom.pdb"\r
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_html_vc_custom.pdb"\r
WarningLevel="4"\r
SuppressStartupBanner="true"\r
DebugInformationFormat="3"\r
/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv291ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"\r
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"\r
Culture="1033"\r
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
/>\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalOptions=""\r
- 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"\r
- OutputFile="..\..\lib\vc_dll\wxmswuniv291ud_html_vc_custom.dll"\r
+ 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"\r
+ OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_html_vc_custom.dll"\r
LinkIncremental="2"\r
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_html.lib"\r
SuppressStartupBanner="true"\r
AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
GenerateManifest="true"\r
GenerateDebugInformation="true"\r
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291ud_html_vc_custom.pdb"\r
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_html_vc_custom.pdb"\r
TargetMachine="1"\r
/>\r
<Tool\r
PrecompiledHeaderThrough="wx/wxprec.h"\r
PrecompiledHeaderFile="vc_mswunivudll\wxprec_htmldll.pch"\r
ObjectFile="vc_mswunivudll\html\"\r
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv291u_html_vc_custom.pdb"\r
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293u_html_vc_custom.pdb"\r
WarningLevel="4"\r
SuppressStartupBanner="true"\r
DebugInformationFormat="3"\r
/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv291u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"\r
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"\r
Culture="1033"\r
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
/>\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalOptions=""\r
- 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"\r
- OutputFile="..\..\lib\vc_dll\wxmswuniv291u_html_vc_custom.dll"\r
+ 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"\r
+ OutputFile="..\..\lib\vc_dll\wxmswuniv293u_html_vc_custom.dll"\r
LinkIncremental="1"\r
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_html.lib"\r
SuppressStartupBanner="true"\r
AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
GenerateManifest="true"\r
GenerateDebugInformation="true"\r
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291u_html_vc_custom.pdb"\r
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_html_vc_custom.pdb"\r
TargetMachine="1"\r
OptimizeReferences="2"\r
EnableCOMDATFolding="2"\r
RelativePath="..\..\src\html\m_pre.cpp"\r
>\r
</File>\r
+ <File\r
+ RelativePath="..\..\src\html\m_span.cpp"\r
+ >\r
+ </File>\r
<File\r
RelativePath="..\..\src\html\m_style.cpp"\r
>\r
RelativePath="..\..\src\html\m_tables.cpp"\r
>\r
</File>\r
+ <File\r
+ RelativePath="..\..\src\html\styleparams.cpp"\r
+ >\r
+ </File>\r
<File\r
RelativePath="..\..\src\html\winpars.cpp"\r
>\r
Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h"\r
CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h"\r
Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"\r
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"\r
CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h"\r
Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"\r
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h"\r
CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h"\r
Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"\r
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h"\r
CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h"\r
Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"\r
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
Description="Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
Description="Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
Description="Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
Description="Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""\r
/>\r
</FileConfiguration>\r
</File>\r
RelativePath="..\..\include\wx\html\m_templ.h"\r
>\r
</File>\r
+ <File\r
+ RelativePath="..\..\include\wx\html\styleparams.h"\r
+ >\r
+ </File>\r
<File\r
RelativePath="..\..\include\wx\html\winpars.h"\r
>\r