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

+ added a TOS parameter to TTarget.GetUnitLibFileName

Browse Source 
- rm the TTarget.UnitLibFileName property, as GetUnitLibFileName is now a
  function of TOS

git-svn-id: trunk@25645 -
This commit is contained in:
nickysn 2013-10-05 12:13:11 +00:00
parent 1bea98995b
commit a19a9ef9cc
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/fpmkunit/src/fpmkunit.pp
View File

@ -543,7 +543,7 @@ Type
Protected Protected
Function GetSourceFileName : String; virtual; Function GetSourceFileName : String; virtual;
Function GetUnitFileName : String; virtual; Function GetUnitFileName : String; virtual;
function GetUnitLibFileName: String; virtual; function GetUnitLibFileName(AOS: TOS): String; virtual;
Function GetObjectFileName : String; virtual; Function GetObjectFileName : String; virtual;
Function GetRSTFileName : String; Virtual; Function GetRSTFileName : String; Virtual;
function GetImportLibFileName(AOS : TOS) : String; Virtual; function GetImportLibFileName(AOS : TOS) : String; Virtual;
@ -570,7 +570,6 @@ Type
Property Options : TStrings Read GetOptions Write SetOptions; Property Options : TStrings Read GetOptions Write SetOptions;
Property SourceFileName: String Read GetSourceFileName ; Property SourceFileName: String Read GetSourceFileName ;
Property UnitFileName : String Read GetUnitFileName; Property UnitFileName : String Read GetUnitFileName;
Property UnitLibFileName : String Read GetUnitLibFileName;
Property ObjectFileName : String Read GetObjectFileName; Property ObjectFileName : String Read GetObjectFileName;
Property RSTFileName : String Read GetRSTFileName; Property RSTFileName : String Read GetRSTFileName;
Property FPCTarget : String Read FFPCTarget Write FFPCTarget; Property FPCTarget : String Read FFPCTarget Write FFPCTarget;
@ -7126,7 +7125,7 @@ begin
result := GetImportLibraryFilename(Name,AOS); result := GetImportLibraryFilename(Name,AOS);
end; end;
function TTarget.GetUnitLibFileName: String; function TTarget.GetUnitLibFileName(AOS : TOS): String;
begin begin
Result:='libp'+Name+LibExt; Result:='libp'+Name+LibExt;
end; end;
@ -7215,8 +7214,8 @@ begin
If (TargetType in [ttUnit,ttImplicitUnit,ttExampleUnit, ttCleanOnlyUnit]) then If (TargetType in [ttUnit,ttImplicitUnit,ttExampleUnit, ttCleanOnlyUnit]) then
begin begin
List.Add(APrefixU + UnitFileName); List.Add(APrefixU + UnitFileName);
if (AOS in AllSmartLinkLibraryOSes) and FileExists(APrefixU + UnitLibFileName) then if (AOS in AllSmartLinkLibraryOSes) and FileExists(APrefixU + GetUnitLibFileName(AOS)) then
List.Add(APrefixU + UnitLibFileName); List.Add(APrefixU + GetUnitLibFileName(AOS));
if (AOS in AllImportLibraryOSes) and FileExists(APrefixU + GetImportLibFilename(AOS)) then if (AOS in AllImportLibraryOSes) and FileExists(APrefixU + GetImportLibFilename(AOS)) then
List.Add(APrefixU + GetImportLibFilename(AOS)); List.Add(APrefixU + GetImportLibFilename(AOS));
end end
@ -7240,8 +7239,8 @@ begin
If (TargetType in [ttUnit,ttImplicitUnit,ttExampleUnit]) then If (TargetType in [ttUnit,ttImplicitUnit,ttExampleUnit]) then
begin begin
List.Add(APrefixU + UnitFileName); List.Add(APrefixU + UnitFileName);
if (AOS in AllSmartLinkLibraryOSes) and FileExists(APrefixU + UnitLibFileName) then if (AOS in AllSmartLinkLibraryOSes) and FileExists(APrefixU + GetUnitLibFileName(AOS)) then
List.Add(APrefixU + UnitLibFileName); List.Add(APrefixU + GetUnitLibFileName(AOS));
if (AOS in AllImportLibraryOSes) and FileExists(APrefixU + GetImportLibFilename(AOS)) then if (AOS in AllImportLibraryOSes) and FileExists(APrefixU + GetImportLibFilename(AOS)) then
List.Add(APrefixU + GetImportLibFilename(AOS)); List.Add(APrefixU + GetImportLibFilename(AOS));
end end