re-enabled ext constraint only if outputFilename is guessed

This commit is contained in:
Basile Burg 2014-12-20 17:35:30 +01:00
parent 31732d751b
commit 47f460d31a
1 changed files with 8 additions and 7 deletions

View File

@ -444,20 +444,21 @@ begin
// try to guess // try to guess
else if Sources.Count > 0 then else if Sources.Count > 0 then
begin begin
// ideally, main() should be searched for, when project type is executable
fOutputFilename := extractFilename(Sources.Strings[0]); fOutputFilename := extractFilename(Sources.Strings[0]);
fOutputFilename := stripFileExt(fOutputFilename); fOutputFilename := stripFileExt(fOutputFilename);
if FileExists(fileName) then if FileExists(fileName) then
fOutputFilename := extractFilePath(fileName) + fOutputFilename fOutputFilename := extractFilePath(fileName) + fOutputFilename
else else
fOutputFilename := GetTempDir(false) + fOutputFilename; fOutputFilename := GetTempDir(false) + fOutputFilename;
end;
// force extension // force extension
//case currentConfiguration.outputOptions.binaryKind of case currentConfiguration.outputOptions.binaryKind of
// executable: fOutputFilename := ChangeFileExt(fOutputFilename, exeExt); executable: fOutputFilename := ChangeFileExt(fOutputFilename, exeExt);
// staticlib: fOutputFilename := ChangeFileExt(fOutputFilename, libExt); staticlib: fOutputFilename := ChangeFileExt(fOutputFilename, libExt);
// sharedlib: fOutputFilename := ChangeFileExt(fOutputFilename, dynExt); sharedlib: fOutputFilename := ChangeFileExt(fOutputFilename, dynExt);
// obj: fOutputFilename := ChangeFileExt(fOutputFilename, objExt); obj: fOutputFilename := ChangeFileExt(fOutputFilename, objExt);
//end; end;
end;
// //
fCanBeRun := false; fCanBeRun := false;
if currentConfiguration.outputOptions.binaryKind = executable then if currentConfiguration.outputOptions.binaryKind = executable then