paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-06-03 02:58:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

+ Also take resources in main program source into account

Browse Source 
git-svn-id: trunk@990 -
This commit is contained in:
michael 2005-08-31 14:12:41 +00:00
parent 9fe7ee0b81
commit a578c9b7ed
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
compiler/pmodules.pas
View File

@ -283,11 +283,13 @@ implementation
begin
hp:=tused_unit(usedunits.first);
found:=false;
While Assigned(hp) and not Found do
begin
Found:=((hp.u.flags and uf_has_resourcefiles)=uf_has_resourcefiles);
hp:=tused_unit(hp.next);
end;
Found:=((current_module.flags and uf_has_resourcefiles)=uf_has_resourcefiles);
If not found then
While Assigned(hp) and not Found do
begin
Found:=((hp.u.flags and uf_has_resourcefiles)=uf_has_resourcefiles);
hp:=tused_unit(hp.next);
end;
ResourceInfo:=TAAsmOutput.Create;
if found then
begin

15
compiler/systems/t_linux.pas
View File

@ -660,13 +660,16 @@ begin
postprocessexecutable:=True;
if target_res.id=res_elf then
begin
hp:=tused_unit(usedunits.first);
found:=false;
While Assigned(hp) and not Found do
found:=((current_module.flags and uf_has_resourcefiles)=uf_has_resourcefiles);
if not found then
begin
Found:=((hp.u.flags and uf_has_resourcefiles)=uf_has_resourcefiles);
hp:=tused_unit(hp.next);
end;
hp:=tused_unit(usedunits.first);
While Assigned(hp) and not Found do
begin
Found:=((hp.u.flags and uf_has_resourcefiles)=uf_has_resourcefiles);
hp:=tused_unit(hp.next);
end;
end;
if found then
begin
cmdstr:=' -f -i '+maybequoted(fn);