Browse Source

* Hopefully fix compilation of hash package for msdos

(cherry picked from commit 7bdf6672b5cf9c3f0b3d766e7665493f9d7fa882)
Michaël Van Canneyt 3 years ago
parent
commit
b6af3f31d5

+ 0 - 1
packages/fcl-base/fpmake.pp

@@ -139,7 +139,6 @@ begin
     P.Sources.AddSrcFiles('src/win/fclel.*', P.Directory);
     // Install windows resources
     P.InstallFiles.Add('src/win/fclel.res',AllWindowsOSes,'$(unitinstalldir)');
-    T:=P.Targets.AddUnit('basenenc.pp');
 
     // Examples
     P.ExamplePath.Add('examples');

+ 8 - 6
packages/rtl-extra/fpmake.pp

@@ -104,12 +104,6 @@ begin
     if (Defaults.CPU<>i8086) or (Defaults.OS<>embedded) then
       T:=P.Targets.AddUnit('ucomplex.pp',UComplexOSes);
 
-    T:=P.Targets.AddUnit('objects.pp',ObjectsOSes);
-
-    T:=P.Targets.AddUnit('printer.pp',PrinterOSes);
-    T.Dependencies.AddInclude('printerh.inc',PrinterOSes);
-    T.Dependencies.AddInclude('printer.inc',PrinterOSes);
-
     { Ideally, we should check if rtl contians math unit,
       I do know how that can be checked. PM 2019/11/27 }
     if (Defaults.CPU<>i8086) or (Defaults.OS<>embedded) then
@@ -121,6 +115,14 @@ begin
             AddInclude('mmatimp.inc');
           end;
       end;
+
+    T:=P.Targets.AddUnit('objects.pp',ObjectsOSes);
+    T:=P.Targets.AddUnit('basenenc.pp');
+
+    T:=P.Targets.AddUnit('printer.pp',PrinterOSes);
+    T.Dependencies.AddInclude('printerh.inc',PrinterOSes);
+    T.Dependencies.AddInclude('printer.inc',PrinterOSes);
+
     T:=P.Targets.AddUnit('winsock.pp',WinSockOSes);
     with T.Dependencies do
      begin

+ 0 - 0
packages/fcl-base/src/basenenc.pp → packages/rtl-extra/src/inc/basenenc.pp