X-Git-Url: https://deadsoftware.ru/gitweb?p=cpc.git;a=blobdiff_plain;f=make.sh;h=f7dab7da7822f842c5088647d1f7a00c78d487f9;hp=0cd0960b2c308f9b724d2acb7e667d4f595493cf;hb=f96102d32aebccddc1cc7bcf295ba4c833e29a46;hpb=2f6052eb7f36254f3f459addb169dd7c07786cf7

diff --git a/make.sh b/make.sh
index 0cd0960..f7dab7d 100755
--- a/make.sh
+++ b/make.sh
@@ -189,7 +189,7 @@ compile_all() {
       Posix/Mod/Csys_stat.cp Posix/Mod/Cfcntl.cp Posix/Mod/Cerrno.cp \
       Posix/Mod/Ciconv.cp Posix/Mod/Cwctype.cp Posix/Mod/Csys_mman.cp \
       Posix/Mod/Cdlfcn.cp Posix/Mod/Csignal.cp Posix/Mod/Csetjmp.cp \
-      Posix/Mod/Clibgen.cp \
+      Posix/Mod/Clibgen.cp Posix/Mod/Csys_wait.cp \
       Posix/Mod/Cmacro.cp
     if [ "$_target" = "cpfront" ]; then
       compile Lib/Mod/FFI.cp
@@ -227,9 +227,9 @@ compile_all() {
   ### Compile Dev subsystem ###
   ###_______________________###
 
-  compile Dev/Mod/CPM.cp Dev/Mod/CPT.odc Dev/Mod/CPS.odc Dev/Mod/CPB.odc \
-    Dev/Mod/CPP.odc Dev/Mod/CPE.odc Dev/Mod/CPH.odc Dev/Mod/CPL486.odc \
-    Dev/Mod/CPC486.odc Dev/Mod/CPV486.odc
+  compile Dev/Mod/CPM.cp Dev/Mod/CPT.odc Dev/Mod/CPR.cp Dev/Mod/CPS.odc \
+    Dev/Mod/CPB.odc Dev/Mod/CPP.odc Dev/Mod/CPE.odc Dev/Mod/CPH.odc \
+    Dev/Mod/CPL486.odc Dev/Mod/CPC486.odc Dev/Mod/CPV486.odc
 
   ###^^^^^^^^^^^^^^^^^^^^^^^^###
   ### Compile Dev2 subsystem ###
@@ -252,8 +252,19 @@ compile_all() {
   if [ "$_target" = "native" ]; then
     compile Dsw/Mod/Debug.odc
   fi
-  compile Dsw/Mod/Documents.cp Dsw/Mod/Log.odc Dsw/Mod/Compiler486Main.cp \
-    Dsw/Mod/CompilerCPfrontMain.cp Dsw/Mod/Linker486Main.cp
+
+  compile Dsw/Mod/Documents.cp Dsw/Mod/Log.odc Dsw/Mod/Opts.cp Dsw/Mod/Procs.cp
+  compile Dsw/Mod/HostProcs.cp
+
+  ###^^^^^^^^^^^^^^^^^^^^^^^^^^^###
+  ### Compile bbdsw executables ###
+  ###___________________________###
+
+  compile \
+    Dsw/Mod/Compiler486Main.cp \
+    Dsw/Mod/CompilerCPfrontMain.cp \
+    Dsw/Mod/Linker486Main.cp \
+    Dsw/Mod/MakeMain.cp
 }
 
 link_all() {
@@ -266,7 +277,7 @@ link_all() {
     PosixCtypes PosixCmacro \
     Kernel Console Files Dates Math Strings Services Log \
     HostLang HostConsole HostFiles HostDates DswLog $_debug_module \
-    DevCPM DevCPT DevCPS DevCPB DevCPP DevCPE DevCPH \
+    DevCPM DevCPT DevCPR DevCPS DevCPB DevCPP DevCPE DevCPH \
     DevCPL486 DevCPC486 DevCPV486 \
     DswDocuments DswCompiler486Main
 
@@ -282,10 +293,17 @@ link_all() {
     PosixCtypes PosixCmacro \
     Kernel Console Files Dates Math Strings Services Log \
     HostLang HostConsole HostFiles HostDates DswLog $_debug_module \
-    DevCPM DevCPT DevCPS DevCPB DevCPP DevCPE DevCPH \
+    DevCPM DevCPT DevCPR DevCPS DevCPB DevCPP DevCPE DevCPH \
     CPfrontCPG CPfrontCPC CPfrontCPV\
     DswDocuments DswCompilerCPfrontMain
 
+  link cpmake \
+    PosixCtypes PosixCmacro \
+    Kernel Console Files Dates Math Strings Services Log \
+    HostLang HostConsole HostFiles HostDates DswLog $_debug_module \
+    DevCPM DevCPT DevCPR DevCPS \
+    DswDocuments DswOpts DswProcs DswHostProcs DswMakeMain
+
   if $_dolink; then
     chmod a+x cpc486 cpl486 cpfront
   fi