From: DeaDDooMER <deaddoomer@deadsoftware.ru>
Date: Mon, 20 Jul 2020 17:02:01 +0000 (+0300)
Subject: cpmake: pass more info to build script
X-Git-Url: http://deadsoftware.ru/gitweb?p=cpc.git;a=commitdiff_plain;h=3f567c7517241b0f2e08aeea6a4f4f1cae275a27

cpmake: pass more info to build script
---

diff --git a/src/generic/Dsw/Mod/MakeMain.cp b/src/generic/Dsw/Mod/MakeMain.cp
index 5c84f52..8247999 100644
--- a/src/generic/Dsw/Mod/MakeMain.cp
+++ b/src/generic/Dsw/Mod/MakeMain.cp
@@ -29,7 +29,8 @@ MODULE DswMakeMain;
     module = 75; eof = 76;
 
     (* module state flags *)
-    imported = 0; trace = 1; hasObj = 2; hasSym = 3; hasErrors = 4; library = 5;
+    imported = 0; trace = 1; hasObj = 2; hasSym = 3; hasErrors = 4;
+    library = 5; force = 6;
 
     debugImport = FALSE;
     debugOrder = FALSE;
@@ -350,6 +351,7 @@ MODULE DswMakeMain;
     ParseModule(m);
     DevCPR.Check;
     ok := DevCPM.noerr;
+    IF DevCPR.used THEN INCL(m.flags, force) END;
     DevCPR.Close;
     DevCPM.InsertMarks;
     DevCPM.Close;
@@ -521,6 +523,14 @@ MODULE DswMakeMain;
     p := DswProcs.dir.New();
     p.Program(base + "/" + target + "/" + "build");
     p.PutParam(m.odc);
+    IF force IN m.flags THEN p.PutParam("-f") END;
+    IF library IN m.flags THEN p.PutParam("-s") END;
+    s := def.next;
+    WHILE s # NIL DO
+      IF s.value THEN p.PutParam("-D") ELSE p.PutParam("-d") END;
+      p.PutParam(s.name$);
+      s := s.next
+    END;
     RETURN p
   END PrepareCompiler;