mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-08-14 17:09:10 +02:00
* Merge is complete for this file, cycles !
This commit is contained in:
parent
f37082e5ca
commit
a8bf3670d5
@ -29,7 +29,11 @@ unit aggas;
|
|||||||
interface
|
interface
|
||||||
|
|
||||||
uses
|
uses
|
||||||
|
{$IFDEF USE_SYSUTILS}
|
||||||
|
SysUtils,
|
||||||
|
{$ELSE USE_SYSUTILS}
|
||||||
dos,
|
dos,
|
||||||
|
{$ENDIF USE_SYSUTILS}
|
||||||
cclasses,
|
cclasses,
|
||||||
globals,
|
globals,
|
||||||
aasmbase,aasmtai,aasmcpu,
|
aasmbase,aasmtai,aasmcpu,
|
||||||
@ -71,11 +75,10 @@ implementation
|
|||||||
fmodule,finput,verbose,
|
fmodule,finput,verbose,
|
||||||
itcpugas
|
itcpugas
|
||||||
{$ifdef GDB}
|
{$ifdef GDB}
|
||||||
{$ifdef delphi}
|
{$IFDEF USE_SYSUTILS}
|
||||||
,sysutils
|
{$ELSE USE_SYSUTILS}
|
||||||
{$else}
|
|
||||||
,strings
|
,strings
|
||||||
{$endif}
|
{$ENDIF USE_SYSUTILS}
|
||||||
,gdb
|
,gdb
|
||||||
{$endif GDB}
|
{$endif GDB}
|
||||||
;
|
;
|
||||||
@ -916,7 +919,15 @@ var
|
|||||||
LastInfile:=nil;
|
LastInfile:=nil;
|
||||||
|
|
||||||
if assigned(current_module.mainsource) then
|
if assigned(current_module.mainsource) then
|
||||||
|
{$IFDEF USE_SYSUTILS}
|
||||||
|
begin
|
||||||
|
p := SplitPath(current_module.mainsource^);
|
||||||
|
n := SplitName(current_module.mainsource^);
|
||||||
|
e := SplitExtension(current_module.mainsource^);
|
||||||
|
end
|
||||||
|
{$ELSE USE_SYSUTILS}
|
||||||
fsplit(current_module.mainsource^,p,n,e)
|
fsplit(current_module.mainsource^,p,n,e)
|
||||||
|
{$ENDIF USE_SYSUTILS}
|
||||||
else
|
else
|
||||||
begin
|
begin
|
||||||
p:=inputdir;
|
p:=inputdir;
|
||||||
@ -969,7 +980,10 @@ var
|
|||||||
end.
|
end.
|
||||||
{
|
{
|
||||||
$Log$
|
$Log$
|
||||||
Revision 1.59 2004-09-26 17:45:29 peter
|
Revision 1.60 2004-10-14 16:49:14 mazen
|
||||||
|
* Merge is complete for this file, cycles !
|
||||||
|
|
||||||
|
Revision 1.59 2004/09/26 17:45:29 peter
|
||||||
* simple regvar support, not yet finished
|
* simple regvar support, not yet finished
|
||||||
|
|
||||||
Revision 1.58 2004/08/27 20:53:52 peter
|
Revision 1.58 2004/08/27 20:53:52 peter
|
||||||
|
Loading…
Reference in New Issue
Block a user