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

* support ! in import file names for netware also

Browse Source
This commit is contained in:
armin 2005-01-01 20:08:59 +00:00
parent 67de07c897
commit 53f6eb9216
1 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
compiler/systems/t_nwm.pas
View File

@ -293,7 +293,7 @@ begin
if i>0 then if i>0 then
Delete(ProgNam,i,255); Delete(ProgNam,i,255);
NlmNam := ProgNam + target_info.exeext; NlmNam := ProgNam + target_info.exeext;
{ Open link.res file } { Open link.res file }
LinkRes:=TLinkRes.Create(outputexedir+Info.ResName); {for ld} LinkRes:=TLinkRes.Create(outputexedir+Info.ResName); {for ld}
NLMConvLinkFile:=TLinkRes.Create(outputexedir+'n'+Info.ResName); {for nlmconv, written in CreateExeFile} NLMConvLinkFile:=TLinkRes.Create(outputexedir+'n'+Info.ResName); {for nlmconv, written in CreateExeFile}
@ -433,17 +433,30 @@ begin
i:=Pos(target_info.sharedlibext,S); i:=Pos(target_info.sharedlibext,S);
if i>0 then if i>0 then
Delete(S,i,255); Delete(S,i,255);
S := S + '.imp'; if s[1] = '!' then
librarysearchpath.FindFile(S,S3); begin // special, with ! only the imp will be included but no module is autoloaded, needed i.e. for netware.imp
{$ifdef netware} S := copy(S,2,255) + '.imp';
Comment(V_Debug,'IMPORT @'+S3); librarysearchpath.FindFile(S,S3);
S3 := FExpand (S3); {$ifdef netware}
{$endif} Comment(V_Debug,'IMPORT @'+S3);
NLMConvLinkFile.Add('IMPORT @'+S3); S3 := FExpand (S3);
NLMConvLinkFile.Add('MODULE '+s2); {$endif}
Comment(V_Debug,'MODULE '+S2); NLMConvLinkFile.Add('IMPORT @'+S3);
Comment(V_Debug,'IMPORT @'+S3); Comment(V_Debug,'IMPORT @'+S3);
end end else
begin
S := S + '.imp';
librarysearchpath.FindFile(S,S3);
{$ifdef netware}
Comment(V_Debug,'IMPORT @'+S3);
S3 := FExpand (S3);
{$endif}
NLMConvLinkFile.Add('IMPORT @'+S3);
NLMConvLinkFile.Add('MODULE '+s2);
Comment(V_Debug,'MODULE '+S2);
Comment(V_Debug,'IMPORT @'+S3);
end;
end;
end; end;
end; end;
@ -564,7 +577,10 @@ initialization
end. end.
{ {
$Log$ $Log$
Revision 1.23 2004-12-22 16:32:46 peter Revision 1.24 2005-01-01 20:08:59 armin
* support ! in import file names for netware also
Revision 1.23 2004/12/22 16:32:46 peter
* maybequoted() added * maybequoted() added
Revision 1.22 2004/11/25 18:46:11 armin Revision 1.22 2004/11/25 18:46:11 armin