... and again trying to check in 0.41-0 test 10

svn path=/trunk/; revision=9108

3 files changed, 22 insertions, 19 deletions

diff --git a/pd/extra/expr~/makefile b/pd/extra/expr~/makefile
index 4889afe5..2d74ba36 100644
--- a/pd/extra/expr~/makefile
+++ b/pd/extra/expr~/makefile
@@ -14,16 +14,17 @@ pd_nt: expr.dll
 
 NTOBJ =  vexp.obj vexp_fun.obj vexp_if.obj
 
-PDNTCFLAGS = /W3 /WX /DNT /DPD /nologo
-VC="C:\Program Files\Microsoft Visual Studio\Vc98"
+PDNTCFLAGS = /W3 /DNT /DPD /nologo
+VC = "C:\Program Files\Microsoft Visual Studio 9.0\VC"
+VSTK = "C:\Program Files\Microsoft SDKs\Windows\v6.0A"
 
 PDNTINCLUDE = /I. /I..\..\src /I$(VC)\include
 
 PDNTLDIR = $(VC)\lib
-PDNTLIB = $(PDNTLDIR)\libc.lib \
-	$(PDNTLDIR)\oldnames.lib \
-	$(PDNTLDIR)\kernel32.lib \
-	..\..\bin\pd.lib 
+PDNTLIB = /NODEFAULTLIB:libcmt /NODEFAULTLIB:oldnames /NODEFAULTLIB:kernel32 \
+	$(PDNTLDIR)\libcmt.lib $(PDNTLDIR)\oldnames.lib \
+        $(VSTK)\lib\kernel32.lib \
+	 ..\..\bin\pd.lib 
 
 .c.obj:
 	cl $(PDNTCFLAGS) $(PDNTINCLUDE) /c $*.c
diff --git a/pd/extra/makefile b/pd/extra/makefile
index 56e59bed..944475a1 100644
--- a/pd/extra/makefile
+++ b/pd/extra/makefile
@@ -7,19 +7,21 @@ pd_nt: $(NAME).dll
 .SUFFIXES: .dll
 
 PDNTCFLAGS = /W3 /WX /DNT /DPD /nologo
-VC="C:\Program Files\Microsoft Visual Studio\Vc98"
+# VC="C:\Program Files\Microsoft Visual Studio\Vc98"
+VC = "C:\Program Files\Microsoft Visual Studio 9.0\VC"
+VSTK = "C:\Program Files\Microsoft SDKs\Windows\v6.0A"
 
 PDNTINCLUDE = /I. /I..\..\src /I$(VC)\include
 
 PDNTLDIR = $(VC)\lib
-PDNTLIB = $(PDNTLDIR)\libc.lib \
-	$(PDNTLDIR)\oldnames.lib \
-	$(PDNTLDIR)\kernel32.lib \
-	..\..\bin\pd.lib 
+PDNTLIB = /NODEFAULTLIB:libcmt /NODEFAULTLIB:oldnames /NODEFAULTLIB:kernel32 \
+	$(PDNTLDIR)\libcmt.lib $(PDNTLDIR)\oldnames.lib \
+        $(VSTK)\lib\kernel32.lib \
+	 ..\..\bin\pd.lib 
 
 .c.dll:
 	cl $(PDNTCFLAGS) $(PDNTINCLUDE) /c $*.c
-	link /dll /export:$(CSYM)_setup $*.obj $(PDNTLIB)
+	link /nologo /dll /export:$(CSYM)_setup $*.obj $(PDNTLIB)
 
 # ----------------------- IRIX 5.x -----------------------
 
diff --git a/pd/extra/sigmund~/sigmund~-help.pd b/pd/extra/sigmund~/sigmund~-help.pd
index c60ca9a8..9b3e1caa 100644
--- a/pd/extra/sigmund~/sigmund~-help.pd
+++ b/pd/extra/sigmund~/sigmund~-help.pd
@@ -48,7 +48,6 @@ outputs are meaningful.;
 #X text 13 28 Sigmund~ analyzes an incoming sound into sinusoidal components
 \, which may be reported individually or combined to form a pitch estimate.
 Possible outputs are specified as creation arguments:;
-#X text 55 129 env - output pitches at the beginning of notes;
 #X text 56 95 pitch - output pitch continuously;
 #N canvas 518 74 588 728 setting-parameters 0;
 #X msg 182 66 print;
@@ -91,7 +90,7 @@ of a note at or near the previously output pitch.;
 #X connect 1 0 2 0;
 #X connect 2 0 3 0;
 #X restore 330 531 pd setting-parameters;
-#N canvas 149 65 641 815 sinusoid-tracking 1;
+#N canvas 149 65 641 815 sinusoid-tracking 0;
 #X obj 124 267 sigmund~ -npeak 10 peaks;
 #X obj 124 214 phasor~;
 #X obj 124 144 loadbang;
@@ -127,7 +126,7 @@ claw them apart). The other four are as shown:;
 #X floatatom 245 760 5 0 0 0 - - -;
 #X floatatom 285 737 5 0 0 0 - - -;
 #X floatatom 326 713 5 0 0 0 - - -;
-#X obj 246 638 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+#X obj 246 638 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0
 1;
 #X text 43 535 If you ask for "tracks" \, the output is four numbers:
 index \, frequency \, and amplitude as before \, and finally a flag
@@ -178,17 +177,18 @@ for an empty track.;
 #X text 62 335 growth - growth (dB) to report a new note (7);
 #X text 54 147 peaks - output all sinusoidal peaks in order of amplitude
 ;
-#X text 380 596 updated for Pd v0.40;
 #X text 11 356 The npts and hop parameters are in samples \, and are
 powers of two. The example below specifies a huge hop of 4096 (to slow
 the output down) and to output "pitch" and "env". (Those are the default
 outputs.);
 #X text 61 260 maxfreq - maximum sinusoid frequency in Hz. (1000000)
 ;
-#X connect 2 0 25 0;
+#X text 55 128 env - output amplitude continuously;
+#X text 380 596 updated for Pd v0.41;
+#X connect 2 0 24 0;
 #X connect 3 0 8 0;
 #X connect 4 0 7 0;
 #X connect 7 0 2 0;
 #X connect 8 0 4 0;
-#X connect 25 0 5 0;
-#X connect 25 1 6 0;
+#X connect 24 0 5 0;
+#X connect 24 1 6 0;