paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-17 15:49:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

* little corrections for EMX resources

Browse Source
This commit is contained in:
Tomas Hajny 2000-06-28 03:34:06 +00:00
parent 6673c39beb
commit c0a5cca16b
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
compiler/link.pas
View File

@ -35,10 +35,10 @@ uses cobjects,files;
Type Type
TLinkerInfo=record TLinkerInfo=record
ExeCmd, ExeCmd,
DllCmd : array[1..3] of string[80]; DllCmd : array[1..3] of string[100];
ResName : string[12]; ResName : string[12];
ExtraOptions : string; ExtraOptions : string;
DynamicLinker : string[80]; DynamicLinker : string[100];
end; end;
PLinker=^TLinker; PLinker=^TLinker;
@ -521,7 +521,10 @@ end;
end. end.
{ {
$Log$ $Log$
Revision 1.88 2000-05-17 18:30:35 peter Revision 1.89 2000-06-28 03:34:06 hajny
* little corrections for EMX resources
Revision 1.88 2000/05/17 18:30:35 peter
* removed wrong warning for library finding * removed wrong warning for library finding
Revision 1.87 2000/05/03 16:11:57 peter Revision 1.87 2000/05/03 16:11:57 peter

19
compiler/t_os2.pas
View File

@ -451,14 +451,18 @@ begin
Message1(exec_i_linking,current_module^.exefilename^); Message1(exec_i_linking,current_module^.exefilename^);
{ Create some replacements } { Create some replacements }
StripStr:='';
PMStr:='';
if (cs_link_strip in aktglobalswitches) then if (cs_link_strip in aktglobalswitches) then
StripStr:='-s'; StripStr := '-s'
else
StripStr := '';
if usewindowapi then if usewindowapi then
PMStr:='-p'; PMStr := '-p'
else
PMStr := '';
if not (Current_Module^.ResourceFiles.Empty) then if not (Current_Module^.ResourceFiles.Empty) then
RsrcStr := '-r ' + Current_Module^.ResourceFiles.Get; RsrcStr := '-r ' + Current_Module^.ResourceFiles.Get
else
RsrcStr := '';
(* Only one resource file supported, discard everything else (* Only one resource file supported, discard everything else
(should be already empty anyway, however. *) (should be already empty anyway, however. *)
Current_Module^.ResourceFiles.Clear; Current_Module^.ResourceFiles.Clear;
@ -503,7 +507,10 @@ end;
end. end.
{ {
$Log$ $Log$
Revision 1.12 2000-06-25 19:08:28 hajny Revision 1.13 2000-06-28 03:34:06 hajny
* little corrections for EMX resources
Revision 1.12 2000/06/25 19:08:28 hajny
+ $R support for OS/2 (EMX) added + $R support for OS/2 (EMX) added
Revision 1.11 2000/04/01 10:45:14 hajny Revision 1.11 2000/04/01 10:45:14 hajny