[PD-cvs] pd/src makefile.nt,1.2.4.1,1.2.4.2

[Thomas Grill]

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

Modified Files:
      Tag: devel_0_38
	makefile.nt 
Log Message:
make it a bit more general

Index: makefile.nt
===================================================================
RCS file: /cvsroot/pure-data/pd/src/makefile.nt,v
retrieving revision 1.2.4.1
retrieving revision 1.2.4.2
diff -C2 -d -r1.2.4.1 -r1.2.4.2
*** makefile.nt	5 Nov 2004 14:27:46 -0000	1.2.4.1
--- makefile.nt	8 Nov 2004 09:37:29 -0000	1.2.4.2
***************
*** 1,8 ****
  # Makefile for PD on MSW
  # 
! # This should ideally be started from the compiler console so that it will have
  # the compiler, include and lib paths defined by environment settings
  #
- # nmake -f makefile.nt
  
  all: pd gui ..\bin\pd.tk ..\bin\pdsend.exe ..\bin\pdreceive.exe
--- 1,15 ----
  # Makefile for PD on MSW
  # 
! # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
! # This should be started from the compiler console so that it will have
  # the compiler, include and lib paths defined by environment settings
+ # (the set the environment call VCVARS32.BAT)
+ # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ #
+ # invoke with e.g.
+ # nmake -f makefile.nt PMDIR="f:\prog\audio\portmidi" 
+ #        ASIODIR="f:\prog\audio\asiosdk2" 
+ #        PTHREADS="f:\prog\packs\pthreads" TCLDIR="c:\programme\prog\tcl"
  #
  
  all: pd gui ..\bin\pd.tk ..\bin\pdsend.exe ..\bin\pdreceive.exe
***************
*** 13,17 ****
  
  !ifndef VC
- VC = "E:\Programme\Microsoft Visual Studio 8\VC"
  #VC="\Program Files\DevStudio\Vc"
  !endif
--- 20,23 ----
***************
*** 29,34 ****
  !endif
  
! 
  ASIODIR = g:\asiosdk2
  ASIOINC = -I$(ASIODIR)\common -I$(ASIODIR)\host -I$(ASIODIR)\host\pc
  
--- 35,41 ----
  !endif
  
! !ifndef ASIODIR
  ASIODIR = g:\asiosdk2
+ !endif
  ASIOINC = -I$(ASIODIR)\common -I$(ASIODIR)\host -I$(ASIODIR)\host\pc
  
***************
*** 60,74 ****
  INC = -I.\ -I$(TCLINC) -I$(PTHREADS) $(ASIOINC)
  !ifdef VC
! INC = $(INC) -I$(VC)\include -I"E:\Programme\Microsoft Platform SDK for Windows XP SP2"\include
  !endif
  
  # the library directory might automatically be found
! #!ifdef LIB
! #LDIR = 
! #!else
  # the trailing slash is important!!
! #LDIR = $(VC)\lib\
! LDIR = "E:\Programme\Microsoft Platform SDK for Windows XP SP2"\Lib/
! #!endif
  
  #LIBS = /NODEFAULTLIB:libc /NODEFAULTLIB:oldnames  /NODEFAULTLIB:kernel \
--- 67,80 ----
  INC = -I.\ -I$(TCLINC) -I$(PTHREADS) $(ASIOINC)
  !ifdef VC
! INC = $(INC) -I$(VC)\include 
  !endif
  
  # the library directory might automatically be found
! !ifdef LIB
! LDIR = 
! !else
  # the trailing slash is important!!
! LDIR = $(VC)\lib\
! !endif
  
  #LIBS = /NODEFAULTLIB:libc /NODEFAULTLIB:oldnames  /NODEFAULTLIB:kernel \
***************
*** 77,87 ****
  #    $(LDIR)wsock32.lib $(LDIR)winmm.lib $(PTHREADS)\pthreadVC.lib
  
! LIBS = $(LDIR)\wsock32.lib $(LDIR)\winmm.lib $(PTHREADS)\pthreadVC.lib \
! 	$(LDIR)\ole32.lib $(LDIR)\user32.lib $(LDIR)\advapi32.lib 
  
  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 /DDONTUSESIMD
  LFLAGS = /nologo /DEBUG /MAP /PROFILE
  
--- 83,93 ----
  #    $(LDIR)wsock32.lib $(LDIR)winmm.lib $(PTHREADS)\pthreadVC.lib
  
! LIBS = wsock32.lib winmm.lib $(PTHREADS)\pthreadVC.lib ole32.lib user32.lib advapi32.lib 
! 
  
  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
  
***************
*** 108,113 ****
  SRCPA = $(PADIR)/pa_common/pa_lib.c $(PADIR)/pa_common/pa_trace.c
  SRCASIO = $(PADIR)/pa_asio/pa_asio.cpp 
! PAOBJ = pa_lib.obj pa_trace.obj pa_asio.obj pablio.obj pa_asio.obj \
! 	ringbuffer.obj
  
  INCPM = -I$(PMDIR)\pm_common -I$(PMDIR)\pm_win -I$(PMDIR)\porttime
--- 114,118 ----
  SRCPA = $(PADIR)/pa_common/pa_lib.c $(PADIR)/pa_common/pa_trace.c
  SRCASIO = $(PADIR)/pa_asio/pa_asio.cpp 
! PAOBJ = pa_lib.obj pa_trace.obj pa_asio.obj pablio.obj ringbuffer.obj
  
  INCPM = -I$(PMDIR)\pm_common -I$(PMDIR)\pm_win -I$(PMDIR)\porttime