[PD-cvs] pd/src makefile.mingw,1.2.2.2,1.2.2.3

[carmen rocco]

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

Modified Files:
      Tag: devel_0_37
	makefile.mingw 
Log Message:
ASIO added back


Index: makefile.mingw
===================================================================
RCS file: /cvsroot/pure-data/pd/src/makefile.mingw,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C2 -d -r1.2.2.2 -r1.2.2.3
*** makefile.mingw	22 Jul 2004 13:28:14 -0000	1.2.2.2
--- makefile.mingw	24 Aug 2004 04:15:12 -0000	1.2.2.3
***************
*** 10,21 ****
  GFLAGS = -DINSTALL_PREFIX=\"$(INSTDIR)\"
  
! MORECFLAGS = -g -DTHREADED_SF -DGARRAY_THREAD_LOCK -D_GNU_SOURCE
  
  PADIR = $(INSTDIR)/portaudio
! INCPA = -I$(PADIR) -I$(PADIR)/pa_common -I$(PADIR)/pablio -I../lib/asio
  INCLUDE =  
  GINCLUDE = $(INCLUDE) -I/usr/local/include
  
! LDFLAGS = -L/usr/local/lib -lpthreadGC -lwsock32 -lportaudio -lwinmm -ltcl85 -ltk85
  LIB = -lm
  
--- 10,21 ----
  GFLAGS = -DINSTALL_PREFIX=\"$(INSTDIR)\"
  
! MORECFLAGS = -O2 -funroll-loops -DTHREADED_SF -DGARRAY_THREAD_LOCK -D_GNU_SOURCE
  
  PADIR = $(INSTDIR)/portaudio
! INCPA = -I$(PADIR) -I$(PADIR)/pa_common -I$(PADIR)/pablio  -I$(PADIR)/pa_asio
  INCLUDE =  
  GINCLUDE = $(INCLUDE) -I/usr/local/include
  
! LDFLAGS = -L/usr/local/lib -lpthreadGC -lwsock32 -lportaudio -lwinmm -ltcl85 -ltk85 -lole32
  LIB = -lm
  
***************
*** 33,36 ****
--- 33,40 ----
  	s_audio_pa.c	
  
+ ASIOSRC = $(PADIR)/pa_asio/iasiothiscallresolver.cpp \
+ 	$(PADIR)/pa_asio/pa_asio.cpp $(PADIR)/pa_asio/asio.cpp \
+ 	$(PADIR)/pa_asio/asiodrivers.cpp $(PADIR)/pa_asio/asiolist.cpp
+ 
  GSRC =  t_main.c t_tkcmd.c
  
***************
*** 53,57 ****
  SROBJ = $(SRSRC:.c=.o) 
  PAOBJ = $(PASRC:.c=.o)
! OBJC = $(OBJ) $(PAOBJ)
  
  #
--- 57,62 ----
  SROBJ = $(SRSRC:.c=.o) 
  PAOBJ = $(PASRC:.c=.o)
! ASIOBJ = $(ASIOSRC:.cpp=.o)
! OBJC = $(OBJ) $(PAOBJ) $(ASIOBJ)
  
  #
***************
*** 76,79 ****
--- 81,87 ----
  	$(CC) $(CFLAGS) $(GFLAGS) $(INCPA) -c -o $(OBJ_DIR)/$*.o $*.c 
  
+ $(ASIOBJ) : %.o : %.cpp
+ 	g++ $(CFLAGS) $(INCPA) -c -o $(OBJ_DIR)/$*.o $*.cpp
+ 
  $(OBJ_DIR)/pdsend.exe: u_pdsend.o
  	cd $(OBJ_DIR); $(CC) $(CFLAGS)  $(STRIPFLAG) -o pdsend.exe u_pdsend.o $(LDFLAGS)
***************
*** 86,92 ****
  
  $(OBJ_DIR)/$(PDDLL): $(OBJC)
! 	cd $(OBJ_DIR); $(DLLWRAP) --export-all-symbols --output-def pd.def \
! 	--output-lib=pd.a --dllname=pd.dll $(OBJC) pdtcl.a $(LDFLAGS)
! 
  $(OBJ_DIR)/$(GUINAME): t_tkcmd.o
  	cd $(OBJ_DIR); $(DLLWRAP) --export-all-symbols --output-def pdtcl.def \
--- 94,99 ----
  
  $(OBJ_DIR)/$(PDDLL): $(OBJC)
! 	cd $(OBJ_DIR); g++ -shared -o pd.dll $(OBJC) $(LDFLAGS) \
! 	-Wl,--export-all-symbols -Wl,--out-implib=pd.a
  $(OBJ_DIR)/$(GUINAME): t_tkcmd.o
  	cd $(OBJ_DIR); $(DLLWRAP) --export-all-symbols --output-def pdtcl.def \
***************
*** 108,112 ****
  	-rm -f $(OBJ_DIR)/pd*.exe $(OBJ_DIR)/pd*.dll
  	-rm -f $(PADIR)/pablio/*.o $(PADIR)/pa_common/*.o
! 	-rm -f $(OBJ_DIR)/pd.tk
  	-rm -f makefile.dependencies
  	touch makefile.dependencies
--- 115,119 ----
  	-rm -f $(OBJ_DIR)/pd*.exe $(OBJ_DIR)/pd*.dll
  	-rm -f $(PADIR)/pablio/*.o $(PADIR)/pa_common/*.o
! 	-rm -f $(PADIR)/pa_asio/*.o $(OBJ_DIR)/pd.tk
  	-rm -f makefile.dependencies
  	touch makefile.dependencies