Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27719/src
Modified Files: Tag: devel_0_38 makefile.nt Log Message: fixed to comply to current state
Index: makefile.nt =================================================================== RCS file: /cvsroot/pure-data/pd/src/makefile.nt,v retrieving revision 1.2.4.2 retrieving revision 1.2.4.3 diff -C2 -d -r1.2.4.2 -r1.2.4.3 *** makefile.nt 8 Nov 2004 09:37:29 -0000 1.2.4.2 --- makefile.nt 16 Dec 2004 10:26:58 -0000 1.2.4.3 *************** *** 50,56 ****
!ifndef TCLDIR ! TCLDIR = C:\Tcl !ifndef TCLINC ! TCLINC = C:\Tcl\include !endif
--- 50,56 ----
!ifndef TCLDIR ! TCLDIR = ..\tcl !ifndef TCLINC ! TCLINC = $(TCLDIR)\include !endif
*************** *** 88,96 **** GLIB = $(LIBS) $(TCLLIB)\tcl$(TCLVER).lib $(TCLLIB)\tk$(TCLVER).lib CFLAGS = /nologo /W3 /DMSW /DNT /DPD /DPD_INTERNAL /DWIN32 /DWINDOWS \ ! -DPA_LITTLE_ENDIAN -DUSEAPI_ASIO -DUSEAPI_MMIO -DUSEAPI_PORTAUDIO \ ! $(WISHDEF) /ZI LFLAGS = /nologo /DEBUG /MAP /PROFILE
! 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 \ --- 88,97 ---- GLIB = $(LIBS) $(TCLLIB)\tcl$(TCLVER).lib $(TCLLIB)\tk$(TCLVER).lib CFLAGS = /nologo /W3 /DMSW /DNT /DPD /DPD_INTERNAL /DWIN32 /DWINDOWS \ ! -DPA_LITTLE_ENDIAN -DUSEAPI_MMIO $(WISHDEF) /ZI ! # -DUSEAPI_PORTAUDIO ! # -DUSEAPI_ASIO LFLAGS = /nologo /DEBUG /MAP /PROFILE
! SYSSRC = s_audio_mmio.c s_midi_mmio.c # s_audio_pa.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 \ *************** *** 107,114 **** x_arithmetic.c x_connective.c x_interface.c x_midi.c x_misc.c \ x_time.c x_acoustics.c x_net.c x_qlist.c x_gui.c d_soundfile.c \ ! m_simd.c m_simd_sse_vc.c m_simd_sse_gcc.c m_simd_ve_gcc.c \ $(SYSSRC)
! PADIR = ..\portaudio_v18 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 --- 108,115 ---- x_arithmetic.c x_connective.c x_interface.c x_midi.c x_misc.c \ x_time.c x_acoustics.c x_net.c x_qlist.c x_gui.c d_soundfile.c \ ! m_simd.c m_simd_sse_vc.c m_simd_sse_gcc.c m_simd_ve_gcc.c m_fifo.c \ $(SYSSRC)
! 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 *************** *** 128,132 ****
! OBJC = $(SRC:.c=.obj) $(PMOBJ) $(PAOBJ)
ASIOBJ = s_audio_asio.obj asio.obj asiolist.obj asiodrivers.obj --- 129,133 ----
! OBJC = $(SRC:.c=.obj) # $(PMOBJ) $(PAOBJ)
ASIOBJ = s_audio_asio.obj asio.obj asiolist.obj asiodrivers.obj *************** *** 153,176 ****
..\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) ASIOBJ ! link $(LFLAGS) /dll /export:sys_main /out:..\bin\pd.dll $(OBJC) \ ! $(ASIOBJ) $(LIBS) /PDB:..\bin\pddll.pdb
..\bin\pdtcl.dll: t_tkcmd.obj ! link $(LFLAGS) /dll /export:Pdtcl_Init /out:..\bin\pdtcl.dll \ ! t_tkcmd.obj $(GLIB)
..\bin\pd.tk: u_main.tk; copy u_main.tk ..\bin\pd.tk
..\bin\pdsend.exe: u_pdsend.obj ! link $(LFLAGS) /out:..\bin\pdsend.exe /INCREMENTAL:NO u_pdsend.obj \ ! $(LIBS)
..\bin\pdreceive.exe: u_pdreceive.obj ! link $(LFLAGS) /out:..\bin\pdreceive.exe /INCREMENTAL:NO u_pdreceive.obj \ ! $(LIBS)
# explicit rules to compile portaudio sources: --- 154,173 ----
..\bin\pd.exe: s_entry.obj ..\bin\pd.lib ! link $(LFLAGS) /out:..\bin\pd.exe /INCREMENTAL:NO $** $(LIBS)
! ..\bin\pd.dll ..\bin\pd.lib: $(OBJC) # ASIOBJ ! link $(LFLAGS) /dll /export:sys_main /out:..\bin\pd.dll $** \ ! $(LIBS) /PDB:..\bin\pddll.pdb
..\bin\pdtcl.dll: t_tkcmd.obj ! link $(LFLAGS) /dll /export:Pdtcl_Init /out:..\bin\pdtcl.dll $** $(GLIB)
..\bin\pd.tk: u_main.tk; copy u_main.tk ..\bin\pd.tk
..\bin\pdsend.exe: u_pdsend.obj ! link $(LFLAGS) /out:..\bin\pdsend.exe /INCREMENTAL:NO $** $(LIBS)
..\bin\pdreceive.exe: u_pdreceive.obj ! link $(LFLAGS) /out:..\bin\pdreceive.exe /INCREMENTAL:NO $** $(LIBS)
# explicit rules to compile portaudio sources:
-
Thomas Grill