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

git-svn-id: trunk@48128 -
This commit is contained in:
mattias 2015-03-04 15:23:38 +00:00
parent a46cfc71b6
commit a819e545f5

View File

@ -3098,11 +3098,14 @@ begin
if NewTargetDirectory <> '' then
switches := switches + ' '+PrepareCmdLineOption('-FE' + NewTargetDirectory);
NewTargetFileName := ExtractFileName(NewTargetFilename);
if (NewTargetFilename<>'')
and (NewTargetFilename<>ChangeFileExt(ExtractFileName(CurMainSrcFile),GetTargetFileExt))
then begin
// custom target => pass -o
switches := switches + ' '+PrepareCmdLineOption('-o' + NewTargetFileName);
if (NewTargetFilename<>'') then
begin
if (not TargetFilenameApplyConventions)
or (NewTargetFilename<>ChangeFileExt(ExtractFileName(CurMainSrcFile),GetTargetFileExt))
then begin
// custom target => pass -o
switches := switches + ' '+PrepareCmdLineOption('-o' + NewTargetFileName);
end;
end;
end;
end;