added ogg lib; compiles with chaos objects added

svn path=/trunk/; revision=1146

2 files changed, 39 insertions, 10 deletions

diff --git a/externals/build/win/filelist.inc b/externals/build/win/filelist.inc
index 432bf9ee..dd8fd03d 100644
--- a/externals/build/win/filelist.inc
+++ b/externals/build/win/filelist.inc
@@ -11,10 +11,12 @@ arraysize.c \
 ascseq.c \

 ascwave.c \

 atan2~.c \

+#attract1.c \

 average.c \

 bandpass.c \

+#base.c \

+#base3.c \

 #bdiag~.c \

-beatpipe.c \

 beat.c \

 beta.c \

 #bfft~.c \

@@ -29,11 +31,13 @@ cauchy.c \
 #cdplayer.c \

 cheby~.c \

 #chord.c \

+#concat.c \

 counter.c \

 cxavgdev.c \

 cxmean.c \

 cxstddev.c \

 define_loudspeakers.c \

+#dejong.c \

 delta.c \

 delta~.c \

 deny.c \

@@ -65,12 +69,14 @@ gem_change.c \
 gem_counter.c \

 gestalt.c \

 getenv.c \

+#gingerbreadman.c \

 #henon.c \

 hex2dec.c \

 highpass.c \

 highshelf.c \

 history.c \

 hlshelf.c \

+#hopalong.c \

 #ibfft~.c \

 #idwt~.c \

 #ifeel.c \

@@ -84,6 +90,10 @@ ixprint.c \
 #junction~.c \

 kalashnikov.c \

 #knob.c \

+#latoocarfian.c \

+#latoomutalpha.c \

+#latoomutbeta.c \

+#latoomutgamma.c \

 lattice~.c \

 lifo.c \

 limit.c \

@@ -94,11 +104,14 @@ linear.c \
 listfifo.c \

 listfunnel.c \

 ln~.c \

+#logistic.c \

 #lorenz.c \

+#lotka_volterra.c \

 lowpass.c \

 lowshelf.c \

 mandelbrot.c \

 mandelbrot~.c \

+#martin.c \

 match.c \

 #matrix~.c \

 mean~.c \

@@ -106,6 +119,7 @@ microtime.c \
 minus.c \

 mixer~.c \

 mlife.c \

+#mlogistic.c \

 moog~.c \

 multi.c \

 multiselect.c \

@@ -116,10 +130,10 @@ netrec.c \
 netserver.c \

 notch.c \

 nroute.c \

-#oggamp~.c \

-#oggcast~.c \

+oggamp~.c \

+oggcast~.c \

 #oggread~.c \

-#oggwrite~.c \

+oggwrite~.c \

 oneshot.c \

 #openpatch.c \

 #ossmixer.c \

@@ -127,15 +141,17 @@ pan_gogins~.c \
 pansig~.c \

 pan~.c \

 #permut~.c \

+#pickover.c \

 #piperead~.c \

 #pipewrite~.c \

-#pitch.c \

+pitch.c \

 #plugin~.c \

 plus.c \

 poisson.c \

 pol2rec~.c \

 polygate~.c \

 pong.c \

+#popcorn.c \

 prepend.c \

 proc.c \

 #promiscous~.c \

@@ -144,6 +160,7 @@ pulse.c \
 qmult~.c \

 qnorm~.c \

 #qread.c \

+#quadruptwo.c \

 ramp~.c \

 random1.c \

 randomF.c \

@@ -179,15 +196,17 @@ sfwrite~.c \
 #shell.c \

 shuffle.c \

 sinh.c \

-#sl.c \

+sl.c \

 #slider.c \

 #sliderh.c \

 speedlim.c \

 split.c \

-sprinkler.c \

+#sprinkler.c \

+#standardmap.c \

 state.c \

 statwav~.c \

 step.c \

+#strange1.c \

 strcat.c \

 streamin13~.c \

 streamin~.c \

@@ -202,14 +221,18 @@ sync.c \
 system.c \

 #tabreadmix~.c \

 temperature.c \

+#tent.c \

+#three_d.c \

+#threeply.c \

 throw13~.c \

 #ticker.c \

 tilt.c \

 timebang.c \

-#toddle.c \

+#tinkerbell.c \

 triang.c \

 tripleLine.c \

 tripleRand.c \

+unity.c \

 unroute.c \

 unserialize.c \

 urn.c \

diff --git a/externals/build/win/makefile b/externals/build/win/makefile
index ce887e02..bb880437 100644
--- a/externals/build/win/makefile
+++ b/externals/build/win/makefile
@@ -12,10 +12,12 @@ all: filelist.inc link.stamp $(EXTERNALS:.c=.dll)
 
 PDNTCFLAGS = /W3 /WX /DNT /DPD /nologo
 VC="C:\Program Files\Microsoft Visual Studio\Vc98"
+OGGPATH="C:\oggvorbis-win32sdk-1.0"
 SRCPATH=..\src
 PDPATH=..\..\..\pd
 
-PDNTINCLUDE = /I. /I.. /I..\..\..\pd\src /I$(VC)\include /I..\..\creb\include
+PDNTINCLUDE = /I. /I.. /I..\..\..\pd\src /I$(VC)\include \
+	/I..\..\creb\include /I$(OGGPATH)/include
 
 PDNTLDIR = $(VC)\lib
 PDNTLIB = $(PDNTLDIR)\libc.lib \
@@ -24,7 +26,11 @@ PDNTLIB = $(PDNTLDIR)\libc.lib \
 	$(PDNTLDIR)\uuid.lib \
 	$(PDNTLDIR)\ws2_32.lib \
 	$(PDPATH)\bin\pthreadVC.lib \
-	$(PDPATH)\bin\pd.lib 
+	$(PDPATH)\bin\pd.lib \
+	$(OGGPATH)\lib\vorbis.lib \
+	$(OGGPATH)\lib\vorbisenc.lib \
+	$(OGGPATH)\lib\vorbisfile.lib \
+	$(OGGPATH)\lib\ogg.lib
 
 .c.dll:
 	cl $(PDNTCFLAGS) $(PDNTINCLUDE) /c $*.c