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

* Improved finding of resource compiler during cross-compilation.

Browse Source 
git-svn-id: trunk@10745 -
This commit is contained in:
yury 2008-04-21 11:13:13 +00:00
parent 8f985fbdee
commit ba081ab36f
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compiler/comprsrc.pas
View File

@ -165,12 +165,18 @@ begin
if utilsdirectory<>'' then if utilsdirectory<>'' then
resfound:=FindFile(utilsprefix+bin+source_info.exeext,utilsdirectory,false,resbin); resfound:=FindFile(utilsprefix+bin+source_info.exeext,utilsdirectory,false,resbin);
if not resfound then if not resfound then
resfound:=FindExe(utilsprefix+bin,false,resbin); begin
resfound:=FindExe(utilsprefix+bin,false,resbin);
if not resfound and (utilsprefix<>'') and ( (output=roRES) or (Pos('$ARCH', target_res.rescmd)<>0) ) then
{ Search for resource compiler without utilsprefix, if RC->RES compiler is called }
{ or RES->OBJ compiler supports different architectures. }
resfound:=FindExe(bin,false,resbin);
end;
{ get also the path to be searched for the windres.h } { get also the path to be searched for the windres.h }
respath:=ExtractFilePath(resbin); respath:=ExtractFilePath(resbin);
if (not resfound) and not(cs_link_nolink in current_settings.globalswitches) then if (not resfound) and not(cs_link_nolink in current_settings.globalswitches) then
begin begin
Message1(exec_e_res_not_found, bin); Message1(exec_e_res_not_found, utilsprefix+bin+source_info.exeext);
current_settings.globalswitches:=current_settings.globalswitches+[cs_link_nolink]; current_settings.globalswitches:=current_settings.globalswitches+[cs_link_nolink];
Result:=false; Result:=false;
end; end;