Commits

Anonymous committed 8547202

Makefile changes for MultiSignal on Windows.

Comments (0)

Files changed (3)

 			  obj = parent[ndx]
 		      end
 		    else
-		      Add(obj2)
+		      this.Add(obj2)
 		  end
 		mreturn this
 	end

sources/makefile.mak

 net: $[f,$(SYNTHESIS),synthesis,def] $[f,$(SYNTHESIS),synthesis,dll]
 
 SOURCES = assertions commandline compare console coverage elapsedtime fif file gottk \
-hash json let ls mapper mapvar memo oi progn random reducer regex socket telnet transport var version
+hash json let ls mapper mapvar memo multisignal oi progn random reducer regex socket telnet transport var version
 SOURCES_NET = assertions var commandline compare console elapsedtime fif file gottk \
 hash json let ls mapper mapvar memo oi progn random reducer regex socket telnet transport version
 
 	dblproto $(SOURCES)
 
 $[f,$(SYNTHESIS),synthesis,def]: synthesis.def
-	%If %Defined(NOVCS)
 	$(CPCMD) synthesis.def $(SYNTHESIS)
-	%Else
-	get -u synthesis.dev($[f,$(SYNTHESIS),synthesis,def])
-	%EndIf
 
 $[f,$(SYNTHESIS),synthesis,elb]: $[f,obj,$(SOURCES),dbo]
 	dblink $(DBG) -l $(_Target) $(_Sources)

tests/makefile.mak

 
 run:
 	%ForEach test in $[f,exe,$(SOURCES),dbr]
-	    dbs $(test)
+	    %If $(test) == $[f,exe,test_multisignal,dbr]
+	        dbr $(test)
+	    %Else
+	        dbs $(test)
+	    %Endif
 	%EndFor
 
 net: $[f,exe,synthesis,dll] $[f,exe,synthesis,pdb] $[f,exe,$(SOURCES),exe]
 $[f,coverage,coverall,html]: $[f,exe,$(SOURCES),dbr]
 	dbs SYNTHESIS:htmlcover -o $(_Target) -r $(_Sources) -t 'Coverage for full test suite'
 
+$[f,exe,test_multisignal,dbr]:	$[f,obj,test_multisignal,dbo]
+	dblink $(DBG) -o $(_Target) $(_Source) $(LIBS) WND:tklib.elb
+$[f,exe,test_multisignal,exe]:	$[f,,test_multisignal,dbl]
+	dblnet $(DBG) -out=$(Target) -target=exe -ref=$[f,exe,synthesis,dll] -ref=$[f,$(DBLDIR)\bin,Synergex.SynergyDE.tklib,dll] 
+
 .dbo.dbr:
 	dblink $(DBG) -o $(_Target) $(_Source) $(LIBS)
 .dbl.dbo: