mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-08-18 01:29:21 +02:00
* Add missing CATRES substitution and remove blank lines in link.res
git-svn-id: trunk@19667 -
This commit is contained in:
parent
30baddd3b8
commit
4bda40649d
@ -351,7 +351,6 @@ begin
|
|||||||
end;
|
end;
|
||||||
|
|
||||||
{ Write and Close response }
|
{ Write and Close response }
|
||||||
linkres.Add(' ');
|
|
||||||
linkres.writetodisk;
|
linkres.writetodisk;
|
||||||
linkres.free;
|
linkres.free;
|
||||||
|
|
||||||
@ -462,6 +461,7 @@ var
|
|||||||
SplitBinCmd(Info.DllCmd[1],binstr,cmdstr);
|
SplitBinCmd(Info.DllCmd[1],binstr,cmdstr);
|
||||||
Replace(cmdstr,'$EXE',maybequoted(current_module.sharedlibfilename^));
|
Replace(cmdstr,'$EXE',maybequoted(current_module.sharedlibfilename^));
|
||||||
Replace(cmdstr,'$OPT',Info.ExtraOptions);
|
Replace(cmdstr,'$OPT',Info.ExtraOptions);
|
||||||
|
Replace(cmdstr,'$CATRES',CatFileContent(outputexedir+Info.ResName));
|
||||||
Replace(cmdstr,'$RES',maybequoted(outputexedir+Info.ResName));
|
Replace(cmdstr,'$RES',maybequoted(outputexedir+Info.ResName));
|
||||||
Replace(cmdstr,'$STATIC',StaticStr);
|
Replace(cmdstr,'$STATIC',StaticStr);
|
||||||
Replace(cmdstr,'$STRIP',StripStr);
|
Replace(cmdstr,'$STRIP',StripStr);
|
||||||
|
@ -351,7 +351,6 @@ begin
|
|||||||
end;
|
end;
|
||||||
|
|
||||||
{ Write and Close response }
|
{ Write and Close response }
|
||||||
linkres.Add(' ');
|
|
||||||
linkres.writetodisk;
|
linkres.writetodisk;
|
||||||
linkres.free;
|
linkres.free;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user