* Patch from Martok to fix compilation using build project (Bug ID 32322)

git-svn-id: trunk@37046 -
This commit is contained in:
michael 2017-08-24 08:11:15 +00:00
parent a8aab3ea97
commit 164778b020
3 changed files with 15 additions and 16 deletions

4
.gitattributes vendored
View File

@ -3425,8 +3425,8 @@ packages/fcl-web/tests/uhpacktest1.pas svneol=native#text/plain
packages/fcl-xml/Makefile svneol=native#text/plain packages/fcl-xml/Makefile svneol=native#text/plain
packages/fcl-xml/Makefile.fpc svneol=native#text/plain packages/fcl-xml/Makefile.fpc svneol=native#text/plain
packages/fcl-xml/Makefile.fpc.fpcmake svneol=native#text/plain packages/fcl-xml/Makefile.fpc.fpcmake svneol=native#text/plain
packages/fcl-xml/buildfcl-xml.lpi svneol=native#text/plain packages/fcl-xml/buildfclxml.lpi svneol=native#text/plain
packages/fcl-xml/buildfcl-xml.pp svneol=native#text/plain packages/fcl-xml/buildfclxml.pp svneol=native#text/plain
packages/fcl-xml/fpmake.pp svneol=native#text/plain packages/fcl-xml/fpmake.pp svneol=native#text/plain
packages/fcl-xml/src/README.txt svneol=native#text/plain packages/fcl-xml/src/README.txt svneol=native#text/plain
packages/fcl-xml/src/dom.pp svneol=native#text/plain packages/fcl-xml/src/dom.pp svneol=native#text/plain

View File

@ -1,7 +1,7 @@
<?xml version="1.0"?> <?xml version="1.0" encoding="UTF-8"?>
<CONFIG> <CONFIG>
<ProjectOptions> <ProjectOptions>
<Version Value="7"/> <Version Value="10"/>
<General> <General>
<Flags> <Flags>
<MainUnitHasUsesSectionForAllUnits Value="False"/> <MainUnitHasUsesSectionForAllUnits Value="False"/>
@ -12,12 +12,11 @@
</Flags> </Flags>
<SessionStorage Value="InProjectDir"/> <SessionStorage Value="InProjectDir"/>
<MainUnit Value="0"/> <MainUnit Value="0"/>
<TargetFileExt Value=".exe"/>
<Title Value="buildrtl"/> <Title Value="buildrtl"/>
</General> </General>
<VersionInfo> <BuildModes Count="1">
<ProjectVersion Value=""/> <Item1 Name="default" Default="True"/>
</VersionInfo> </BuildModes>
<PublishOptions> <PublishOptions>
<Version Value="2"/> <Version Value="2"/>
<IgnoreBinaries Value="False"/> <IgnoreBinaries Value="False"/>
@ -32,30 +31,30 @@
</RunParams> </RunParams>
<Units Count="1"> <Units Count="1">
<Unit0> <Unit0>
<Filename Value="buildfcl-xml.pp"/> <Filename Value="buildfclxml.pp"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="buildrtl"/>
</Unit0> </Unit0>
</Units> </Units>
</ProjectOptions> </ProjectOptions>
<CompilerOptions> <CompilerOptions>
<Version Value="8"/> <Version Value="11"/>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="src/"/> <IncludeFiles Value="src"/>
<OtherUnitFiles Value="src/"/> <OtherUnitFiles Value="src"/>
<UnitOutputDirectory Value="units/$(TargetCPU)-$(TargetOS)"/> <UnitOutputDirectory Value="units/$(TargetCPU)-$(TargetOS)"/>
</SearchPaths> </SearchPaths>
<Parsing> <Parsing>
<Style Value="2"/> <Style Value="2"/>
<SyntaxOptions>
<UseAnsiStrings Value="False"/>
</SyntaxOptions>
</Parsing> </Parsing>
<Other> <Other>
<Verbosity> <Verbosity>
<ShowNotes Value="False"/> <ShowNotes Value="False"/>
<ShowHints Value="False"/> <ShowHints Value="False"/>
</Verbosity> </Verbosity>
<CompilerPath Value="$(CompPath)"/>
<ExecuteBefore> <ExecuteBefore>
<Command Value="cmd.exe /c &quot;if not exist units/$(TargetCPU)-$(TargetOS) mkdir units/$(TargetCPU)-$(TargetOS)&quot;"/>
<ShowAllMessages Value="True"/> <ShowAllMessages Value="True"/>
</ExecuteBefore> </ExecuteBefore>
</Other> </Other>

View File

@ -6,7 +6,7 @@ unit buildfclxml;
uses uses
htmldefs, sax, xmlutils, dom, sax_html, dom_html, xmlcfg, xmlread, htmldefs, sax, xmlutils, dom, sax_html, dom_html, xmlcfg, xmlread,
xmlstreaming, xmlwrite, xhtml, htmwrite, xpath, htmlelements, htmlwriter, xmlstreaming, xmlwrite, xhtml, htmwrite, xpath, htmlelements, htmlwriter,
xmlconf, sax_xml, xmliconv; xmlconf, sax_xml;
implementation implementation