* Use maybequote instead of getshortname

This commit is contained in:
peter 2002-12-24 15:55:51 +00:00
parent e28f8bb42b
commit b1241ee6dc

View File

@ -895,13 +895,13 @@ begin
HPath:=TStringListItem(current_module.locallibrarysearchpath.First); HPath:=TStringListItem(current_module.locallibrarysearchpath.First);
while assigned(HPath) do while assigned(HPath) do
begin begin
LinkRes.Add('SEARCH_DIR('+GetShortName(HPath.Str)+')'); LinkRes.Add('SEARCH_DIR('+MaybeQuoted(HPath.Str)+')');
HPath:=TStringListItem(HPath.Next); HPath:=TStringListItem(HPath.Next);
end; end;
HPath:=TStringListItem(LibrarySearchPath.First); HPath:=TStringListItem(LibrarySearchPath.First);
while assigned(HPath) do while assigned(HPath) do
begin begin
LinkRes.Add('SEARCH_DIR('+GetShortName(HPath.Str)+')'); LinkRes.Add('SEARCH_DIR('+MaybeQuoted(HPath.Str)+')');
HPath:=TStringListItem(HPath.Next); HPath:=TStringListItem(HPath.Next);
end; end;
@ -909,17 +909,17 @@ begin
{ profiling of shared libraries is currently not supported } { profiling of shared libraries is currently not supported }
LinkRes.Add('INPUT('); LinkRes.Add('INPUT(');
if isdll then if isdll then
LinkRes.AddFileName(GetShortName(FindObjectFile('wdllprt0',''))) LinkRes.AddFileName(MaybeQuoted(FindObjectFile('wdllprt0','')))
else else
if (cs_profile in aktmoduleswitches) then if (cs_profile in aktmoduleswitches) then
LinkRes.AddFileName(GetShortName(FindObjectFile('gprt0',''))) LinkRes.AddFileName(MaybeQuoted(FindObjectFile('gprt0','')))
else else
LinkRes.AddFileName(GetShortName(FindObjectFile('wprt0',''))); LinkRes.AddFileName(MaybeQuoted(FindObjectFile('wprt0','')));
while not ObjectFiles.Empty do while not ObjectFiles.Empty do
begin begin
s:=ObjectFiles.GetFirst; s:=ObjectFiles.GetFirst;
if s<>'' then if s<>'' then
LinkRes.AddFileName(GetShortName(s)); LinkRes.AddFileName(MaybeQuoted(s));
end; end;
LinkRes.Add(')'); LinkRes.Add(')');
@ -939,7 +939,7 @@ begin
While not StaticLibFiles.Empty do While not StaticLibFiles.Empty do
begin begin
S:=StaticLibFiles.GetFirst; S:=StaticLibFiles.GetFirst;
LinkRes.AddFileName(GetShortName(s)); LinkRes.AddFileName(MaybeQuoted(s));
end; end;
LinkRes.Add(')'); LinkRes.Add(')');
end; end;
@ -953,7 +953,7 @@ begin
S:=SharedLibFiles.GetFirst; S:=SharedLibFiles.GetFirst;
if FindLibraryFile(s,target_info.staticClibprefix,target_info.staticClibext,s2) then if FindLibraryFile(s,target_info.staticClibprefix,target_info.staticClibext,s2) then
begin begin
LinkRes.Add(GetShortName(s2)); LinkRes.Add(MaybeQuoted(s2));
continue; continue;
end; end;
if pos(target_info.sharedlibprefix,s)=1 then if pos(target_info.sharedlibprefix,s)=1 then
@ -1625,7 +1625,10 @@ initialization
end. end.
{ {
$Log$ $Log$
Revision 1.8 2002-12-01 18:57:34 carl Revision 1.9 2002-12-24 15:55:51 peter
* Use maybequote instead of getshortname
Revision 1.8 2002/12/01 18:57:34 carl
* disable overflow checking in some parts to avoid problems * disable overflow checking in some parts to avoid problems
Revision 1.7 2002/11/30 18:45:28 carl Revision 1.7 2002/11/30 18:45:28 carl