Browse Source

* Dependencies for utils to compile to webassembly

Michaël Van Canneyt 1 year ago
parent
commit
652d41a70a
3 changed files with 11 additions and 7 deletions
  1. 1 1
      packages/pastojs/fpmake.pp
  2. 1 1
      utils/fpmake.pp
  3. 9 5
      utils/pas2js/fpmake.pp

+ 1 - 1
packages/pastojs/fpmake.pp

@@ -28,7 +28,7 @@ begin
     P.Dependencies.Add('fcl-js');
     P.Dependencies.Add('fcl-json');
     P.Dependencies.Add('fcl-passrc');
-    P.Dependencies.Add('fcl-process');
+    P.Dependencies.Add('fcl-process',AllUnixOSes+AllBSDOSes+AllWindowsOSes-[WinCE]);
     Defaults.Options.Add('-Sc');
 
     P.Author := 'Free Pascal development team';

+ 1 - 1
utils/fpmake.pp

@@ -54,7 +54,7 @@ begin
     begin
     P:=AddPackage('utils');
     P.ShortName := 'utils';
-    P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,sinclairql,wasi];
+    P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,sinclairql];
     if Defaults.CPU=jvm then
       P.OSes := P.OSes - [java,android];
 

+ 9 - 5
utils/pas2js/fpmake.pp

@@ -11,6 +11,10 @@ uses
 
 procedure add_pas2js(const ADirectory: string);
 
+Const
+  DefaultOSes = AllUnixOSes+AllBSDOSes+AllWindowsOSes-[WinCE];
+  AllPas2JSOses = DefaultOSes+[wasi];
+
 Var
   P : TPackage;
   PT,T : TTarget;
@@ -30,21 +34,21 @@ begin
 
     P.Directory:=ADirectory;
     P.Version:='3.3.1';
-    P.OSes:=AllUnixOSes+AllBSDOSes+AllWindowsOSes-[WinCE];
+    P.OSes:=AllPas2JSOses;
     if Defaults.CPU=jvm then
       P.OSes := P.OSes - [java,android];
     P.Dependencies.Add('fcl-json');
     P.Dependencies.Add('fcl-js');
     P.Dependencies.Add('fcl-passrc');
     P.Dependencies.Add('pastojs');
-    P.Dependencies.Add('fcl-web');
+    P.Dependencies.Add('fcl-web',DefaultOSes);
     P.Dependencies.Add('webidl');
     PT:=P.Targets.AddProgram('pas2js.pp');
     PT:=P.Targets.AddLibrary('pas2jslib.pp');
-    PT:=P.Targets.AddUnit('dirwatch.pp');
-    PT:=P.Targets.AddUnit('httpcompiler.pp');
+    PT:=P.Targets.AddUnit('dirwatch.pp',DefaultOSes);
+    PT:=P.Targets.AddUnit('httpcompiler.pp',DefaultOSes);
     PT.Dependencies.AddUnit('dirwatch');
-    PT:=P.Targets.AddProgram('compileserver.pp');
+    PT:=P.Targets.AddProgram('compileserver.pp',DefaultOSes);
     PT.Dependencies.AddUnit('httpcompiler');
     PT:=P.Targets.AddProgram('webidl2pas.pp');
     PT:=P.Targets.AddProgram('dts2pas.pp');