- removed 1.0 defines

+ call ld with -E

git-svn-id: trunk@1932 -
This commit is contained in:
florian 2005-12-11 23:11:21 +00:00
parent fb8e885a94
commit 479ad6d88a

View File

@ -24,11 +24,7 @@
Program ppumove; Program ppumove;
uses uses
{$ifdef unix} {$ifdef unix}
{$ifdef ver1_0}
linux,
{$else}
Baseunix,Unix, UnixUtil, Baseunix,Unix, UnixUtil,
{$endif}
{$else unix} {$else unix}
dos, dos,
{$endif unix} {$endif unix}
@ -114,7 +110,7 @@ begin
exit; exit;
end; end;
{$ifdef unix} {$ifdef unix}
Shell:={$ifdef ver1_0}linux{$else}unix{$endif}.shell(s); Shell:=unix.shell(s);
{$else} {$else}
exec(getenv('COMSPEC'),'/C '+s); exec(getenv('COMSPEC'),'/C '+s);
Shell:=DosExitCode; Shell:=DosExitCode;
@ -134,7 +130,7 @@ Var
{$endif} {$endif}
begin begin
{$ifdef unix} {$ifdef unix}
FileExists:={$ifdef VER1_0}FStat{$ELSE}FpStat{$endif} (F,Info){$ifndef VER1_0}=0{$endif}; FileExists:=FpStat(F,Info)=0;
{$else} {$else}
FindFirst (F,anyfile,Info); FindFirst (F,anyfile,Info);
FileExists:=DosError=0; FileExists:=DosError=0;
@ -478,7 +474,7 @@ begin
Err:=Shell(arbin+' rs '+outputfile+' '+names)<>0 Err:=Shell(arbin+' rs '+outputfile+' '+names)<>0
else else
begin begin
Err:=Shell(ldbin+' -shared -o '+OutputFile+' '+names+' '+libs)<>0; Err:=Shell(ldbin+' -shared -E -o '+OutputFile+' '+names+' '+libs)<>0;
if (not Err) and dostrip then if (not Err) and dostrip then
Shell(stripbin+' --strip-unneeded '+OutputFile); Shell(stripbin+' --strip-unneeded '+OutputFile);
end; end;
@ -486,7 +482,7 @@ begin
Error('Fatal: Library building stage failed.',true); Error('Fatal: Library building stage failed.',true);
{ fix permission to 644, so it's not 755 } { fix permission to 644, so it's not 755 }
{$ifdef unix} {$ifdef unix}
{$ifdef VER1_0}ChMod{$ELSE}FPChmod{$endif}(OutputFile,420); FPChmod(OutputFile,420);
{$endif} {$endif}
{ Rename to the destpath } { Rename to the destpath }
if DestPath<>'' then if DestPath<>'' then
@ -621,7 +617,7 @@ begin
Writeln('Writing pmove'+BatchExt); Writeln('Writing pmove'+BatchExt);
Close(BatchFile); Close(BatchFile);
{$ifdef unix} {$ifdef unix}
{$ifdef VER1_0}ChMod{$ELSE}FPChmod{$endif}('pmove'+BatchExt,493); FPChmod('pmove'+BatchExt,493);
{$endif} {$endif}
end; end;
{ The End } { The End }