Remembered to update all the edited files. Should now be in sync... will

have to test it though.

svn path=/trunk/; revision=3092

1 files changed, 37 insertions, 10 deletions

diff --git a/pd/src/makefile.nt b/pd/src/makefile.nt
index 647700f9..9fcdceed 100644
--- a/pd/src/makefile.nt
+++ b/pd/src/makefile.nt
@@ -16,7 +16,7 @@ LIB = /NODEFAULTLIB:libc /NODEFAULTLIB:oldnames  /NODEFAULTLIB:kernel \
 
 GLIB =  $(LIB) ..\bin\tcl84.lib ..\bin\tk84.lib
 CFLAGS = /nologo /W3 /DMSW /DNT /DPD /DPD_INTERNAL /DWIN32 /DWINDOWS /Ox \
-	-DPA_LITTLE_ENDIAN -DUSEAPI_MMIO -DUSEAPI_PORTAUDIO -D__i386__
+	-DPA_LITTLE_ENDIAN -DUSEAPI_MMIO -DUSEAPI_PORTAUDIO -D__i386__ -DPA19
 LFLAGS = /nologo
 
 SYSSRC = s_audio_pa.c s_audio_pablio.c s_audio_paring.c \
@@ -39,7 +39,18 @@ SRC = g_canvas.c g_graph.c g_text.c g_rtext.c g_array.c g_template.c g_io.c \
 
 PADIR = ..\portaudio
 INCPA = -I$(PADIR) -I$(PADIR)\pa_common -I$(PADIR)\pablio -I..\lib\asio
-SRCPA = $(PADIR)/pa_common/pa_lib.c $(PADIR)/pa_common/pa_trace.c
+SRCPA = $(PADIR)/pa_common/pa_stream.c \
+        $(PADIR)/pa_common/pa_trace.c \
+        $(PADIR)/pa_common/pa_skeleton.c \
+        $(PADIR)/pa_common/pa_process.c \
+        $(PADIR)/pa_common/pa_front.c \
+        $(PADIR)/pa_common/pa_dither.c \
+        $(PADIR)/pa_common/pa_cpuload.c \
+        $(PADIR)/pa_common/pa_converters.c \
+        $(PADIR)/pa_win/pa_win_util.c \
+        $(PADIR)/pa_win/pa_win_hostapis.c \
+        $(PADIR)/pa_common/pa_allocation.c
+
 SRCASIO = $(PADIR)/pa_asio/pa_asio.cpp 
 
 ASIOLIB = $(LDIR)\user32.lib $(LDIR)\gdi32.lib $(LDIR)\winspool.lib $(LDIR)\comdlg32.lib \
@@ -47,7 +58,9 @@ $(LDIR)\advapi32.lib $(LDIR)\shell32.lib $(LDIR)\ole32.lib $(LDIR)\oleaut32.lib
 $(LDIR)\odbc32.lib $(LDIR)\odbccp32.lib ..\lib\asio\asiolib.lib
 
 
-PAOBJ = pa_lib.obj pa_trace.obj pa_asio.obj
+PAOBJ = pa_stream.obj pa_trace.obj pa_skeleton.obj pa_process.obj \
+	pa_front.obj pa_dither.obj pa_cpuload.obj pa_converters.obj \
+	pa_allocation.obj pa_win_util.obj pa_win_hostapis.obj pa_asio.obj
 
 
 OBJC = $(SRC:.c=.obj) $(PAOBJ)
@@ -89,15 +102,29 @@ gui: ..\bin\pdtcl.dll
 	    $(LIB)
 
 # explicit rules to compile portaudio sources:
-pa_lib.obj: $(PADIR)\pa_common\pa_lib.c
-	cl /c $(ALLCF) $(PADIR)\pa_common\pa_lib.c
+pa_stream.obj: $(PADIR)\pa_common\pa_stream.c
+	cl /c $(ALLCF) $(PADIR)\pa_common\pa_stream.c
 pa_trace.obj: $(PADIR)\pa_common\pa_trace.c
 	cl /c $(ALLCF) $(PADIR)\pa_common\pa_trace.c
-pablio_pd.obj: $(PADIR)\pablio\pablio_pd.c
-	cl /c $(ALLCF) $(PADIR)\pablio\pablio_pd.c
-ringbuffer_pd.obj: $(PADIR)\pablio\ringbuffer_pd.c
-	cl /c $(ALLCF) $(PADIR)\pablio\ringbuffer_pd.c
-
+pa_skeleton.obj: $(PADIR)\pa_common\pa_skeleton.c
+	cl /c $(ALLCF) $(PADIR)\pa_common\pa_skeleton.c
+pa_process.obj: $(PADIR)\pa_common\pa_process.c
+	cl /c $(ALLCF) $(PADIR)\pa_common\pa_process.c
+pa_front.obj: $(PADIR)\pa_common\pa_front.c
+	cl /c $(ALLCF) $(PADIR)\pa_common\pa_front.c
+pa_dither.obj: $(PADIR)\pa_common\pa_dither.c
+	cl /c $(ALLCF) $(PADIR)\pa_common\pa_dither.c
+pa_cpuload.obj: $(PADIR)\pa_common\pa_cpuload.c
+	cl /c $(ALLCF) $(PADIR)\pa_common\pa_cpuload.c
+pa_converters.obj: $(PADIR)\pa_common\pa_converters.c
+	cl /c $(ALLCF) $(PADIR)\pa_common\pa_converters.c
+pa_allocation.obj: $(PADIR)\pa_common\pa_allocation.c
+	cl /c $(ALLCF) $(PADIR)\pa_common\pa_allocation.c
+
+pa_win_util.obj: $(PADIR)\pa_win\pa_win_util.c
+	cl /c $(ALLCF) $(PADIR)\pa_win\pa_win_util.c
+pa_win_hostapis.obj: $(PADIR)\pa_win\pa_win_hostapis.c
+	cl /c $(ALLCF) $(PADIR)\pa_win\pa_win_hostapis.c
 pa_asio.obj: $(PADIR)\pa_asio\pa_asio.cpp
 	cl /c $(ALLCF) $(PADIR)\pa_asio\pa_asio.cpp