* fixed parameter orderning

This commit is contained in:
peter 1999-12-10 10:03:54 +00:00
parent 23c127a58e
commit 768200b8d0

View File

@ -47,7 +47,7 @@ type
procedure IllegalPara(const opt:string); procedure IllegalPara(const opt:string);
function Unsetbool(const opts:string; pos: Longint):boolean; function Unsetbool(const opts:string; pos: Longint):boolean;
procedure interpret_proc_specific_options(const opt:string);virtual; procedure interpret_proc_specific_options(const opt:string);virtual;
procedure interpret_option(const opt :string); procedure interpret_option(const opt :string;ispara:boolean);
procedure Interpret_envvar(const envname : string); procedure Interpret_envvar(const envname : string);
procedure Interpret_file(const filename : string); procedure Interpret_file(const filename : string);
procedure Read_Parameters; procedure Read_Parameters;
@ -327,7 +327,7 @@ begin
end; end;
procedure TOption.interpret_option(const opt:string); procedure TOption.interpret_option(const opt:string;ispara:boolean);
var var
code : integer; code : integer;
c : char; c : char;
@ -504,28 +504,28 @@ begin
'D' : utilsdirectory:=FixPath(More,true); 'D' : utilsdirectory:=FixPath(More,true);
'e' : SetRedirectFile(More); 'e' : SetRedirectFile(More);
'E' : OutputExeDir:=FixPath(More,true); 'E' : OutputExeDir:=FixPath(More,true);
'i' : if firstpass then 'i' : if ispara then
includesearchpath.AddPath(More,false) ParaIncludePath.AddPath(More,false)
else else
ParaIncludePath.AddPath(More,false); includesearchpath.AddPath(More,false);
'g' : Message2(option_obsolete_switch_use_new,'-Fg','-Fl'); 'g' : Message2(option_obsolete_switch_use_new,'-Fg','-Fl');
'l' : if firstpass then 'l' : if ispara then
LibrarySearchPath.AddPath(More,false) ParaLibraryPath.AddPath(More,false)
else else
ParaLibraryPath.AddPath(More,false); LibrarySearchPath.AddPath(More,false);
'L' : if More<>'' then 'L' : if More<>'' then
ParaDynamicLinker:=More ParaDynamicLinker:=More
else else
IllegalPara(opt); IllegalPara(opt);
'o' : if firstpass then 'o' : if ispara then
ObjectSearchPath.AddPath(More,false) ParaObjectPath.AddPath(More,false)
else else
ParaObjectPath.AddPath(More,false); ObjectSearchPath.AddPath(More,false);
'r' : Msgfilename:=More; 'r' : Msgfilename:=More;
'u' : if firstpass then 'u' : if ispara then
unitsearchpath.AddPath(More,false) ParaUnitPath.AddPath(More,false)
else else
ParaUnitPath.AddPath(More,false); unitsearchpath.AddPath(More,false);
'U' : OutputUnitDir:=FixPath(More,true); 'U' : OutputUnitDir:=FixPath(More,true);
else else
IllegalPara(opt); IllegalPara(opt);
@ -593,10 +593,10 @@ begin
IllegalPara(Opt); IllegalPara(Opt);
end; end;
end; end;
'I' : if firstpass then 'I' : if ispara then
includesearchpath.AddPath(More,false) ParaIncludePath.AddPath(More,false)
else else
ParaIncludePath.AddPath(More,false); includesearchpath.AddPath(More,false);
'k' : if more<>'' then 'k' : if more<>'' then
ParaLinkOptions:=ParaLinkOptions+' '+More ParaLinkOptions:=ParaLinkOptions+' '+More
else else
@ -937,7 +937,7 @@ begin
else else
begin begin
if (not skip[level]) and (opts[1]='-') then if (not skip[level]) and (opts[1]='-') then
interpret_option(opts) interpret_option(opts,false)
end; end;
end; end;
end; end;
@ -984,7 +984,7 @@ begin
arglen:=pc-argstart; arglen:=pc-argstart;
hs[0]:=chr(arglen); hs[0]:=chr(arglen);
move(argstart^,hs[1],arglen); move(argstart^,hs[1],arglen);
interpret_option(hs); interpret_option(hs,true);
{ skip quote } { skip quote }
if pc^ in quote then if pc^ in quote then
inc(pc); inc(pc);
@ -1019,7 +1019,7 @@ begin
interpret_envvar(opts); interpret_envvar(opts);
end; end;
else else
interpret_option(opts); interpret_option(opts,true);
end; end;
end; end;
end; end;
@ -1055,7 +1055,7 @@ begin
interpret_envvar(opts); interpret_envvar(opts);
end; end;
else else
interpret_option(opts); interpret_option(opts,true);
end; end;
end; end;
end; end;
@ -1332,7 +1332,10 @@ end;
end. end.
{ {
$Log$ $Log$
Revision 1.40 1999-12-08 10:40:01 pierre Revision 1.41 1999-12-10 10:03:54 peter
* fixed parameter orderning
Revision 1.40 1999/12/08 10:40:01 pierre
+ allow use of unit var in exports of DLL for win32 + allow use of unit var in exports of DLL for win32
by using direct export writing by default instead of use of DEFFILE by using direct export writing by default instead of use of DEFFILE
that does not allow assembler labels that do not that does not allow assembler labels that do not