--- Merging r29410 into '.':

U    packages/fppkg/src/fpmkunitsrc.inc
--- Merging r29411 into '.':
U    utils/fpcmkcfg/fpmake.pp
U    utils/fpdoc/fpmake.pp

# revisions: 29410,29411

git-svn-id: branches/fixes_3_0@29415 -
This commit is contained in:
marco 2015-01-05 13:52:40 +00:00
parent e831fde4b6
commit f65f2d23d3
3 changed files with 8961 additions and 8369 deletions

File diff suppressed because it is too large Load Diff

View File

@ -39,7 +39,6 @@ begin
p.Commands.AddCommand(caBeforeCompile, Data2IncBin, '-b -s default.cft default.inc fppkg_default','default.inc','default.cft');
T:=P.Targets.AddProgram('fpcmkcfg.pp');
T.ResourceStrings:=true;
T.Dependencies.AddInclude('fpccfg.inc');
T.Dependencies.AddInclude('fpcfg.inc');
T.Dependencies.AddInclude('fpini.inc');

View File

@ -56,9 +56,7 @@ begin
T.Dependencies.AddUnit('dglobals');
T:=P.Targets.AddProgram('unitdiff.pp');
T.ResourceStrings:=true;
T:=P.Targets.AddProgram('fpclasschart.pp');
T.ResourceStrings:=true;
T := P.Targets.AddUnit('dglobals.pp');
T.install:=false;