emelie/tidy-html5
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #57 from johnweldon/master

Browse source 
Better MSVC 2010 fix for CleanGoogleDocument unresolved externals.
This commit is contained in:
Michael[tm] Smith 2012-07-20 21:33:19 -07:00
parent 79439b0b9e 46e8e9d254
commit 08c12634e9
3 changed files with 37 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
build/msvc2010/tidydll.vcxproj
View file

@ -273,6 +273,12 @@
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\gdoc.c">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="tidy.def" /> <None Include="tidy.def" />
@ -302,6 +308,7 @@
<ClInclude Include="..\..\src\utf8.h" /> <ClInclude Include="..\..\src\utf8.h" />
<ClInclude Include="..\..\src\version.h" /> <ClInclude Include="..\..\src\version.h" />
<ClInclude Include="..\..\src\win32tc.h" /> <ClInclude Include="..\..\src\win32tc.h" />
<ClInclude Include="..\..\src\gdoc.h" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">

8
build/msvc2010/tidylib.vcxproj
View file

@ -270,6 +270,13 @@
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\gdoc.c">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<UndefinePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\src\access.h" /> <ClInclude Include="..\..\src\access.h" />
@ -296,6 +303,7 @@
<ClInclude Include="..\..\src\utf8.h" /> <ClInclude Include="..\..\src\utf8.h" />
<ClInclude Include="..\..\src\version.h" /> <ClInclude Include="..\..\src\version.h" />
<ClInclude Include="..\..\src\win32tc.h" /> <ClInclude Include="..\..\src\win32tc.h" />
<ClInclude Include="..\..\src\gdoc.h" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">

3
src/tidylib.c
View file

@ -1281,7 +1281,7 @@ int tidyDocCleanAndRepair( TidyDocImpl* doc )
TY_(CleanDocument)( doc ); TY_(CleanDocument)( doc );
/* clean up html exported by Google Focs */ /* clean up html exported by Google Focs */
#if 0 #if 1
if ( gdoc ) if ( gdoc )
TY_(CleanGoogleDocument)( doc ); TY_(CleanGoogleDocument)( doc );
#endif #endif
@ -1404,7 +1404,6 @@ int tidyDocSaveStream( TidyDocImpl* doc, StreamOut* out )
{ {
/* noop */ /* noop */
TY_(DropFontElements)(doc, &doc->root, NULL); TY_(DropFontElements)(doc, &doc->root, NULL);
TY_(WbrToSpace)(doc, &doc->root);
} }
if ((makeClean && asciiChars) || makeBare) if ((makeClean && asciiChars) || makeBare)