paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-25 13:39:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: project: if target file is set and apply conventions is off then always pas -o

Browse Source 
git-svn-id: trunk@48128 -
This commit is contained in:
mattias 2015-03-04 15:23:38 +00:00
parent a46cfc71b6
commit a819e545f5
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ide/compileroptions.pp
View File

@ -3098,14 +3098,17 @@ begin
if NewTargetDirectory <> '' then if NewTargetDirectory <> '' then
switches := switches + ' '+PrepareCmdLineOption('-FE' + NewTargetDirectory); switches := switches + ' '+PrepareCmdLineOption('-FE' + NewTargetDirectory);
NewTargetFileName := ExtractFileName(NewTargetFilename); NewTargetFileName := ExtractFileName(NewTargetFilename);
if (NewTargetFilename<>'') if (NewTargetFilename<>'') then
and (NewTargetFilename<>ChangeFileExt(ExtractFileName(CurMainSrcFile),GetTargetFileExt)) begin
if (not TargetFilenameApplyConventions)
or (NewTargetFilename<>ChangeFileExt(ExtractFileName(CurMainSrcFile),GetTargetFileExt))
then begin then begin
// custom target => pass -o // custom target => pass -o
switches := switches + ' '+PrepareCmdLineOption('-o' + NewTargetFileName); switches := switches + ' '+PrepareCmdLineOption('-o' + NewTargetFileName);
end; end;
end; end;
end; end;
end;
// append custom options as last, so they can override // append custom options as last, so they can override
if not (ccloNoMacroParams in Flags) then if not (ccloNoMacroParams in Flags) then