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

* Fixed .res resources handling when -o switch is used to specify executable full path and name in the same folder where .res files are located. Mantis #12856.

Browse Source 
git-svn-id: trunk@12437 -
This commit is contained in:
yury 2008-12-25 10:14:34 +00:00
parent a3732f5cfc
commit 69d1b4813c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/comprsrc.pas
View File

@ -397,7 +397,7 @@ begin
if (target_info.res<>res_none) and (target_res.resourcefileclass=nil) then if (target_info.res<>res_none) and (target_res.resourcefileclass=nil) then
exit; exit;
p:=ExtractFilePath(current_module.mainsource^); p:=ExtractFilePath(ExpandFileName(current_module.mainsource^));
res:=TCmdStrListItem(current_module.ResourceFiles.First); res:=TCmdStrListItem(current_module.ResourceFiles.First);
while res<>nil do while res<>nil do
begin begin
@ -416,7 +416,7 @@ begin
if resourcefile.IsCompiled(s) then if resourcefile.IsCompiled(s) then
begin begin
resourcefile.free; resourcefile.free;
if AnsiCompareText(current_module.outputpath^, p) <> 0 then if AnsiCompareFileName(IncludeTrailingPathDelimiter(ExpandFileName(current_module.outputpath^)), p) <> 0 then
begin begin
{ Copy .res file to units output dir. Otherwise .res file will not be found { Copy .res file to units output dir. Otherwise .res file will not be found
when only compiled units path is available } when only compiled units path is available }