From beb2211b63b4b80ee07a807e5ffdd441aeea6354 Mon Sep 17 00:00:00 2001 From: Miller Puckette Date: Sat, 3 Jun 2006 19:13:08 +0000 Subject: FFT package selection Zmoelnig's multi-'$' patch big-soundfile support Patch to set open directories (openpanel, savepanel) patch to allow funny characters in extern names fixed makefile.in to support intel mac svn path=/trunk/; revision=5164 --- pd/src/makefile.nt | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'pd/src/makefile.nt') diff --git a/pd/src/makefile.nt b/pd/src/makefile.nt index e696e751..56b94a0a 100644 --- a/pd/src/makefile.nt +++ b/pd/src/makefile.nt @@ -4,7 +4,7 @@ all: pd gui ..\bin\pd.tk ..\bin\pdsend.exe ..\bin\pdreceive.exe VC = "C:\Program Files\Microsoft Visual Studio\VC98" #VC="\Program Files\DevStudio\Vc" -INCLUDE = -I.\ -I..\Tcl\include -I$(VC)\include +INCLUDE = -I.\ -I..\Tcl\include -I\DXSDK\include -I$(VC)\include LDIR = $(VC)\lib @@ -12,7 +12,7 @@ LIB = /NODEFAULTLIB:libc /NODEFAULTLIB:oldnames /NODEFAULTLIB:kernel \ /NODEFAULTLIB:uuid \ $(LDIR)\libc.lib $(LDIR)\oldnames.lib $(LDIR)\kernel32.lib \ $(LDIR)\wsock32.lib $(LDIR)\winmm.lib $(LDIR)\advapi32.lib \ - ..\bin\pthreadVC.lib + $(LDIR)\setupapi.lib ..\bin\pthreadVC.lib GLIB = $(LIB) ..\bin\tcl84.lib ..\bin\tk84.lib CFLAGS = /nologo /W3 /DMSW /DNT /DPD /DPD_INTERNAL /DWIN32 /DWINDOWS /Ox \ @@ -50,7 +50,8 @@ SRCPA = $(PADIR)/pa_common/pa_stream.c \ $(PADIR)/pa_common/pa_allocation.c \ $(PADIR)/pa_win/pa_win_util.c \ $(PADIR)/pa_win/pa_win_hostapis.c \ - $(PADIR)/pa_win_wmme/pa_win_wmme.c + $(PADIR)/pa_win_wmme/pa_win_wmme.c +# $(PADIR)/pa_win_wdmks/pa_win_wdmks.c SRCASIO = $(PADIR)/pa_asio/pa_asio.cpp @@ -63,7 +64,8 @@ $(LDIR)\odbc32.lib $(LDIR)\odbccp32.lib ..\lib\asio\asiolib.lib 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 \ - pa_win_wmme.obj + pa_win_wmme.obj +# pa_win_wdmks.obj PMDIR = ..\portmidi INCPM = -I$(PMDIR)\pm_common -I$(PMDIR)\pm_win -I$(PMDIR)\porttime @@ -150,6 +152,10 @@ pa_win_hostapis.obj: $(PADIR)\pa_win\pa_win_hostapis.c cl /c $(ALLCF) $(PADIR)\pa_win\pa_win_hostapis.c pa_win_wmme.obj: $(PADIR)\pa_win_wmme\pa_win_wmme.c cl /c $(ALLCF) $(PADIR)\pa_win_wmme\pa_win_wmme.c +pa_win_wdmks.obj: $(PADIR)\pa_win_wdmks\pa_win_wdmks.c + cl /c $(ALLCF) \ + -DWINVER=0x400 -DKSAUDIO_SPEAKER_DIRECTOUT \ + $(PADIR)\pa_win_wdmks\pa_win_wdmks.c pa_asio.obj: $(PADIR)\pa_asio\pa_asio.cpp cl /c $(ALLCF) $(PADIR)\pa_asio\pa_asio.cpp -- cgit v1.2.1