From dbd3ec671dec8ea39032d3b0b56387df40c66c28 Mon Sep 17 00:00:00 2001 From: "N.N." Date: Wed, 31 Mar 2004 10:24:20 +0000 Subject: toxy alpha11 svn path=/trunk/externals/miXed/; revision=1526 --- Makefile.common | 13 +-- ViCious/cyclone/makefile | 77 +++++++++++++++++ ViCious/cyclone/objects | 213 ++++++++++++++++++++++++++++++++++++++++++++++ ViCious/cyclone/snapfiles | 11 +++ ViCious/cyclone/sources | 209 --------------------------------------------- ViCious/toxy/makefile | 59 +++++++++++++ ViCious/toxy/objects | 22 +++++ ViCious/toxy/snapfiles | 9 ++ cyclone/build_counter | 4 + shared/hammer/gui.c | 3 +- shared/toxy/scriptlet.c | 8 +- test/toxy/scale-test.pd | 8 +- toxy/Makefile | 11 +-- toxy/build_counter | 6 +- 14 files changed, 424 insertions(+), 229 deletions(-) create mode 100644 ViCious/cyclone/makefile create mode 100644 ViCious/cyclone/objects create mode 100644 ViCious/cyclone/snapfiles delete mode 100644 ViCious/cyclone/sources create mode 100644 ViCious/toxy/makefile create mode 100644 ViCious/toxy/objects create mode 100644 ViCious/toxy/snapfiles diff --git a/Makefile.common b/Makefile.common index 3e44de2..7f88cd1 100644 --- a/Makefile.common +++ b/Makefile.common @@ -183,13 +183,16 @@ define_build: mv build_counter build_counter~ ; \ echo -n 'increment build counter (y/n)? [n]' ; read doit ; \ if [ $$doit ] && [ $$doit == 'y' ] ; then \ - cat build_counter~ | \ + head -3 build_counter~ | \ awk '{if (index($$2,"BUILD")) print $$1, $$2, $$3+1; else print}' \ - > build_counter ; \ - cat build_counter | \ - awk 'BEGIN {printf toupper("$(BASE_NAME)_VERSION = ")} \ + > build_temporary ; \ + cat build_temporary | \ + awk 'BEGIN {printf "\n#if 0\n"; \ + printf toupper("$(BASE_NAME)_SNAPSHOT = ")} \ {gsub("\"","",$$3); printf $$3; if (NR==1) printf "-"} \ - END {printf "\r\n" }' > $(ROOT_DIR)/ViCious/$(BASE_DIR)/version ; \ + END {printf "\n#endif\n" }' | \ + cat build_temporary - > build_counter ; \ + rm -f build_temporary ; \ else cat build_counter~ > build_counter ; fi \ fi diff --git a/ViCious/cyclone/makefile b/ViCious/cyclone/makefile new file mode 100644 index 0000000..68fc15c --- /dev/null +++ b/ViCious/cyclone/makefile @@ -0,0 +1,77 @@ +current: cyclone + +.SUFFIXES: .dll .obj + +ROOTDIR = ..\..\.. +SRCDIR = $(ROOTDIR)\miXed\cyclone +BINDIR = $(ROOTDIR)\miXed\bin +SHAREDDIR = $(ROOTDIR)\miXed\shared +EXTDIR = e:\PureData\externals +PDDIR = e:\PureData\pd +VCLIBDIR = "e:\Program Files\Microsoft Visual Studio\Vc98\lib" +ZIPCOMMAND = d:\dosowe\arc\info-zip\zip + +INCLUDES = /I. /I$(SHAREDDIR) /I$(PDDIR)\src +CFLAGS = /W3 /WX /DNT /DPD /nologo + +LIBS = $(VCLIBDIR)\libc.lib \ + $(VCLIBDIR)\oldnames.lib \ + $(VCLIBDIR)\wsock32.lib \ + $(VCLIBDIR)\kernel32.lib \ + $(VCLIBDIR)\uuid.lib \ + $(PDDIR)\bin\pd.lib + +!INCLUDE objects +!INCLUDE snapfiles +!INCLUDE $(SRCDIR)\build_counter + +cyclone: cyclone.dll hammer.dll sickle.dll dummies.dll cyclist.exe + @cd $(ROOTDIR) + @$(ZIPCOMMAND) cyclone-$(CYCLONE_SNAPSHOT).zip $(SNAPFILES) + +cyclone.dll: $(CYCLONE_OBJECTS) + -link /dll /out:$@ $(LIBS) $** /export:$(@:.dll=_setup) + -@copy $@ $(EXTDIR) + -@move $@ $(BINDIR) + -del $(@:.dll=.exp) + -del $(@:.dll=.lib) + +hammer.dll: $(HAMMER_OBJECTS) + -link /dll /out:$@ $(LIBS) $** /export:$(@:.dll=_setup) + -@copy $@ $(EXTDIR) + -@move $@ $(BINDIR) + -del $(@:.dll=.exp) + -del $(@:.dll=.lib) + +sickle.dll: $(SICKLE_OBJECTS) + -link /dll /out:$@ $(LIBS) $** /export:$(@:.dll=_setup) + -@copy $@ $(EXTDIR) + -@move $@ $(BINDIR) + -del $(@:.dll=.exp) + -del $(@:.dll=.lib) + +dummies.dll: $(DUMMIES_OBJECTS) + -link /dll /out:$@ $(LIBS) $** /export:$(@:.dll=_setup) + -@copy $@ $(EXTDIR) + -@move $@ $(BINDIR) + -del $(@:.dll=.exp) + -del $(@:.dll=.lib) + +cyclist.exe: $(SHAREDDIR)\common\binport.c + -del /S $(SHAREDDIR)\common\binport.obj + -cl $(CFLAGS) $(INCLUDES) /DBINPORT_STANDALONE /o $@ \ + $(VCLIBDIR)\libc.lib $(SHAREDDIR)\common\binport.c + -@move $@ $(BINDIR) + -del /S binport.obj + +.c.obj: ; cl /c $(CFLAGS) $(INCLUDES) /Fo$*.obj $*.c + +clean: + for %1 in (hammer shadow sickle) \ + do del %1\*.obj + for %1 in (hammer shadow sickle) \ + do del %1\*.exp + for %1 in (hammer shadow sickle) \ + do del %1\*.lib + for %1 in (hammer shadow sickle) \ + do del %1\*.dll diff --git a/ViCious/cyclone/objects b/ViCious/cyclone/objects new file mode 100644 index 0000000..f5dc5a5 --- /dev/null +++ b/ViCious/cyclone/objects @@ -0,0 +1,213 @@ +CYCLONE_OBJECTS = \ + $(SRCDIR)\shadow\cyclone.obj \ + $(SRCDIR)\shadow\nettles.obj \ + $(SHAREDDIR)\common\loud.obj \ + $(SHAREDDIR)\common\grow.obj \ + $(SHAREDDIR)\common\binport.obj \ + $(SHAREDDIR)\common\port.obj \ + $(SHAREDDIR)\hammer\file.obj \ + $(SHAREDDIR)\sickle\sic.obj \ + $(SHAREDDIR)\unstable\forky.obj \ + $(SHAREDDIR)\unstable\fragile.obj \ + $(SHAREDDIR)\unstable\fringe.obj \ + $(SHAREDDIR)\unstable\loader.obj + +ALL_HAMMERS = \ + $(SRCDIR)\hammer\testmess.obj \ + $(SRCDIR)\hammer\accum.obj \ + $(SRCDIR)\hammer\acos.obj \ + $(SRCDIR)\hammer\active.obj \ + $(SRCDIR)\hammer\anal.obj \ + $(SRCDIR)\hammer\Append.obj \ + $(SRCDIR)\hammer\asin.obj \ + $(SRCDIR)\hammer\bangbang.obj \ + $(SRCDIR)\hammer\bondo.obj \ + $(SRCDIR)\hammer\Borax.obj \ + $(SRCDIR)\hammer\Bucket.obj \ + $(SRCDIR)\hammer\buddy.obj \ + $(SRCDIR)\hammer\capture.obj \ + $(SRCDIR)\hammer\cartopol.obj \ + $(SRCDIR)\hammer\Clip.obj \ + $(SRCDIR)\hammer\coll.obj \ + $(SRCDIR)\hammer\comment.obj \ + $(SRCDIR)\hammer\cosh.obj \ + $(SRCDIR)\hammer\counter.obj \ + $(SRCDIR)\hammer\cycle.obj \ + $(SRCDIR)\hammer\decide.obj \ + $(SRCDIR)\hammer\Decode.obj \ + $(SRCDIR)\hammer\drunk.obj \ + $(SRCDIR)\hammer\flush.obj \ + $(SRCDIR)\hammer\forward.obj \ + $(SRCDIR)\hammer\fromsymbol.obj \ + $(SRCDIR)\hammer\funbuff.obj \ + $(SRCDIR)\hammer\funnel.obj \ + $(SRCDIR)\hammer\gate.obj \ + $(SRCDIR)\hammer\grab.obj \ + $(SRCDIR)\hammer\Histo.obj \ + $(SRCDIR)\hammer\iter.obj \ + $(SRCDIR)\hammer\match.obj \ + $(SRCDIR)\hammer\maximum.obj \ + $(SRCDIR)\hammer\mean.obj \ + $(SRCDIR)\hammer\midiflush.obj \ + $(SRCDIR)\hammer\midiformat.obj \ + $(SRCDIR)\hammer\midiparse.obj \ + $(SRCDIR)\hammer\minimum.obj \ + $(SRCDIR)\hammer\mousefilter.obj \ + $(SRCDIR)\hammer\MouseState.obj \ + $(SRCDIR)\hammer\mtr.obj \ + $(SRCDIR)\hammer\next.obj \ + $(SRCDIR)\hammer\offer.obj \ + $(SRCDIR)\hammer\onebang.obj \ + $(SRCDIR)\hammer\past.obj \ + $(SRCDIR)\hammer\Peak.obj \ + $(SRCDIR)\hammer\poltocar.obj \ + $(SRCDIR)\hammer\prepend.obj \ + $(SRCDIR)\hammer\prob.obj \ + $(SRCDIR)\hammer\pv.obj \ + $(SRCDIR)\hammer\seq.obj \ + $(SRCDIR)\hammer\sinh.obj \ + $(SRCDIR)\hammer\speedlim.obj \ + $(SRCDIR)\hammer\spell.obj \ + $(SRCDIR)\hammer\split.obj \ + $(SRCDIR)\hammer\spray.obj \ + $(SRCDIR)\hammer\sprintf.obj \ + $(SRCDIR)\hammer\substitute.obj \ + $(SRCDIR)\hammer\sustain.obj \ + $(SRCDIR)\hammer\switch.obj \ + $(SRCDIR)\hammer\tanh.obj \ + $(SRCDIR)\hammer\thresh.obj \ + $(SRCDIR)\hammer\TogEdge.obj \ + $(SRCDIR)\hammer\tosymbol.obj \ + $(SRCDIR)\hammer\Trough.obj \ + $(SRCDIR)\hammer\universal.obj \ + $(SRCDIR)\hammer\urn.obj \ + $(SRCDIR)\hammer\Uzi.obj \ + $(SRCDIR)\hammer\xbendin.obj \ + $(SRCDIR)\hammer\xbendin2.obj \ + $(SRCDIR)\hammer\xbendout.obj \ + $(SRCDIR)\hammer\xbendout2.obj \ + $(SRCDIR)\hammer\xnotein.obj \ + $(SRCDIR)\hammer\xnoteout.obj \ + $(SRCDIR)\hammer\zl.obj + +HAMMER_OBJECTS = $(ALL_HAMMERS) \ + $(SRCDIR)\hammer\hammer.obj \ + $(SRCDIR)\hammer\allhammers.obj \ + $(SHAREDDIR)\common\loud.obj \ + $(SHAREDDIR)\common\grow.obj \ + $(SHAREDDIR)\common\rand.obj \ + $(SHAREDDIR)\common\vefl.obj \ + $(SHAREDDIR)\common\sq.obj \ + $(SHAREDDIR)\common\bifi.obj \ + $(SHAREDDIR)\common\mifi.obj \ + $(SHAREDDIR)\common\binport.obj \ + $(SHAREDDIR)\common\port.obj \ + $(SHAREDDIR)\hammer\file.obj \ + $(SHAREDDIR)\hammer\gui.obj \ + $(SHAREDDIR)\hammer\tree.obj \ + $(SHAREDDIR)\unstable\forky.obj \ + $(SHAREDDIR)\unstable\fragile.obj \ + $(SHAREDDIR)\unstable\fringe.obj \ + $(SHAREDDIR)\unstable\loader.obj + +ALL_SICKLES = \ + $(SRCDIR)\sickle\abs.obj \ + $(SRCDIR)\sickle\acos.obj \ + $(SRCDIR)\sickle\acosh.obj \ + $(SRCDIR)\sickle\allpass.obj \ + $(SRCDIR)\sickle\asin.obj \ + $(SRCDIR)\sickle\asinh.obj \ + $(SRCDIR)\sickle\atan.obj \ + $(SRCDIR)\sickle\atan2.obj \ + $(SRCDIR)\sickle\atanh.obj \ + $(SRCDIR)\sickle\average.obj \ + $(SRCDIR)\sickle\avg.obj \ + $(SRCDIR)\sickle\bitand.obj \ + $(SRCDIR)\sickle\bitnot.obj \ + $(SRCDIR)\sickle\bitor.obj \ + $(SRCDIR)\sickle\bitshift.obj \ + $(SRCDIR)\sickle\bitxor.obj \ + $(SRCDIR)\sickle\buffir.obj \ + $(SRCDIR)\sickle\capture.obj \ + $(SRCDIR)\sickle\cartopol.obj \ + $(SRCDIR)\sickle\change.obj \ + $(SRCDIR)\sickle\click.obj \ + $(SRCDIR)\sickle\Clip.obj \ + $(SRCDIR)\sickle\comb.obj \ + $(SRCDIR)\sickle\cosh.obj \ + $(SRCDIR)\sickle\cosx.obj \ + $(SRCDIR)\sickle\count.obj \ + $(SRCDIR)\sickle\curve.obj \ + $(SRCDIR)\sickle\cycle.obj \ + $(SRCDIR)\sickle\delay.obj \ + $(SRCDIR)\sickle\delta.obj \ + $(SRCDIR)\sickle\deltaclip.obj \ + $(SRCDIR)\sickle\edge.obj \ + $(SRCDIR)\sickle\frameaccum.obj \ + $(SRCDIR)\sickle\framedelta.obj \ + $(SRCDIR)\sickle\index.obj \ + $(SRCDIR)\sickle\kink.obj \ + $(SRCDIR)\sickle\Line.obj \ + $(SRCDIR)\sickle\linedrive.obj \ + $(SRCDIR)\sickle\log.obj \ + $(SRCDIR)\sickle\lookup.obj \ + $(SRCDIR)\sickle\lores.obj \ + $(SRCDIR)\sickle\maximum.obj \ + $(SRCDIR)\sickle\minimum.obj \ + $(SRCDIR)\sickle\minmax.obj \ + $(SRCDIR)\sickle\mstosamps.obj \ + $(SRCDIR)\sickle\onepole.obj \ + $(SRCDIR)\sickle\peakamp.obj \ + $(SRCDIR)\sickle\peek.obj \ + $(SRCDIR)\sickle\phasewrap.obj \ + $(SRCDIR)\sickle\pink.obj \ + $(SRCDIR)\sickle\play.obj \ + $(SRCDIR)\sickle\poke.obj \ + $(SRCDIR)\sickle\poltocar.obj \ + $(SRCDIR)\sickle\pong.obj \ + $(SRCDIR)\sickle\pow.obj \ + $(SRCDIR)\sickle\rand.obj \ + $(SRCDIR)\sickle\rampsmooth.obj \ + $(SRCDIR)\sickle\record.obj \ + $(SRCDIR)\sickle\reson.obj \ + $(SRCDIR)\sickle\sah.obj \ + $(SRCDIR)\sickle\sampstoms.obj \ + $(SRCDIR)\sickle\Scope.obj \ + $(SRCDIR)\sickle\sinh.obj \ + $(SRCDIR)\sickle\sinx.obj \ + $(SRCDIR)\sickle\slide.obj \ + $(SRCDIR)\sickle\Snapshot.obj \ + $(SRCDIR)\sickle\spike.obj \ + $(SRCDIR)\sickle\svf.obj \ + $(SRCDIR)\sickle\tanh.obj \ + $(SRCDIR)\sickle\tanx.obj \ + $(SRCDIR)\sickle\train.obj \ + $(SRCDIR)\sickle\trapezoid.obj \ + $(SRCDIR)\sickle\triangle.obj \ + $(SRCDIR)\sickle\vectral.obj \ + $(SRCDIR)\sickle\wave.obj \ + $(SRCDIR)\sickle\zerox.obj + +SICKLE_OBJECTS = $(ALL_SICKLES) \ + $(SRCDIR)\sickle\sickle.obj \ + $(SRCDIR)\sickle\allsickles.obj \ + $(SHAREDDIR)\common\loud.obj \ + $(SHAREDDIR)\common\grow.obj \ + $(SHAREDDIR)\common\vefl.obj \ + $(SHAREDDIR)\common\binport.obj \ + $(SHAREDDIR)\common\port.obj \ + $(SHAREDDIR)\hammer\file.obj \ + $(SHAREDDIR)\sickle\sic.obj \ + $(SHAREDDIR)\sickle\arsic.obj \ + $(SHAREDDIR)\unstable\forky.obj \ + $(SHAREDDIR)\unstable\fragile.obj \ + $(SHAREDDIR)\unstable\fringe.obj \ + $(SHAREDDIR)\unstable\loader.obj + +DUMMIES_OBJECTS = \ + $(SRCDIR)\shadow\dummies.obj \ + $(SHAREDDIR)\common\loud.obj + +CYCLIST_OBJECTS = \ + $(SHAREDDIR)\common\binport.obj + diff --git a/ViCious/cyclone/snapfiles b/ViCious/cyclone/snapfiles new file mode 100644 index 0000000..d5ce6de --- /dev/null +++ b/ViCious/cyclone/snapfiles @@ -0,0 +1,11 @@ +SNAPFILES = \ + miXed\bin\cyclone.dll \ + miXed\bin\hammer.dll \ + miXed\bin\sickle.dll \ + miXed\bin\dummies.dll \ + miXed\bin\cyclist.exe \ + miXed\ViCious\cyclone\makefile \ + miXed\ViCious\cyclone\objects \ + miXed\ViCious\cyclone\snapfiles \ + miXed\LICENSE.txt \ + miXed\test\cyclone\*.* diff --git a/ViCious/cyclone/sources b/ViCious/cyclone/sources deleted file mode 100644 index 1f9f88d..0000000 --- a/ViCious/cyclone/sources +++ /dev/null @@ -1,209 +0,0 @@ -LIB_CYCLONE = \ - shadow\cyclone.c \ - shadow\nettles.c \ - shared\common\loud.c \ - shared\common\grow.c \ - shared\common\binport.c \ - shared\common\port.c \ - shared\hammer\file.c \ - shared\sickle\sic.c \ - shared\unstable\forky.c \ - shared\unstable\fragile.c \ - shared\unstable\fringe.c \ - shared\unstable\loader.c - -LIB_HAMMER = \ - hammer\hammer.c \ - hammer\allhammers.c \ - shared\common\loud.c \ - shared\common\grow.c \ - shared\common\rand.c \ - shared\common\vefl.c \ - shared\common\sq.c \ - shared\common\bifi.c \ - shared\common\mifi.c \ - shared\common\binport.c \ - shared\common\port.c \ - shared\hammer\file.c \ - shared\hammer\gui.c \ - shared\hammer\tree.c \ - shared\unstable\forky.c \ - shared\unstable\fragile.c \ - shared\unstable\fringe.c \ - shared\unstable\loader.c - -ALL_HAMMERS = \ - hammer\testmess.c \ - hammer\accum.c \ - hammer\acos.c \ - hammer\active.c \ - hammer\anal.c \ - hammer\Append.c \ - hammer\asin.c \ - hammer\bangbang.c \ - hammer\bondo.c \ - hammer\Borax.c \ - hammer\Bucket.c \ - hammer\buddy.c \ - hammer\capture.c \ - hammer\cartopol.c \ - hammer\Clip.c \ - hammer\coll.c \ - hammer\comment.c \ - hammer\cosh.c \ - hammer\counter.c \ - hammer\cycle.c \ - hammer\decide.c \ - hammer\Decode.c \ - hammer\drunk.c \ - hammer\flush.c \ - hammer\forward.c \ - hammer\fromsymbol.c \ - hammer\funbuff.c \ - hammer\funnel.c \ - hammer\gate.c \ - hammer\grab.c \ - hammer\Histo.c \ - hammer\iter.c \ - hammer\match.c \ - hammer\maximum.c \ - hammer\mean.c \ - hammer\midiflush.c \ - hammer\midiformat.c \ - hammer\midiparse.c \ - hammer\minimum.c \ - hammer\mousefilter.c \ - hammer\MouseState.c \ - hammer\mtr.c \ - hammer\next.c \ - hammer\offer.c \ - hammer\onebang.c \ - hammer\past.c \ - hammer\Peak.c \ - hammer\poltocar.c \ - hammer\prepend.c \ - hammer\prob.c \ - hammer\pv.c \ - hammer\seq.c \ - hammer\sinh.c \ - hammer\speedlim.c \ - hammer\spell.c \ - hammer\split.c \ - hammer\spray.c \ - hammer\sprintf.c \ - hammer\substitute.c \ - hammer\sustain.c \ - hammer\switch.c \ - hammer\tanh.c \ - hammer\thresh.c \ - hammer\TogEdge.c \ - hammer\tosymbol.c \ - hammer\Trough.c \ - hammer\universal.c \ - hammer\urn.c \ - hammer\Uzi.c \ - hammer\xbendin.c \ - hammer\xbendin2.c \ - hammer\xbendout.c \ - hammer\xbendout2.c \ - hammer\xnotein.c \ - hammer\xnoteout.c \ - hammer\zl.c - -LIB_SICKLE = \ - sickle\sickle.c \ - sickle\allsickles.c \ - shared\common\loud.c \ - shared\common\grow.c \ - shared\common\vefl.c \ - shared\common\binport.c \ - shared\common\port.c \ - shared\hammer\file.c \ - shared\sickle\sic.c \ - shared\sickle\arsic.c \ - shared\unstable\forky.c \ - shared\unstable\fragile.c \ - shared\unstable\fringe.c \ - shared\unstable\loader.c - -ALL_SICKLES = \ - sickle\abs.c \ - sickle\acos.c \ - sickle\acosh.c \ - sickle\allpass.c \ - sickle\asin.c \ - sickle\asinh.c \ - sickle\atan.c \ - sickle\atan2.c \ - sickle\atanh.c \ - sickle\average.c \ - sickle\avg.c \ - sickle\bitand.c \ - sickle\bitnot.c \ - sickle\bitor.c \ - sickle\bitshift.c \ - sickle\bitxor.c \ - sickle\buffir.c \ - sickle\capture.c \ - sickle\cartopol.c \ - sickle\change.c \ - sickle\click.c \ - sickle\Clip.c \ - sickle\comb.c \ - sickle\cosh.c \ - sickle\cosx.c \ - sickle\count.c \ - sickle\curve.c \ - sickle\cycle.c \ - sickle\delay.c \ - sickle\delta.c \ - sickle\deltaclip.c \ - sickle\edge.c \ - sickle\frameaccum.c \ - sickle\framedelta.c \ - sickle\index.c \ - sickle\kink.c \ - sickle\Line.c \ - sickle\linedrive.c \ - sickle\log.c \ - sickle\lookup.c \ - sickle\lores.c \ - sickle\maximum.c \ - sickle\minimum.c \ - sickle\minmax.c \ - sickle\mstosamps.c \ - sickle\onepole.c \ - sickle\peakamp.c \ - sickle\peek.c \ - sickle\phasewrap.c \ - sickle\pink.c \ - sickle\play.c \ - sickle\poke.c \ - sickle\poltocar.c \ - sickle\pong.c \ - sickle\pow.c \ - sickle\rand.c \ - sickle\rampsmooth.c \ - sickle\record.c \ - sickle\reson.c \ - sickle\sah.c \ - sickle\sampstoms.c \ - sickle\Scope.c \ - sickle\sinh.c \ - sickle\sinx.c \ - sickle\slide.c \ - sickle\Snapshot.c \ - sickle\spike.c \ - sickle\svf.c \ - sickle\tanh.c \ - sickle\tanx.c \ - sickle\train.c \ - sickle\trapezoid.c \ - sickle\triangle.c \ - sickle\vectral.c \ - sickle\wave.c \ - sickle\zerox.c - -LIB_DUMMIES = \ - shadow\dummies.c \ - shared\common\loud.c diff --git a/ViCious/toxy/makefile b/ViCious/toxy/makefile new file mode 100644 index 0000000..cf55984 --- /dev/null +++ b/ViCious/toxy/makefile @@ -0,0 +1,59 @@ +current: toxy + +.SUFFIXES: .dll .obj + +ROOTDIR = ..\..\.. +SRCDIR = $(ROOTDIR)\miXed\toxy +BINDIR = $(ROOTDIR)\miXed\bin +SHAREDDIR = $(ROOTDIR)\miXed\shared +EXTDIR = e:\PureData\externals +PDDIR = e:\PureData\pd +VCLIBDIR = "e:\Program Files\Microsoft Visual Studio\Vc98\lib" +ZIPCOMMAND = d:\dosowe\arc\info-zip\zip + +INCLUDES = /I. /I$(SHAREDDIR) /I$(PDDIR)\src +CFLAGS = /W3 /WX /DNT /DPD /nologo + +LIBS = $(VCLIBDIR)\libc.lib \ + $(VCLIBDIR)\oldnames.lib \ + $(VCLIBDIR)\wsock32.lib \ + $(VCLIBDIR)\kernel32.lib \ + $(VCLIBDIR)\uuid.lib \ + $(PDDIR)\bin\pd.lib + +!INCLUDE objects +!INCLUDE snapfiles +!INCLUDE $(SRCDIR)\build_counter + +toxy: tot.dll tow.dll widget.dll + @cd $(ROOTDIR) + @$(ZIPCOMMAND) toxy-$(TOXY_SNAPSHOT).zip $(SNAPFILES) + +tot.dll: $(TOT_OBJECTS) + -link /dll /out:$@ $(LIBS) $** /export:$(@:.dll=_setup) + -@copy $@ $(EXTDIR) + -@move $@ $(BINDIR) + -del $(@:.dll=.exp) + -del $(@:.dll=.lib) + +tow.dll: $(TOW_OBJECTS) + -link /dll /out:$@ $(LIBS) $** /export:$(@:.dll=_setup) + -@copy $@ $(EXTDIR) + -@move $@ $(BINDIR) + -del $(@:.dll=.exp) + -del $(@:.dll=.lib) + +widget.dll: $(WIDGET_OBJECTS) + -link /dll /out:$@ $(LIBS) $** /export:$(@:.dll=_setup) + -@copy $@ $(EXTDIR) + -@move $@ $(BINDIR) + -del $(@:.dll=.exp) + -del $(@:.dll=.lib) + +.c.obj: ; cl /c $(CFLAGS) $(INCLUDES) /Fo$*.obj $*.c + +clean: + del *.obj + del *.exp + del *.lib + del *.dll diff --git a/ViCious/toxy/objects b/ViCious/toxy/objects new file mode 100644 index 0000000..f0c4d85 --- /dev/null +++ b/ViCious/toxy/objects @@ -0,0 +1,22 @@ +TOT_OBJECTS = $(SRCDIR)\tot.obj \ + $(SHAREDDIR)\unstable\forky.obj \ + $(SHAREDDIR)\common\loud.obj \ + $(SHAREDDIR)\common\grow.obj \ + $(SHAREDDIR)\hammer\file.obj \ + $(SHAREDDIR)\hammer\gui.obj \ + $(SHAREDDIR)\common\props.obj \ + $(SHAREDDIR)\toxy\scriptlet.obj + +TOW_OBJECTS = $(SRCDIR)\tow.obj \ + $(SHAREDDIR)\common\loud.obj \ + $(SHAREDDIR)\unstable\loader.obj + +WIDGET_OBJECTS = $(SRCDIR)\widget.obj \ + $(SRCDIR)\widgettype.obj \ + $(SHAREDDIR)\unstable\forky.obj \ + $(SHAREDDIR)\common\loud.obj \ + $(SHAREDDIR)\common\grow.obj \ + $(SHAREDDIR)\common\dict.obj \ + $(SHAREDDIR)\hammer\file.obj \ + $(SHAREDDIR)\common\props.obj \ + $(SHAREDDIR)\toxy\scriptlet.obj diff --git a/ViCious/toxy/snapfiles b/ViCious/toxy/snapfiles new file mode 100644 index 0000000..d83b373 --- /dev/null +++ b/ViCious/toxy/snapfiles @@ -0,0 +1,9 @@ +SNAPFILES = \ + miXed\bin\tot.dll \ + miXed\bin\tow.dll \ + miXed\bin\widget.dll \ + miXed\ViCious\toxy\makefile \ + miXed\ViCious\toxy\objects \ + miXed\ViCious\toxy\snapfiles \ + miXed\LICENSE.txt \ + miXed\test\toxy\*.* diff --git a/cyclone/build_counter b/cyclone/build_counter index 6178b17..d4ff028 100644 --- a/cyclone/build_counter +++ b/cyclone/build_counter @@ -1,3 +1,7 @@ #define CYCLONE_VERSION "0.1" #define CYCLONE_RELEASE "alpha" #define CYCLONE_BUILD 48 + +#if 0 +CYCLONE_SNAPSHOT = 0.1-alpha48 +#endif diff --git a/shared/hammer/gui.c b/shared/hammer/gui.c index 131ddfe..ec6add7 100644 --- a/shared/hammer/gui.c +++ b/shared/hammer/gui.c @@ -199,7 +199,8 @@ static void hammergui_setup(void) /* Protect against pdCmd being called (via "Canvas " binding) during Tcl_Finalize(). FIXME this should be a standard exit handler. */ sys_gui("proc hammergui_exithook {cmd op} {proc pd {} {}}\n"); - sys_gui("trace add execution exit enter hammergui_exithook\n"); + sys_gui("if {[info tclversion] >= 8.4} {\n\ + trace add execution exit enter hammergui_exithook}\n"); sys_gui("proc hammergui_ispatcher {cv} {\n"); sys_gui(" if {[string range $cv 0 1] == \".x\""); diff --git a/shared/toxy/scriptlet.c b/shared/toxy/scriptlet.c index a2f5ee0..192eaa6 100644 --- a/shared/toxy/scriptlet.c +++ b/shared/toxy/scriptlet.c @@ -471,8 +471,12 @@ void scriptlet_qpush(t_scriptlet *sp) sys_gui(sp->s_buffer); *tail = 0; sprintf(buf, "\ - trace add variable ::toxy::reply write \"::toxy::doreply %s\"\n\ - ::toxy::query}\n", sp->s_rptarget->s_name); + if {[info tclversion] < 8.4} {\n\ + trace variable ::toxy::reply w \"::toxy::doreply %s\"\n\ + } else {\n\ + trace add variable ::toxy::reply write \"::toxy::doreply %s\"\n\ + }\n\ + ::toxy::query}\n", sp->s_rptarget->s_name, sp->s_rptarget->s_name); sys_gui(buf); } } diff --git a/test/toxy/scale-test.pd b/test/toxy/scale-test.pd index c13d3b3..dad485f 100644 --- a/test/toxy/scale-test.pd +++ b/test/toxy/scale-test.pd @@ -1,5 +1,5 @@ #N canvas 79 51 599 397 12; -#X obj 22 197 widget scale s -command [concat ::toxy::scalecommand +#X obj 22 197 widget scale s -command [concat ::toxy::scale_command .| _cb] -variable ::toxy::simplescale -label "Simple Scale" -orient h -length 300 -width 50 -font "Helvetica 12" -from -16 -to 16 -showvalue 0 @float .- set .#1; @@ -12,9 +12,9 @@ h -length 300 -width 50 -font "Helvetica 12" -from -16 -to 16 -showvalue #X obj 44 133 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1 ; #X floatatom 214 336 5 0 0 0 - - -; -#X msg 33 103 -command [concat ::toxy::scalecommand .| _cb]; +#X msg 33 103 -command [concat ::toxy::scale_command .| _cb]; #X obj 214 306 r \$0-scale; -#X msg 22 70 -command [concat ::toxy::scalecommand \$1-scale float] +#X msg 22 70 -command [concat ::toxy::scale_command \$1-scale float] ; #X obj 22 10 loadbang; #X obj 22 40 int \$0; @@ -23,7 +23,7 @@ h -length 300 -width 50 -font "Helvetica 12" -from -16 -to 16 -showvalue #X msg 188 40 remove @float; #X floatatom 89 45 5 0 0 0 - - -; #N canvas 0 0 450 420 linked 0; -#X obj 54 49 widget scale s -command [concat ::toxy::scalecommand .| +#X obj 54 49 widget scale s -command [concat ::toxy::scale_command .| _cb] -variable ::toxy::simplescale -orient v -length 300 -width 50 -font "Helvetica 12" -from -16 -to 16 -showvalue 0 @float .- set .#1 ; diff --git a/toxy/Makefile b/toxy/Makefile index 07cd407..3035cb4 100644 --- a/toxy/Makefile +++ b/toxy/Makefile @@ -8,13 +8,10 @@ checkwiq: rm -f $(WIQFILE) ; fi $(WIQFILE): $(WIDPATH) @echo transferring widget definitions from \"$<\" to \"$@\" - @cat $< | sed \ --e '1i\ -// Do not edit this file (edit \"$<\", and run \"make\").' \ --e '1i\ -//' \ --e '1i\ -\"puts stderr [concat loading built-in widget definitions]\\n\"' \ + @echo -e '// Do not edit this file (edit "$<", and run "make").\ +\n//\nputs stderr [concat loading built-in widget definitions]' \ + | cat - $< | sed \ +-e '1,\|//$$|{p;d;}' \ -e 's/\([\\\"]\)/\\\1/g' \ -e 's/^.*$$/\"&\\n\"/' > $@ @if [ -f $(WIQFILE) ] && ! [ -s $(WIQFILE) ] ; then \ diff --git a/toxy/build_counter b/toxy/build_counter index 34a11d3..749f20b 100644 --- a/toxy/build_counter +++ b/toxy/build_counter @@ -1,3 +1,7 @@ #define TOXY_VERSION "0.1" #define TOXY_RELEASE "alpha" -#define TOXY_BUILD 10 +#define TOXY_BUILD 11 + +#if 0 +TOXY_SNAPSHOT = 0.1-alpha11 +#endif -- cgit v1.2.1