[PD-cvs] pd/src makefile.nt,1.1.1.3.2.3,1.1.1.3.2.4

[carmen rocco]

Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv969

Modified Files:
      Tag: devel_0_37
	makefile.nt 
Log Message:
asiolib.lib deprecated in VSTSDK 2.x


Index: makefile.nt
===================================================================
RCS file: /cvsroot/pure-data/pd/src/makefile.nt,v
retrieving revision 1.1.1.3.2.3
retrieving revision 1.1.1.3.2.4
diff -C2 -d -r1.1.1.3.2.3 -r1.1.1.3.2.4
*** makefile.nt	7 Oct 2004 17:56:38 -0000	1.1.1.3.2.3
--- makefile.nt	29 Oct 2004 07:32:02 -0000	1.1.1.3.2.4
***************
*** 86,90 ****
  
  LIBS = /NODEFAULTLIB:libc /NODEFAULTLIB:oldnames  /NODEFAULTLIB:kernel \
!     /NODEFAULTLIB:uuid \
      $(LDIR)libc.lib $(LDIR)oldnames.lib $(LDIR)kernel32.lib \
      $(LDIR)wsock32.lib $(LDIR)winmm.lib $(PTHREADS)\pthreadVC.lib
--- 86,90 ----
  
  LIBS = /NODEFAULTLIB:libc /NODEFAULTLIB:oldnames  /NODEFAULTLIB:kernel \
!     $(LDIR)uuid.lib $(LDIR)ole32.lib $(LDIR)advapi32.lib $(LDIR)user32.lib \
      $(LDIR)libc.lib $(LDIR)oldnames.lib $(LDIR)kernel32.lib \
      $(LDIR)wsock32.lib $(LDIR)winmm.lib $(PTHREADS)\pthreadVC.lib
***************
*** 94,98 ****
  LFLAGS = /nologo
  
! SYSSRC = s_audio_pa.c s_audio_mmio.c s_midi_pm.c
  
  SRC = g_canvas.c g_graph.c g_text.c g_rtext.c g_array.c g_template.c g_io.c \
--- 94,98 ----
  LFLAGS = /nologo
  
! SYSSRC = s_audio_pa.c s_audio_mmio.c s_midi_mmio.c
  
  SRC = g_canvas.c g_graph.c g_text.c g_rtext.c g_array.c g_template.c g_io.c \
***************
*** 114,129 ****
  INCPA = -I$(PADIR) -I$(PADIR)\pa_common -I$(PADIR)\pablio -I$(PAPDDIR)
  
! ASIOLIBS = $(LDIR)user32.lib $(LDIR)gdi32.lib $(LDIR)winspool.lib $(LDIR)comdlg32.lib \
! $(LDIR)advapi32.lib $(LDIR)shell32.lib $(LDIR)ole32.lib $(LDIR)oleaut32.lib $(LDIR)uuid.lib \
! $(LDIR)odbc32.lib $(LDIR)odbccp32.lib $(ASIODIR)\asiolib.lib
! 
! 
! PAOBJ = pa_lib.obj pa_trace.obj pablio_pd.obj ringbuffer_pd.obj pa_asio.obj
! #PAOBJ = \
! #    pa_allocation.obj pa_converters.obj pa_cpuload.obj \
! #    pa_stream.obj pa_dither.obj pa_front.obj pa_process.obj \
! #    pa_skeleton.obj pa_trace.obj \
! #    pablio_pd.obj ringbuffer_pd.obj \
! #    pa_asio.obj
  
  INCPM = -I$(PMDIR)\pm_common -I$(PMDIR)\pm_win -I$(PMDIR)\porttime
--- 114,119 ----
  INCPA = -I$(PADIR) -I$(PADIR)\pa_common -I$(PADIR)\pablio -I$(PAPDDIR)
  
! PAOBJ = pa_lib.obj pa_trace.obj pablio_pd.obj ringbuffer_pd.obj \
!       pa_asio.obj asio.obj asiodrivers.obj asiolist.obj
  
  INCPM = -I$(PMDIR)\pm_common -I$(PMDIR)\pm_win -I$(PMDIR)\porttime
***************
*** 136,140 ****
          $(PMDIR)/porttime/ptwinmm.c         \
  
! PMOBJ = portmidi.obj pmutil.obj pmwin.obj pmwinmm.obj porttime.obj ptwinmm.obj
  
  OBJC = $(SRC:.c=.obj) $(PAOBJ) $(PMOBJ)
--- 126,130 ----
          $(PMDIR)/porttime/ptwinmm.c         \
  
! #PMOBJ = portmidi.obj pmutil.obj pmwin.obj pmwinmm.obj porttime.obj ptwinmm.obj
  
  OBJC = $(SRC:.c=.obj) $(PAOBJ) $(PMOBJ)
***************
*** 156,164 ****
  ..\bin\pd.exe: s_entry.obj ..\bin\pd.lib
  	link $(LFLAGS) /out:..\bin\pd.exe /INCREMENTAL:NO s_entry.obj \
! 	    ..\bin\pd.lib $(LIBS) $(ASIOLIBS)
  
  ..\bin\pd.dll ..\bin\pd.lib: $(OBJC) $(OBJASIO)
  	link $(LFLAGS) /dll /export:sys_main /out:..\bin\pd.dll $(OBJC) \
! 	    $(OBJASIO) $(LIBS) $(ASIOLIBS)
  
  ..\bin\pdtcl.dll: t_tkcmd.obj
--- 146,154 ----
  ..\bin\pd.exe: s_entry.obj ..\bin\pd.lib
  	link $(LFLAGS) /out:..\bin\pd.exe /INCREMENTAL:NO s_entry.obj \
! 	    ..\bin\pd.lib $(LIBS)
  
  ..\bin\pd.dll ..\bin\pd.lib: $(OBJC) $(OBJASIO)
  	link $(LFLAGS) /dll /export:sys_main /out:..\bin\pd.dll $(OBJC) \
! 	    $(OBJASIO) $(LIBS)
  
  ..\bin\pdtcl.dll: t_tkcmd.obj
***************
*** 203,210 ****
  ringbuffer_pd.obj: $(PAPDDIR)\ringbuffer_pd.c
  	cl /c $(ALLCF) $**
- 
  pa_asio.obj: $(PADIR)\pa_asio\pa_asio.cpp
  	cl /c $(ALLCF) $(ASIOINC) $**
! 
  portmidi.obj: $(PMDIR)\pm_common\portmidi.c
  	cl /c $(ALLCF) $**
--- 193,204 ----
  ringbuffer_pd.obj: $(PAPDDIR)\ringbuffer_pd.c
  	cl /c $(ALLCF) $**
  pa_asio.obj: $(PADIR)\pa_asio\pa_asio.cpp
  	cl /c $(ALLCF) $(ASIOINC) $**
! asio.obj: $(PADIR)\pa_asio\asio.cpp
! 	cl /c $(ALLCF) $(ASIOINC) $**
! asiodrivers.obj: $(PADIR)\pa_asio\asiodrivers.cpp
! 	cl /c $(ALLCF) $(ASIOINC) $**
! asiolist.obj: $(PADIR)\pa_asio\asiolist.cpp
! 	cl /c $(ALLCF) $(ASIOINC) $**
  portmidi.obj: $(PMDIR)\pm_common\portmidi.c
  	cl /c $(ALLCF) $**