diff options
Diffstat (limited to 'externals/grill/flext/tutorial')
44 files changed, 351 insertions, 213 deletions
diff --git a/externals/grill/flext/tutorial/adv1/adv1.cw b/externals/grill/flext/tutorial/adv1/adv1.cw Binary files differindex bd68d0e8..8b18e78f 100755 --- a/externals/grill/flext/tutorial/adv1/adv1.cw +++ b/externals/grill/flext/tutorial/adv1/adv1.cw diff --git a/externals/grill/flext/tutorial/adv1/adv1.dsp b/externals/grill/flext/tutorial/adv1/adv1.dsp index 8917c44e..f857dbf3 100644 --- a/externals/grill/flext/tutorial/adv1/adv1.dsp +++ b/externals/grill/flext/tutorial/adv1/adv1.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /W3 /GR- /GX- /O2 /I "..\..\source" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "NT" /D "PD" /YX /FD /c +# ADD CPP /nologo /W3 /O2 /I "..\..\source" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "NT" /D "PD" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0xc07 /d "NDEBUG" @@ -53,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib pd.lib flext-pdwin.lib /nologo /dll /machine:I386 /out:"../msvc/adv1.dll" /libpath:"..\..\pd-msvc" +# ADD LINK32 kernel32.lib user32.lib pd.lib flext-pdwin.lib /nologo /dll /machine:I386 /out:"../pd-msvc/adv1.dll" /libpath:"..\..\pd-msvc" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "adv1 - Win32 Debug" @@ -70,7 +70,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GR- /GX- /ZI /Od /I "..\..\source" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "NT" /D "PD" /Fr /YX /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /ZI /Od /I "..\..\source" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "NT" /D "PD" /Fr /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0xc07 /d "_DEBUG" diff --git a/externals/grill/flext/tutorial/adv1/main.cpp b/externals/grill/flext/tutorial/adv1/main.cpp index f59ebddd..9b8acb79 100755 --- a/externals/grill/flext/tutorial/adv1/main.cpp +++ b/externals/grill/flext/tutorial/adv1/main.cpp @@ -47,9 +47,6 @@ adv1::adv1(int argc,t_atom *argv) AddInAnything(); // one inlet that can receive anything AddOutAnything(); // one outlet for anything - // set up inlets and outlets - SetupInOut(); - // register method FLEXT_ADDMETHOD(0,m_any); // register method "m_any" for inlet 0 diff --git a/externals/grill/flext/tutorial/build-pd-bcc.bat b/externals/grill/flext/tutorial/build-pd-bcc.bat index 5a8e8a57..6b2f5821 100644 --- a/externals/grill/flext/tutorial/build-pd-bcc.bat +++ b/externals/grill/flext/tutorial/build-pd-bcc.bat @@ -16,6 +16,14 @@ @make -f ..\makefile.pd-bcc NAME=adv1 SETUPFUNCTION=adv1_setup @cd .. +@cd attr1 +@make -f ..\makefile.pd-bcc NAME=attr1 SETUPFUNCTION=attr1_setup +@cd .. + +@cd attr2 +@make -f ..\makefile.pd-bcc NAME=attr2 SETUPFUNCTION=attr2_setup +@cd .. + @cd signal1 @make -f ..\makefile.pd-bcc NAME=signal1~ SETUPFUNCTION=signal1_tilde_setup @cd .. @@ -24,4 +32,8 @@ @make -f ..\makefile.pd-bcc NAME=signal2~ SETUPFUNCTION=signal2_tilde_setup @cd .. +@cd lib1 +@make -f ..\makefile.pd-bcc NAME=lib1 SETUPFUNCTION=lib1_setup +@cd .. + diff --git a/externals/grill/flext/tutorial/build-pd-linux.sh b/externals/grill/flext/tutorial/build-pd-linux.sh index bd11c6c4..413650f7 100644 --- a/externals/grill/flext/tutorial/build-pd-linux.sh +++ b/externals/grill/flext/tutorial/build-pd-linux.sh @@ -1,4 +1,11 @@ -#!/bin/sh +#!/bin/sh -make -f makefile.pd-linux +. config-pd-linux.txt +make -f makefile.pd-linux && +{ + if [ $INSTPATH != "" ]; then + echo Now install as root + su -c "make -f makefile.pd-linux install" + fi +} diff --git a/externals/grill/flext/tutorial/build-pd-msvc.bat b/externals/grill/flext/tutorial/build-pd-msvc.bat index f6eb9625..85ad6649 100644 --- a/externals/grill/flext/tutorial/build-pd-msvc.bat +++ b/externals/grill/flext/tutorial/build-pd-msvc.bat @@ -4,8 +4,11 @@ nmake /f makefile.pd-msvc NAME=simple1 DIR=simple1 nmake /f makefile.pd-msvc NAME=simple2 DIR=simple2 nmake /f makefile.pd-msvc NAME=simple3 DIR=simple3 nmake /f makefile.pd-msvc NAME=adv1 DIR=adv1 +nmake /f makefile.pd-msvc NAME=attr1 DIR=attr1 +nmake /f makefile.pd-msvc NAME=attr2 DIR=attr2 nmake /f makefile.pd-msvc NAME=signal1~ DIR=signal1 nmake /f makefile.pd-msvc NAME=signal2~ DIR=signal2 nmake /f makefile.pd-msvc NAME=thread1 DIR=thread1 nmake /f makefile.pd-msvc NAME=thread2 DIR=thread2 +nmake /f makefile.pd-msvc NAME=lib1 DIR=lib1 diff --git a/externals/grill/flext/tutorial/config-pd-linux.txt b/externals/grill/flext/tutorial/config-pd-linux.txt index 3cfb4a9f..3f45b687 100644 --- a/externals/grill/flext/tutorial/config-pd-linux.txt +++ b/externals/grill/flext/tutorial/config-pd-linux.txt @@ -3,8 +3,13 @@ # Copyright (c) 2001,2002 Thomas Grill (xovo@gmx.net) # +# your c++ compiler (normally g++) +CXX=g++ + # where are the PD header files? -PDPATH=/usr/local/include +# if it is a system include path (like /usr/local/include) +# you should leave it blank (as e.g. g++ 3.2 complains about it) +PDPATH= # where do the flext libraries reside? FLEXTPATH=/usr/local/lib/pd/flext @@ -12,8 +17,6 @@ FLEXTPATH=/usr/local/lib/pd/flext # where should the examples be built? (relative path) OUTPATH=./pd-linux -# install the examples? (yes/no) -INSTALL=yes - # where should the examples be installed? +# (leave blank to omit installation) INSTPATH=${FLEXTPATH}/tutorial diff --git a/externals/grill/flext/tutorial/makefile.pd-cygwin b/externals/grill/flext/tutorial/makefile.pd-cygwin index b8a48403..5929a701 100644 --- a/externals/grill/flext/tutorial/makefile.pd-cygwin +++ b/externals/grill/flext/tutorial/makefile.pd-cygwin @@ -26,7 +26,7 @@ LIBS=m pd # all the source files from the package -EXAMPLES=simple1 simple2 simple3 adv1 signal1~ signal2~ # thread1 thread2 +EXAMPLES=simple1 simple2 simple3 adv1 attr1 attr2 signal1~ signal2~ lib1 # thread1 thread2 TARGETS=$(patsubst %,$(OUTPATH)/%.dll,$(EXAMPLES)) diff --git a/externals/grill/flext/tutorial/makefile.pd-linux b/externals/grill/flext/tutorial/makefile.pd-linux index 5c0a3cbc..7f1528e4 100644 --- a/externals/grill/flext/tutorial/makefile.pd-linux +++ b/externals/grill/flext/tutorial/makefile.pd-linux @@ -24,7 +24,7 @@ LIBS=m # all the source files from the package -EXAMPLES=simple1 simple2 simple3 adv1 signal1~ signal2~ thread1 thread2 +EXAMPLES=simple1 simple2 simple3 adv1 attr1 attr2 signal1~ signal2~ lib1 thread1 thread2 TARGETS=$(patsubst %,$(OUTPATH)/%.pd_linux,$(EXAMPLES)) @@ -55,3 +55,14 @@ clean: rm -f $(OUTPATH)/*.o $(TARGETS) +ifdef INSTPATH +$(INSTPATH): + -mkdir $(INSTPATH) + +install:: $(INSTPATH) +endif + +install:: $(patsubst %,$(OUTPATH)/%.pd_linux,$(EXAMPLES)) + cp $^ $(INSTPATH) + chmod 755 $(patsubst %,$(INSTPATH)/%,$(notdir $^)) + chown root.users $(patsubst %,$(INSTPATH)/%,$(notdir $^)) diff --git a/externals/grill/flext/tutorial/maxmsp/ex-adv1 b/externals/grill/flext/tutorial/maxmsp/ex-adv1 Binary files differindex dc29619b..dbdcf1fb 100755 --- a/externals/grill/flext/tutorial/maxmsp/ex-adv1 +++ b/externals/grill/flext/tutorial/maxmsp/ex-adv1 diff --git a/externals/grill/flext/tutorial/maxmsp/ex-signal1 b/externals/grill/flext/tutorial/maxmsp/ex-signal1 Binary files differindex ca80fc9f..aa50e2e3 100755 --- a/externals/grill/flext/tutorial/maxmsp/ex-signal1 +++ b/externals/grill/flext/tutorial/maxmsp/ex-signal1 diff --git a/externals/grill/flext/tutorial/maxmsp/ex-signal2 b/externals/grill/flext/tutorial/maxmsp/ex-signal2 Binary files differindex f7172d01..21c12f88 100755 --- a/externals/grill/flext/tutorial/maxmsp/ex-signal2 +++ b/externals/grill/flext/tutorial/maxmsp/ex-signal2 diff --git a/externals/grill/flext/tutorial/maxmsp/ex-simple1 b/externals/grill/flext/tutorial/maxmsp/ex-simple1 Binary files differindex efebcce6..133eefe9 100755 --- a/externals/grill/flext/tutorial/maxmsp/ex-simple1 +++ b/externals/grill/flext/tutorial/maxmsp/ex-simple1 diff --git a/externals/grill/flext/tutorial/maxmsp/ex-simple2 b/externals/grill/flext/tutorial/maxmsp/ex-simple2 Binary files differindex 5515bc98..acc74744 100755 --- a/externals/grill/flext/tutorial/maxmsp/ex-simple2 +++ b/externals/grill/flext/tutorial/maxmsp/ex-simple2 diff --git a/externals/grill/flext/tutorial/maxmsp/ex-simple3 b/externals/grill/flext/tutorial/maxmsp/ex-simple3 Binary files differindex 62e048b7..7b5acee2 100755 --- a/externals/grill/flext/tutorial/maxmsp/ex-simple3 +++ b/externals/grill/flext/tutorial/maxmsp/ex-simple3 diff --git a/externals/grill/flext/tutorial/pd/ex-adv1.pd b/externals/grill/flext/tutorial/pd/ex-adv1.pd index 7ff14d6e..65735a45 100644 --- a/externals/grill/flext/tutorial/pd/ex-adv1.pd +++ b/externals/grill/flext/tutorial/pd/ex-adv1.pd @@ -1,14 +1,22 @@ -#N canvas 175 265 667 312 12; -#X msg 35 31 or two words; -#X msg 167 31 2 3; -#X msg 47 252 one 2 3; -#X obj 85 154 print result; -#X obj 69 123 adv1 one; -#X obj 47 224 prepend set; -#X text 154 216 you can also use "prepend" if "adv1" has already been -loaded!; +#N canvas 46 58 586 341 12; +#X msg 34 92 or two words; +#X msg 169 93 2 3; +#X msg 48 291 one 6; +#X obj 72 213 print result; +#X obj 49 172 adv1 one; +#X obj 48 263 prepend set; +#X text 162 257 you can also use "prepend"; +#X obj 16 8 cnv 15 550 40 empty empty adv1 10 22 32 24 -260818 -1 0 +; +#X text 175 7 flext tutorial \, (C)2002 Thomas Grill; +#X text 175 27 http://www.parasitaere-kapazitaeten.net; +#X text 199 214 watch the console!; +#X msg 69 121 6; +#X text 210 110 send the object various messages; +#X text 160 274 (if adv1 has already been loaded); #X connect 0 0 4 0; #X connect 1 0 4 0; #X connect 4 0 3 0; #X connect 4 0 5 0; #X connect 5 0 2 0; +#X connect 11 0 4 0; diff --git a/externals/grill/flext/tutorial/pd/ex-signal1.pd b/externals/grill/flext/tutorial/pd/ex-signal1.pd index 391e33a5..bfa445cd 100644 --- a/externals/grill/flext/tutorial/pd/ex-signal1.pd +++ b/externals/grill/flext/tutorial/pd/ex-signal1.pd @@ -1,16 +1,25 @@ -#N canvas 335 232 452 302 10; -#X obj 233 98 hsl 128 15 0 1 0 0 empty empty empty 20 8 0 8 -260818 +#N canvas 335 232 575 335 12; +#X obj 137 137 hsl 128 15 0 1 0 0 empty empty empty 20 8 32 8 -261681 -1 -1 0 1; -#X obj 117 46 osc~ 440; -#X obj 155 173 *~ 0.6; -#X obj 147 218 dac~; -#X obj 184 47 osc~ 880; -#X floatatom 210 80 5 0 0; -#X obj 155 139 signal1~; -#X connect 0 0 6 2; -#X connect 1 0 6 0; -#X connect 2 0 3 0; -#X connect 2 0 3 1; -#X connect 4 0 6 1; -#X connect 5 0 6 2; -#X connect 6 0 2 0; +#X obj 31 92 osc~ 440; +#X obj 34 279 dac~; +#X obj 126 92 osc~ 880; +#X obj 44 206 signal1~; +#X obj 16 8 cnv 15 550 40 empty empty signal1 10 22 32 24 -260818 -1 +0; +#X text 175 8 flext tutorial \, (C)2002 Thomas Grill; +#X text 175 28 http://www.parasitaere-kapazitaeten.net; +#X text 276 151 control the mixing; +#X text 113 241 adjust the volume; +#X obj 44 240 *~ 0.5; +#X text 28 73 source 1; +#X text 128 72 source 2; +#X obj 135 159 nbx 5 16 0 1 0 0 empty empty empty 0 -6 32 12 -261681 +-1 -1 0 256; +#X connect 0 0 13 0; +#X connect 1 0 4 0; +#X connect 3 0 4 1; +#X connect 4 0 10 0; +#X connect 10 0 2 0; +#X connect 10 0 2 1; +#X connect 13 0 4 2; diff --git a/externals/grill/flext/tutorial/pd/ex-signal2.pd b/externals/grill/flext/tutorial/pd/ex-signal2.pd index cdd7aaea..b26604c4 100644 --- a/externals/grill/flext/tutorial/pd/ex-signal2.pd +++ b/externals/grill/flext/tutorial/pd/ex-signal2.pd @@ -1,17 +1,25 @@ -#N canvas 251 267 456 306 12; -#X obj 89 68 signal2~; -#X floatatom 52 117 5 0 0; -#X floatatom 153 120 5 0 0; -#X floatatom 251 120 5 0 0; -#X floatatom 345 121 5 0 0; -#X obj 90 30 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 +#N canvas 41 125 583 263 12; +#X obj 81 133 signal2~; +#X obj 76 88 bng 25 250 50 0 empty empty empty 0 -6 32 8 -261681 -1 -1; -#X text 29 136 sample rate; -#X text 136 136 block size; -#X text 116 29 bang to get audio system parameters; -#X text 243 137 channels in and out; -#X connect 0 0 1 0; -#X connect 0 1 2 0; -#X connect 0 2 3 0; -#X connect 0 3 4 0; -#X connect 5 0 0 0; +#X text 108 94 bang to get audio system parameters; +#X text 233 212 channels in and out; +#X obj 16 8 cnv 15 550 40 empty empty signal2 10 22 32 24 -260818 -1 +0; +#X text 175 8 flext tutorial \, (C)2002 Thomas Grill; +#X text 175 28 http://www.parasitaere-kapazitaeten.net; +#X obj 38 191 nbx 5 16 -1e+37 1e+37 0 0 empty empty empty 0 -6 32 12 +-228992 -1 -1 0 256; +#X obj 130 191 nbx 5 16 -1e+37 1e+37 0 0 empty empty empty 0 -6 32 +12 -228992 -1 -1 0 256; +#X obj 233 191 nbx 5 16 -1e+37 1e+37 0 0 empty empty empty 0 -6 32 +12 -228992 -1 -1 0 256; +#X obj 325 191 nbx 5 16 -1e+37 1e+37 0 0 empty empty empty 0 -6 32 +12 -228992 -1 -1 0 256; +#X text 12 211 samplerate; +#X text 128 211 blocksize; +#X connect 0 0 7 0; +#X connect 0 1 8 0; +#X connect 0 2 9 0; +#X connect 0 3 10 0; +#X connect 1 0 0 0; diff --git a/externals/grill/flext/tutorial/pd/ex-simple1.pd b/externals/grill/flext/tutorial/pd/ex-simple1.pd index 1be01595..e2872868 100644 --- a/externals/grill/flext/tutorial/pd/ex-simple1.pd +++ b/externals/grill/flext/tutorial/pd/ex-simple1.pd @@ -1,10 +1,16 @@ -#N canvas 197 285 460 310 12; -#X floatatom 85 47 5 0 0; -#X floatatom 85 142 5 0 0; -#X msg 22 44 help; -#X text 137 141 inverse; -#X text 139 45 input; -#X obj 85 90 simple1; -#X connect 0 0 5 0; -#X connect 2 0 5 0; -#X connect 5 0 1 0; +#N canvas 85 178 582 245 12; +#X msg 29 92 help; +#X text 203 187 inverse; +#X text 169 96 input; +#X obj 113 141 simple1; +#X obj 16 8 cnv 15 550 40 empty empty simple1 10 22 32 24 -260818 -1 +0; +#X text 175 8 flext tutorial \, (C)2002 Thomas Grill; +#X text 175 28 http://www.parasitaere-kapazitaeten.net; +#X obj 114 96 nbx 4 16 -999 999 0 0 empty empty empty 0 -6 32 12 -261681 +-1 -1 104 256; +#X obj 112 190 nbx 7 16 -1e+37 1e+37 0 0 empty empty empty 0 -6 32 +12 -228992 -1 -1 0.00961538 256; +#X connect 0 0 3 0; +#X connect 3 0 8 0; +#X connect 7 0 3 0; diff --git a/externals/grill/flext/tutorial/pd/ex-simple2.pd b/externals/grill/flext/tutorial/pd/ex-simple2.pd index 8074cb13..02ad85a7 100644 --- a/externals/grill/flext/tutorial/pd/ex-simple2.pd +++ b/externals/grill/flext/tutorial/pd/ex-simple2.pd @@ -1,13 +1,21 @@ -#N canvas 197 285 454 304 12; -#X obj 110 96 simple2 3; -#X floatatom 98 51 5 0 0; -#X floatatom 199 52 5 0 0; -#X floatatom 108 150 5 0 0; -#X msg 11 12 help; -#X text 90 30 triggering; -#X text 202 31 non-triggering; -#X text 196 96 default argument; -#X connect 0 0 3 0; +#N canvas 72 265 589 307 12; +#X obj 111 196 simple2 3; +#X msg 21 83 help; +#X text 103 119 triggering; +#X text 215 120 non-triggering; +#X text 206 197 default argument; +#X obj 16 8 cnv 15 550 40 empty empty simple2 10 22 32 24 -260818 -1 +0; +#X text 174 8 flext tutorial \, (C)2002 Thomas Grill; +#X text 174 28 http://www.parasitaere-kapazitaeten.net; +#X text 66 82 print a "help" message (to the console); +#X obj 110 144 nbx 4 16 -999 999 0 0 empty empty empty 0 -6 32 12 -261681 +-1 -1 0 256; +#X obj 217 144 nbx 4 16 -999 999 0 0 empty empty empty 0 -6 32 12 -261681 +-1 -1 0 256; +#X obj 111 239 nbx 7 16 -1e+37 1e+37 0 0 empty empty empty 0 -6 32 +12 -228992 -1 -1 0 256; +#X connect 0 0 11 0; #X connect 1 0 0 0; -#X connect 2 0 0 1; -#X connect 4 0 0 0; +#X connect 9 0 0 0; +#X connect 10 0 0 1; diff --git a/externals/grill/flext/tutorial/pd/ex-simple3.pd b/externals/grill/flext/tutorial/pd/ex-simple3.pd index e2867241..bf58a003 100644 --- a/externals/grill/flext/tutorial/pd/ex-simple3.pd +++ b/externals/grill/flext/tutorial/pd/ex-simple3.pd @@ -1,18 +1,22 @@ -#N canvas 329 97 539 308 12;
-#X msg 11 12 help;
-#X msg 123 84 born;
-#X msg 172 85 to;
-#X msg 214 87 hula;
-#X msg 228 168 yeah;
-#X msg 228 130 hula 1;
-#X text 280 169 other symbol;
-#X text 57 12 issue help message;
-#X obj 148 231 simple3;
-#X text 261 88 tag without argument;
-#X text 297 128 tag and argument;
-#X connect 0 0 8 0;
-#X connect 1 0 8 0;
-#X connect 2 0 8 0;
-#X connect 3 0 8 0;
-#X connect 4 0 8 0;
-#X connect 5 0 8 0;
+#N canvas 329 97 583 344 12; +#X msg 22 87 help; +#X msg 119 136 born; +#X msg 168 137 to; +#X msg 210 139 hula; +#X msg 224 220 yeah; +#X msg 224 182 hula 1; +#X text 276 221 other symbol; +#X obj 144 283 simple3; +#X text 257 140 tag without argument; +#X text 293 180 tag and argument; +#X text 68 87 print a help message; +#X obj 16 8 cnv 15 550 40 empty empty simple3 10 22 32 24 -260818 -1 +0; +#X text 174 8 flext tutorial \, (C)2002 Thomas Grill; +#X text 174 28 http://www.parasitaere-kapazitaeten.net; +#X connect 0 0 7 0; +#X connect 1 0 7 0; +#X connect 2 0 7 0; +#X connect 3 0 7 0; +#X connect 4 0 7 0; +#X connect 5 0 7 0; diff --git a/externals/grill/flext/tutorial/pd/ex-thread1.pd b/externals/grill/flext/tutorial/pd/ex-thread1.pd index 6358406c..67d673db 100644 --- a/externals/grill/flext/tutorial/pd/ex-thread1.pd +++ b/externals/grill/flext/tutorial/pd/ex-thread1.pd @@ -1,34 +1,43 @@ -#N canvas 105 266 672 310 12; -#X obj 54 29 bng 25 250 50 0 empty empty start 0 -6 0 8 -258699 -1 +#N canvas 105 266 700 343 12; +#X obj 39 91 bng 25 250 50 0 empty empty start 0 -6 32 8 -261681 -1 -1; -#X floatatom 54 216 8 0 0; -#X obj 54 182 thread1; -#X floatatom 145 218 8 0 0; -#X obj 145 184 thread1; -#X floatatom 235 219 8 0 0; -#X obj 235 185 thread1; -#X floatatom 327 219 8 0 0; -#X obj 327 185 thread1; -#X floatatom 420 219 8 0 0; -#X obj 420 185 thread1; -#X obj 146 123 delay 200; -#X obj 235 122 delay 200; -#X obj 328 124 delay 200; -#X obj 419 123 delay 200; -#X text 93 23 click to start; -#X text 141 41 (if you click twice \, the same thread is started a +#X obj 39 244 thread1; +#X obj 130 246 thread1; +#X obj 220 247 thread1; +#X obj 312 247 thread1; +#X obj 405 247 thread1; +#X obj 131 185 delay 200; +#X obj 220 184 delay 200; +#X obj 313 186 delay 200; +#X obj 404 185 delay 200; +#X text 78 85 click to start; +#X text 126 103 (if you click twice \, the same thread is started a second time); -#X connect 0 0 2 0; -#X connect 0 0 11 0; -#X connect 2 0 1 0; -#X connect 4 0 3 0; -#X connect 6 0 5 0; -#X connect 8 0 7 0; -#X connect 10 0 9 0; -#X connect 11 0 4 0; -#X connect 11 0 12 0; -#X connect 12 0 6 0; -#X connect 12 0 13 0; -#X connect 13 0 8 0; -#X connect 13 0 14 0; -#X connect 14 0 10 0; +#X obj 16 8 cnv 15 550 40 empty empty thread1 10 22 32 24 -260818 -1 +0; +#X text 175 8 flext tutorial \, (C)2002 Thomas Grill; +#X text 175 28 http://www.parasitaere-kapazitaeten.net; +#X obj 39 277 nbx 5 16 -1e+37 1e+37 0 0 empty empty empty 0 -6 32 12 +-228992 -1 -1 0 256; +#X obj 131 277 nbx 5 16 -1e+37 1e+37 0 0 empty empty empty 0 -6 32 +12 -228992 -1 -1 0 256; +#X obj 221 277 nbx 5 16 -1e+37 1e+37 0 0 empty empty empty 0 -6 32 +12 -228992 -1 -1 0 256; +#X obj 311 277 nbx 5 16 -1e+37 1e+37 0 0 empty empty empty 0 -6 32 +12 -228992 -1 -1 0 256; +#X obj 406 276 nbx 5 16 -1e+37 1e+37 0 0 empty empty empty 0 -6 32 +12 -228992 -1 -1 0 256; +#X connect 0 0 1 0; +#X connect 0 0 6 0; +#X connect 1 0 15 0; +#X connect 2 0 16 0; +#X connect 3 0 17 0; +#X connect 4 0 18 0; +#X connect 5 0 19 0; +#X connect 6 0 2 0; +#X connect 6 0 7 0; +#X connect 7 0 3 0; +#X connect 7 0 8 0; +#X connect 8 0 4 0; +#X connect 8 0 9 0; +#X connect 9 0 5 0; diff --git a/externals/grill/flext/tutorial/pd/ex-thread2.pd b/externals/grill/flext/tutorial/pd/ex-thread2.pd index 26205b8d..cb2e764a 100644 --- a/externals/grill/flext/tutorial/pd/ex-thread2.pd +++ b/externals/grill/flext/tutorial/pd/ex-thread2.pd @@ -1,25 +1,32 @@ -#N canvas 116 192 666 304 12; -#X msg 91 131 stop; -#X msg 262 135 stop; -#X obj 206 42 bng 25 250 50 0 empty empty empty 0 -6 0 8 -258699 -1 +#N canvas 116 192 587 332 12; +#X msg 84 188 stop; +#X msg 255 192 stop; +#X obj 199 99 bng 25 250 50 0 empty empty empty 0 -6 32 8 -261681 -1 -1; -#X obj 298 42 bng 25 250 50 0 empty empty empty 0 -6 0 8 -258699 -1 +#X obj 291 99 bng 25 250 50 0 empty empty empty 0 -6 32 8 -261681 -1 -1; -#X text 198 21 start; -#X text 290 20 stop; -#X msg 46 131 0; -#X msg 217 135 0; -#X msg 430 133 stop; -#X msg 385 133 0; -#X obj 411 172 thread2 50; -#X obj 239 172 thread2 15; -#X obj 73 171 thread2 3; -#X floatatom 73 205 8 0 0; -#X floatatom 239 205 8 0 0; -#X floatatom 411 205 8 0 0; -#X msg 140 131 text; -#X msg 309 135 text; -#X msg 477 133 text; +#X text 191 78 start; +#X text 283 77 stop; +#X msg 39 188 0; +#X msg 210 192 0; +#X msg 423 190 stop; +#X msg 378 190 0; +#X obj 404 229 thread2 50; +#X obj 232 229 thread2 15; +#X obj 66 228 thread2 3; +#X msg 133 188 text; +#X msg 302 192 text; +#X msg 470 190 text; +#X obj 16 8 cnv 15 550 40 empty empty thread2 10 22 32 24 -260818 -1 +0; +#X text 174 8 flext tutorial \, (C)2002 Thomas Grill; +#X text 174 28 http://www.parasitaere-kapazitaeten.net; +#X obj 65 264 nbx 5 16 -1e+37 1e+37 0 0 empty empty empty 0 -6 32 12 +-228992 -1 -1 0 256; +#X obj 231 265 nbx 5 16 -1e+37 1e+37 0 0 empty empty empty 0 -6 32 +12 -228992 -1 -1 0 256; +#X obj 403 267 nbx 5 16 -1e+37 1e+37 0 0 empty empty empty 0 -6 32 +12 -228992 -1 -1 0 256; #X connect 0 0 12 0; #X connect 1 0 11 0; #X connect 2 0 6 0; @@ -32,9 +39,9 @@ #X connect 7 0 11 0; #X connect 8 0 10 0; #X connect 9 0 10 0; -#X connect 10 0 15 0; -#X connect 11 0 14 0; -#X connect 12 0 13 0; -#X connect 16 0 12 0; -#X connect 17 0 11 0; -#X connect 18 0 10 0; +#X connect 10 0 21 0; +#X connect 11 0 20 0; +#X connect 12 0 19 0; +#X connect 13 0 12 0; +#X connect 14 0 11 0; +#X connect 15 0 10 0; diff --git a/externals/grill/flext/tutorial/readme.txt b/externals/grill/flext/tutorial/readme.txt index ec05f1a1..fa86a5ce 100644 --- a/externals/grill/flext/tutorial/readme.txt +++ b/externals/grill/flext/tutorial/readme.txt @@ -16,21 +16,30 @@ The package should at least compile (and is tested) with the following compilers pd - Windows: ------------- -o Borland C++ 5.5 (free): edit "config-pd-bcc.txt" & run "build-pd-bcc.bat" - o Microsoft Visual C++ 6: edit "config-pd-msvc.txt" & run "build-pd-msvc.bat" +o Borland C++ 5.5 (free): edit "config-pd-bcc.txt" & run "build-pd-bcc.bat" + (no threading support for that compiler!) + o Cygwin: edit "config-pd-cygwin.txt" & run "sh build-pd-cygwin.sh" + (no threading support for that compiler!) pd - linux: ----------- o GCC: edit "config-pd-linux.txt" & run "sh build-pd-linux.sh" +pd - MacOSX: +----------- +o GCC: edit "config-pd-darwin.txt" & run "sh build-pd-darwin.sh" + + Max/MSP - MacOS 9: ------------------ o Metrowerks CodeWarrior V6: edit & use the several ".cw" project files -o Apple MPW-PR: edit & use the several "make.mpw" makefiles +Max/MSP - MacOSX: +------------------ +... sorry, not yet... would someone please donate me a CodeWarrior V8 ? ---------------------------------------------------------------------------- diff --git a/externals/grill/flext/tutorial/signal1/main.cpp b/externals/grill/flext/tutorial/signal1/main.cpp index 14818e6f..f745be3b 100644 --- a/externals/grill/flext/tutorial/signal1/main.cpp +++ b/externals/grill/flext/tutorial/signal1/main.cpp @@ -5,10 +5,9 @@ // http://iem.kug.ac.at/pd/externals-HOWTO/ #include <flext.h> -#include <math.h> -#if !defined(FLEXT_VERSION) || (FLEXT_VERSION < 300) -#error You need at least flext version 0.3.0 +#if !defined(FLEXT_VERSION) || (FLEXT_VERSION < 400) +#error You need at least flext version 0.4.0 #endif @@ -40,9 +39,6 @@ class signal1: AddInFloat(); // 1 float in AddOutSignal(); // 1 audio out [ == AddOutSignal(1) ] - SetupInOut(); // set up inlets and outlets. - // Must be called once! - // Now we need to bind the handler function to our // panning inlet, which is inlet 2 (counting all inlets // from 0). We want the function "setPan" to get diff --git a/externals/grill/flext/tutorial/signal1/signal1.cw b/externals/grill/flext/tutorial/signal1/signal1.cw Binary files differindex f273b763..cb5b5ce5 100644 --- a/externals/grill/flext/tutorial/signal1/signal1.cw +++ b/externals/grill/flext/tutorial/signal1/signal1.cw diff --git a/externals/grill/flext/tutorial/signal1/signal1.dsp b/externals/grill/flext/tutorial/signal1/signal1.dsp index 42916c07..707f58ad 100644 --- a/externals/grill/flext/tutorial/signal1/signal1.dsp +++ b/externals/grill/flext/tutorial/signal1/signal1.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /W3 /GR- /GX- /O2 /I "..\..\source" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "NT" /D "PD" /YX /FD /c +# ADD CPP /nologo /W3 /O2 /I "..\..\source" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "NT" /D "PD" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0xc07 /d "NDEBUG" @@ -53,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib pd.lib flext-pdwin.lib /nologo /dll /machine:I386 /out:"../msvc/signal1~.dll" /libpath:"..\..\pd-msvc" +# ADD LINK32 kernel32.lib user32.lib pd.lib flext-pdwin.lib /nologo /dll /machine:I386 /out:"../pd-msvc/signal1~.dll" /libpath:"..\..\pd-msvc" !ELSEIF "$(CFG)" == "signal1 - Win32 Debug" @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GR- /GX- /ZI /Od /I "..\..\source" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "NT" /D "PD" /Fr /YX /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /ZI /Od /I "..\..\source" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "NT" /D "PD" /Fr /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0xc07 /d "_DEBUG" diff --git a/externals/grill/flext/tutorial/signal2/main.cpp b/externals/grill/flext/tutorial/signal2/main.cpp index 1517b536..3876a0ca 100644 --- a/externals/grill/flext/tutorial/signal2/main.cpp +++ b/externals/grill/flext/tutorial/signal2/main.cpp @@ -14,8 +14,8 @@ This is an object showing varous parameters of the pd audio system #include <flext.h> // check for appropriate flext version -#if !defined(FLEXT_VERSION) || (FLEXT_VERSION < 300) -#error You need at least flext version 0.3.0 +#if !defined(FLEXT_VERSION) || (FLEXT_VERSION < 400) +#error You need at least flext version 0.4.0 #endif @@ -37,7 +37,7 @@ protected: void m_bang(); // method for bang // this virtual function is obligatory for objects derived from flext_dsp - virtual void m_signal(int n, float *const *in, float *const *out); +// virtual void m_signal(int n, float *const *in, float *const *out); private: FLEXT_CALLBACK(m_bang); // callback for method "m_bang" @@ -57,9 +57,6 @@ signal2::signal2() AddOutFloat(1); AddOutInt(3); // although PD knows no int type, flext does! - // set up inlets and outlets - obligatory! - SetupInOut(); - // register methods FLEXT_ADDBANG(0,m_bang); // register method "m_bang" for bang message into inlet 0 } @@ -73,8 +70,8 @@ void signal2::m_bang() ToOutInt(3,ChannelsOut()); } +/* void signal2::m_signal(int, float *const *, float *const *) { - // do no dsp work } - +*/ diff --git a/externals/grill/flext/tutorial/signal2/signal2.cw b/externals/grill/flext/tutorial/signal2/signal2.cw Binary files differindex a7b29ba3..f631a7c4 100644 --- a/externals/grill/flext/tutorial/signal2/signal2.cw +++ b/externals/grill/flext/tutorial/signal2/signal2.cw diff --git a/externals/grill/flext/tutorial/signal2/signal2.dsp b/externals/grill/flext/tutorial/signal2/signal2.dsp index c70ae670..6002f7dc 100644 --- a/externals/grill/flext/tutorial/signal2/signal2.dsp +++ b/externals/grill/flext/tutorial/signal2/signal2.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /W3 /GR- /GX- /O2 /I "..\..\source" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "NT" /D "PD" /YX /FD /c +# ADD CPP /nologo /W3 /O2 /I "..\..\source" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "NT" /D "PD" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0xc07 /d "NDEBUG" @@ -53,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib pd.lib flext-pdwin.lib /nologo /dll /machine:I386 /out:"../msvc/signal2~.dll" /libpath:"..\..\pd-msvc" +# ADD LINK32 kernel32.lib user32.lib pd.lib flext-pdwin.lib /nologo /dll /machine:I386 /out:"../pd-msvc/signal2~.dll" /libpath:"..\..\pd-msvc" !ELSEIF "$(CFG)" == "signal2 - Win32 Debug" @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GR- /GX- /ZI /Od /I "..\..\source" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "NT" /D "PD" /Fr /YX /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /ZI /Od /I "..\..\source" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "NT" /D "PD" /Fr /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0xc07 /d "_DEBUG" diff --git a/externals/grill/flext/tutorial/simple1/main.cpp b/externals/grill/flext/tutorial/simple1/main.cpp index 38f12573..5406cc8a 100755 --- a/externals/grill/flext/tutorial/simple1/main.cpp +++ b/externals/grill/flext/tutorial/simple1/main.cpp @@ -14,13 +14,14 @@ This is an example of a simple object doing a float inversion #include <flext.h> // check for appropriate flext version -#if !defined(FLEXT_VERSION) || (FLEXT_VERSION < 300) -#error You need at least flext version 0.3.0 +#if !defined(FLEXT_VERSION) || (FLEXT_VERSION < 400) +#error You need at least flext version 0.4.0 #endif // define the class that stands for a pd/Max object // Attention: the class name must be the same as the object name!! (without an eventual ~) +// Special names are possible with the usage of libraries (see the lib1 tutorial example) class simple1: // inherit from basic flext class @@ -53,9 +54,6 @@ simple1::simple1() // define outlets: AddOutFloat(); // add one float outlet (has index 0) - // set up inlets and outlets - obligatory! - SetupInOut(); - // register methods FLEXT_ADDMETHOD(0,m_float); // register method (for float messages) "m_float" for inlet 0 } diff --git a/externals/grill/flext/tutorial/simple1/simple1.cw b/externals/grill/flext/tutorial/simple1/simple1.cw Binary files differindex d8b58eb1..d54fb1ff 100755 --- a/externals/grill/flext/tutorial/simple1/simple1.cw +++ b/externals/grill/flext/tutorial/simple1/simple1.cw diff --git a/externals/grill/flext/tutorial/simple1/simple1.dsp b/externals/grill/flext/tutorial/simple1/simple1.dsp index 281042a2..a40e22f6 100644 --- a/externals/grill/flext/tutorial/simple1/simple1.dsp +++ b/externals/grill/flext/tutorial/simple1/simple1.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /W3 /GR- /GX- /O2 /I "..\..\source" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "NT" /D "PD" /YX /FD /c +# ADD CPP /nologo /W3 /O2 /I "..\..\source" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "NT" /D "PD" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0xc07 /d "NDEBUG" @@ -53,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib pd.lib flext-pdwin.lib /nologo /dll /machine:I386 /out:"../msvc/simple1.dll" /libpath:"..\..\pd-msvc" +# ADD LINK32 kernel32.lib user32.lib pd.lib flext-pdwin.lib /nologo /dll /machine:I386 /out:"../pd-msvc/simple1.dll" /libpath:"..\..\pd-msvc" !ELSEIF "$(CFG)" == "simple1 - Win32 Debug" @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GR- /GX- /ZI /Od /I "..\..\source" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "NT" /D "PD" /Fr /YX /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /ZI /Od /I "..\..\source" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "NT" /D "PD" /Fr /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0xc07 /d "_DEBUG" diff --git a/externals/grill/flext/tutorial/simple2/main.cpp b/externals/grill/flext/tutorial/simple2/main.cpp index 306a953b..f23e1745 100755 --- a/externals/grill/flext/tutorial/simple2/main.cpp +++ b/externals/grill/flext/tutorial/simple2/main.cpp @@ -14,8 +14,8 @@ This is an example of a simple object doing a float addition #include <flext.h> // check for appropriate flext version -#if !defined(FLEXT_VERSION) || (FLEXT_VERSION < 300) -#error You need at least flext version 0.3.0 +#if !defined(FLEXT_VERSION) || (FLEXT_VERSION < 400) +#error You need at least flext version 0.4.0 #endif @@ -55,9 +55,6 @@ simple2::simple2(float init): // define outlets AddOutFloat(); // one float outlet (has index 0) - // set up inlets and outlets - obligatory! - SetupInOut(); - // register methods FLEXT_ADDMETHOD(0,m_float1); // register method (for floats) "m_float1" for inlet 0 FLEXT_ADDMETHOD(1,m_float2); // register method (for floats) "m_float2" for inlet 1 diff --git a/externals/grill/flext/tutorial/simple2/simple2.cw b/externals/grill/flext/tutorial/simple2/simple2.cw Binary files differindex 1bc9379f..af75e581 100755 --- a/externals/grill/flext/tutorial/simple2/simple2.cw +++ b/externals/grill/flext/tutorial/simple2/simple2.cw diff --git a/externals/grill/flext/tutorial/simple2/simple2.dsp b/externals/grill/flext/tutorial/simple2/simple2.dsp index 22b75a5e..06e953e0 100644 --- a/externals/grill/flext/tutorial/simple2/simple2.dsp +++ b/externals/grill/flext/tutorial/simple2/simple2.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /W3 /GR- /GX- /O2 /I "..\..\source" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "NT" /D "PD" /YX /FD /c +# ADD CPP /nologo /W3 /O2 /I "..\..\source" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "NT" /D "PD" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0xc07 /d "NDEBUG" @@ -53,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib pd.lib flext-pdwin.lib /nologo /dll /machine:I386 /out:"../msvc/simple2.dll" /libpath:"..\..\pd-msvc" +# ADD LINK32 kernel32.lib user32.lib pd.lib flext-pdwin.lib /nologo /dll /machine:I386 /out:"../pd-msvc/simple2.dll" /libpath:"..\..\pd-msvc" !ELSEIF "$(CFG)" == "simple2 - Win32 Debug" @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GR- /GX- /ZI /Od /I "..\..\source" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "NT" /D "PD" /FR /YX /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /ZI /Od /I "..\..\source" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "NT" /D "PD" /FR /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0xc07 /d "_DEBUG" diff --git a/externals/grill/flext/tutorial/simple3/main.cpp b/externals/grill/flext/tutorial/simple3/main.cpp index 5d290f67..b09893ab 100644 --- a/externals/grill/flext/tutorial/simple3/main.cpp +++ b/externals/grill/flext/tutorial/simple3/main.cpp @@ -15,8 +15,8 @@ This is an example of an object digesting several "tagged" messages #include <flext.h> // check for appropriate flext version -#if !defined(FLEXT_VERSION) || (FLEXT_VERSION < 300) -#error You need at least flext version 0.3.0 +#if !defined(FLEXT_VERSION) || (FLEXT_VERSION < 400) +#error You need at least flext version 0.4.0 #endif class simple3: @@ -52,9 +52,6 @@ simple3::simple3() // define inlets AddInAnything(); // add inlet of type anything (index 0) - // set up inlets and outlets - SetupInOut(); - // register methods FLEXT_ADDMETHOD_(0,"born",m_tag); // register method for tag "born" FLEXT_ADDMETHOD_(0,"to",m_tag); // register method for tag "to" diff --git a/externals/grill/flext/tutorial/simple3/simple3.cw b/externals/grill/flext/tutorial/simple3/simple3.cw Binary files differindex b29678f7..2b5bfb90 100644 --- a/externals/grill/flext/tutorial/simple3/simple3.cw +++ b/externals/grill/flext/tutorial/simple3/simple3.cw diff --git a/externals/grill/flext/tutorial/simple3/simple3.dsp b/externals/grill/flext/tutorial/simple3/simple3.dsp index 8390b044..dfc0155b 100644 --- a/externals/grill/flext/tutorial/simple3/simple3.dsp +++ b/externals/grill/flext/tutorial/simple3/simple3.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /W3 /GR- /GX- /O2 /I "..\..\source" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "NT" /D "PD" /YX /FD /c +# ADD CPP /nologo /W3 /O2 /I "..\..\source" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "NT" /D "PD" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0xc07 /d "NDEBUG" @@ -53,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib pd.lib flext-pdwin.lib /nologo /dll /machine:I386 /out:"../msvc/simple3.dll" /libpath:"..\..\pd-msvc" +# ADD LINK32 kernel32.lib user32.lib pd.lib flext-pdwin.lib /nologo /dll /machine:I386 /out:"../pd-msvc/simple3.dll" /libpath:"..\..\pd-msvc" !ELSEIF "$(CFG)" == "simple3 - Win32 Debug" @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GR- /GX- /ZI /Od /I "..\..\source" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "NT" /D "PD" /FR /YX /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /ZI /Od /I "..\..\source" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "NT" /D "PD" /FR /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0xc07 /d "_DEBUG" diff --git a/externals/grill/flext/tutorial/thread1/main.cpp b/externals/grill/flext/tutorial/thread1/main.cpp index 878cef76..72fb1019 100644 --- a/externals/grill/flext/tutorial/thread1/main.cpp +++ b/externals/grill/flext/tutorial/thread1/main.cpp @@ -10,15 +10,18 @@ WARRANTIES, see the file, "license.txt," in this distribution. This shows an example of a method running as a thread */ -// define FLEXT_THREADS for thread usage. Flext must also have been compiled with that defined! +/* define FLEXT_THREADS for thread usage. Flext must also have been compiled with that defined! + it's even better to define that as a compiler flag (-D FLEXT_THREADS) for all files of the + flext external +*/ #ifndef FLEXT_THREADS #define FLEXT_THREADS #endif #include <flext.h> -#if !defined(FLEXT_VERSION) || (FLEXT_VERSION < 301) -#error You need at least flext version 0.3.1 +#if !defined(FLEXT_VERSION) || (FLEXT_VERSION < 400) +#error You need at least flext version 0.4.0 #endif @@ -47,7 +50,6 @@ thread1::thread1() { AddInAnything(); AddOutInt(); - SetupInOut(); // set up inlets and outlets FLEXT_ADDBANG(0,m_start); // register method } diff --git a/externals/grill/flext/tutorial/thread1/thread1.dsp b/externals/grill/flext/tutorial/thread1/thread1.dsp index 7ef7ca52..4e0ca9f2 100644 --- a/externals/grill/flext/tutorial/thread1/thread1.dsp +++ b/externals/grill/flext/tutorial/thread1/thread1.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR- /GX- /O2 /I "..\..\source" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "NT" /D "PD" /D "FLEXT_THREADS" /YX /FD /c +# ADD CPP /nologo /MT /W3 /O2 /I "..\..\source" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "NT" /D "PD" /D "FLEXT_THREADS" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0xc07 /d "NDEBUG" @@ -53,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib pd.lib flext_t-pdwin.lib pthreadVC.lib /nologo /dll /machine:I386 /out:"../msvc/thread1.dll" /libpath:"..\..\pd-msvc" +# ADD LINK32 kernel32.lib user32.lib pd.lib flext_t-pdwin.lib pthreadVC.lib /nologo /dll /machine:I386 /out:"../pd-msvc/thread1.dll" /libpath:"..\..\pd-msvc" !ELSEIF "$(CFG)" == "thread1 - Win32 Debug" @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GR- /GX- /ZI /Od /I "..\..\source" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "NT" /D "PD" /D "FLEXT_THREADS" /FR /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /ZI /Od /I "..\..\source" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "NT" /D "PD" /D "FLEXT_THREADS" /FR /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0xc07 /d "_DEBUG" diff --git a/externals/grill/flext/tutorial/thread2/main.cpp b/externals/grill/flext/tutorial/thread2/main.cpp index ce2a170e..bd6354a2 100644 --- a/externals/grill/flext/tutorial/thread2/main.cpp +++ b/externals/grill/flext/tutorial/thread2/main.cpp @@ -10,15 +10,18 @@ WARRANTIES, see the file, "license.txt," in this distribution. This shows an example of multiple threads and syncing with a thread conditional */ -// define FLEXT_THREADS for thread usage. Flext must also have been compiled with that defined! +/* define FLEXT_THREADS for thread usage. Flext must also have been compiled with that defined! + it's even better to define that as a compiler flag (-D FLEXT_THREADS) for all files of the + flext external +*/ #ifndef FLEXT_THREADS #define FLEXT_THREADS #endif #include <flext.h> -#if !defined(FLEXT_VERSION) || (FLEXT_VERSION < 301) -#error You need at least flext version 0.3.1 +#if !defined(FLEXT_VERSION) || (FLEXT_VERSION < 400) +#error You need at least flext version 0.4.0 #endif @@ -65,7 +68,6 @@ thread2::thread2(int del): { AddInAnything(); AddOutInt(2); - SetupInOut(); // set up inlets and outlets FLEXT_ADDMETHOD(0,m_start); // register start for integer numbers (floats in PD) FLEXT_ADDMETHOD_(0,"text",m_text); // register m_text method for "text" tag diff --git a/externals/grill/flext/tutorial/thread2/thread2.dsp b/externals/grill/flext/tutorial/thread2/thread2.dsp index da5e149e..e0f6f115 100644 --- a/externals/grill/flext/tutorial/thread2/thread2.dsp +++ b/externals/grill/flext/tutorial/thread2/thread2.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR- /GX- /O2 /I "..\..\source" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "NT" /D "PD" /D "FLEXT_THREADS" /YX /FD /c +# ADD CPP /nologo /MT /W3 /O2 /I "..\..\source" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "NT" /D "PD" /D "FLEXT_THREADS" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0xc07 /d "NDEBUG" @@ -53,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib pd.lib flext_t-pdwin.lib pthreadVC.lib /nologo /dll /machine:I386 /out:"../msvc/thread2.dll" /libpath:"..\..\pd-msvc" +# ADD LINK32 kernel32.lib user32.lib pd.lib flext_t-pdwin.lib pthreadVC.lib /nologo /dll /machine:I386 /out:"../pd-msvc/thread2.dll" /libpath:"..\..\pd-msvc" !ELSEIF "$(CFG)" == "thread2 - Win32 Debug" @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GR- /GX- /ZI /Od /I "..\..\source" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "NT" /D "PD" /D "FLEXT_THREADS" /FR /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /ZI /Od /I "..\..\source" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "NT" /D "PD" /D "FLEXT_THREADS" /FR /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0xc07 /d "_DEBUG" diff --git a/externals/grill/flext/tutorial/tutorial.dsw b/externals/grill/flext/tutorial/tutorial.dsw index 5bc8001a..42eddaee 100644 --- a/externals/grill/flext/tutorial/tutorial.dsw +++ b/externals/grill/flext/tutorial/tutorial.dsw @@ -19,6 +19,38 @@ Package=<4> ############################################################################### +Project: "attr1"=.\attr1\attr1.dsp - Package Owner=<4> + +Package=<5> +{{{ + begin source code control + attr1 + .\attr1 + end source code control +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "attr2"=.\attr2\attr2.dsp - Package Owner=<4> + +Package=<5> +{{{ + begin source code control + attr2 + .\attr2 + end source code control +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + Project: "flext"=..\flext.dsp - Package Owner=<4> Package=<5> @@ -35,6 +67,22 @@ Package=<4> ############################################################################### +Project: "lib1"=.\lib1\lib1.dsp - Package Owner=<4> + +Package=<5> +{{{ + begin source code control + lib1 + .\lib1 + end source code control +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + Project: "signal1"=.\signal1\signal1.dsp - Package Owner=<4> Package=<5> |