paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-11-01 13:49:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

* filename fixes for win32 imports for units with multiple needed dll's

Browse Source
This commit is contained in:
peter 1999-11-08 10:37:12 +00:00
parent 1bb66bbb68
commit df694c76e8
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
compiler/assemble.pas
View File

@ -49,6 +49,7 @@ type
objfile, objfile,
as_bin : string; as_bin : string;
SmartAsm : boolean; SmartAsm : boolean;
smarthcount : longint;
place : TCutPlace; { special 'end' file for import dir ? } place : TCutPlace; { special 'end' file for import dir ? }
{outfile} {outfile}
AsmSize, AsmSize,
@ -255,11 +256,14 @@ begin
Message(asmw_f_too_many_asm_files); Message(asmw_f_too_many_asm_files);
case place of case place of
cut_begin : cut_begin :
s:=current_module^.asmprefix^+'h'; begin
inc(smarthcount);
s:=current_module^.asmprefix^+tostr(smarthcount)+'h';
end;
cut_normal : cut_normal :
s:=current_module^.asmprefix^+'s'; s:=current_module^.asmprefix^+tostr(smarthcount)+'s';
cut_end : cut_end :
s:=current_module^.asmprefix^+'t'; s:=current_module^.asmprefix^+tostr(smarthcount)+'t';
end; end;
AsmFile:=Path+FixFileName(s+tostr(SmartLinkFilesCnt)+target_info.asmext); AsmFile:=Path+FixFileName(s+tostr(SmartLinkFilesCnt)+target_info.asmext);
ObjFile:=Path+FixFileName(s+tostr(SmartLinkFilesCnt)+target_info.objext); ObjFile:=Path+FixFileName(s+tostr(SmartLinkFilesCnt)+target_info.objext);
@ -433,6 +437,7 @@ begin
SmartLinkFilesCnt:=0; SmartLinkFilesCnt:=0;
place:=cut_normal; place:=cut_normal;
SmartAsm:=smart; SmartAsm:=smart;
SmartHCount:=0;
{ Which path will be used ? } { Which path will be used ? }
if SmartAsm then if SmartAsm then
begin begin
@ -559,7 +564,10 @@ end;
end. end.
{ {
$Log$ $Log$
Revision 1.56 1999-11-06 14:34:17 peter Revision 1.57 1999-11-08 10:37:12 peter
* filename fixes for win32 imports for units with multiple needed dll's
Revision 1.56 1999/11/06 14:34:17 peter
* truncated log to 20 revs * truncated log to 20 revs
Revision 1.55 1999/11/02 15:06:57 peter Revision 1.55 1999/11/02 15:06:57 peter

16
compiler/og386.pas
View File

@ -57,6 +57,7 @@ unit og386;
pobjectoutput = ^tobjectoutput; pobjectoutput = ^tobjectoutput;
tobjectoutput = object tobjectoutput = object
smarthcount : longint;
objsmart : boolean; objsmart : boolean;
writer : pobjectwriter; writer : pobjectwriter;
path : pathstr; path : pathstr;
@ -155,6 +156,7 @@ unit og386;
var var
i : longint; i : longint;
begin begin
smarthcount:=0;
objsmart:=smart; objsmart:=smart;
objfile:=current_module^.objfilename^; objfile:=current_module^.objfilename^;
{ Which path will be used ? } { Which path will be used ? }
@ -198,11 +200,14 @@ unit og386;
s:=current_module^.modulename^; s:=current_module^.modulename^;
case place of case place of
cut_begin : cut_begin :
s:=s+'h'; begin
inc(smarthcount);
s:=s+tostr(smarthcount)+'h';
end;
cut_normal : cut_normal :
s:=s+'s'; s:=s+tostr(smarthcount)+'s';
cut_end : cut_end :
s:=s+'t'; s:=s+tostr(smarthcount)+'t';
end; end;
ObjFile:=Path+FixFileName(s+tostr(SmartLinkFilesCnt)+target_info.objext) ObjFile:=Path+FixFileName(s+tostr(SmartLinkFilesCnt)+target_info.objext)
end; end;
@ -270,7 +275,10 @@ unit og386;
end. end.
{ {
$Log$ $Log$
Revision 1.14 1999-11-06 14:34:21 peter Revision 1.15 1999-11-08 10:37:12 peter
* filename fixes for win32 imports for units with multiple needed dll's
Revision 1.14 1999/11/06 14:34:21 peter
* truncated log to 20 revs * truncated log to 20 revs
Revision 1.13 1999/11/02 15:06:57 peter Revision 1.13 1999/11/02 15:06:57 peter