[PD-cvs] externals/grill/flext/source Makefile.am,1.1,1.2 flattr.cpp,1.25,1.26 flmeth.cpp,1.11,1.12 flsupport.cpp,1.40,1.41

[Thomas Grill]

Update of /cvsroot/pure-data/externals/grill/flext/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22002/source

Modified Files:
	Makefile.am flattr.cpp flmeth.cpp flsupport.cpp 
Log Message:
autoconf files by Tim Blechmann
changes for OSX
added required autoconf files


Index: flsupport.cpp
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/source/flsupport.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** flsupport.cpp	26 Oct 2004 20:03:38 -0000	1.40
--- flsupport.cpp	28 Oct 2004 04:01:46 -0000	1.41
***************
*** 240,244 ****
  { 
  #if FLEXT_SYS == FLEXT_SYS_PD
! 	atom_string(const_cast<t_atom *>(&a),buf,szbuf);
  #else
      if(IsSymbol(a)) STD::strncpy(buf,GetString(a),szbuf);
--- 240,244 ----
  { 
  #if FLEXT_SYS == FLEXT_SYS_PD
! 	atom_string(const_cast<t_atom *>(&a),buf,(int)szbuf);
  #else
      if(IsSymbol(a)) STD::strncpy(buf,GetString(a),szbuf);

Index: flattr.cpp
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/source/flattr.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** flattr.cpp	9 Sep 2004 04:00:46 -0000	1.25
--- flattr.cpp	28 Oct 2004 04:01:46 -0000	1.26
***************
*** 121,125 ****
  	}
  
! 	la(list[0].size()+list[1].size());
  	int ix = 0;
  	AttrList::iterator it;
--- 121,125 ----
  	}
  
! 	la((int)(list[0].size()+list[1].size()));
  	int ix = 0;
  	AttrList::iterator it;

Index: Makefile.am
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/source/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.am	26 Oct 2004 20:03:36 -0000	1.1
--- Makefile.am	28 Oct 2004 04:01:40 -0000	1.2
***************
*** 55,79 ****
  
  
! if SNDOBJ
  SRCS_SNDOBJ = flsndobj.cpp
  HDRS_SNDOBJ = flsndobj.cpp
! LIB_SNDOBJ = -lsndobj
  endif
  
  if STK
! SRCS_STK = flstk.cpp
! HDRS_STK = flstk.cpp
! LIB_STK =  -lstk
  endif
  
- pkginclude_HEADERS += $(HDRS_SNDOBJ) $(HDRS_STK)
  FRAMEWORKS = @FRAMEWORKS@
  
- 
  # for static libraries we can use automake
! libflext_a_SOURCES    = $(SRCS_FLEXT) $(SRCS_SNDOBJ) $(SRCS_STK)
! libflext_d_a_SOURCES  = $(SRCS_FLEXT) $(SRCS_SNDOBJ) $(SRCS_STK)
! libflext_t_a_SOURCES  = $(SRCS_FLEXT) $(SRCS_SNDOBJ) $(SRCS_STK)
! libflext_td_a_SOURCES = $(SRCS_FLEXT) $(SRCS_SNDOBJ) $(SRCS_STK)
  
  libflext_a_CXXFLAGS    = @OPT_FLAGS@ @INCLUDEDIR@ 
--- 55,84 ----
  
  
! # handling for stk / sndobj
! SRCS_STK = flstk.cpp
! HDRS_STK = flstk.cpp
! 
  SRCS_SNDOBJ = flsndobj.cpp
  HDRS_SNDOBJ = flsndobj.cpp
! 
! if SNDOBJ
! SRCS_FLEXT         += $(SRCS_SNDOBJ)
! pkginclude_HEADERS += $(HDRS_SNDOBJ)
! LIB_SNDOBJ         = -lsndobj
  endif
  
  if STK
! SRCS_FLEXT         += $(SRCS_STK)
! pkginclude_HEADERS += $(HDRS_STK)
! LIB_STK            =  -lstk
  endif
  
  FRAMEWORKS = @FRAMEWORKS@
  
  # for static libraries we can use automake
! libflext_a_SOURCES    = $(SRCS_FLEXT)
! libflext_d_a_SOURCES  = $(SRCS_FLEXT)
! libflext_t_a_SOURCES  = $(SRCS_FLEXT)
! libflext_td_a_SOURCES = $(SRCS_FLEXT)
  
  libflext_a_CXXFLAGS    = @OPT_FLAGS@ @INCLUDEDIR@ 
***************
*** 82,111 ****
  libflext_td_a_CXXFLAGS = @INCLUDEDIR@ -g -DFLEXT_DEBUG -DFLEXT_THREADS 
  
! libflext_a_LDFLAGS_    = @OPT_FLAGS@ @INCLUDEDIR@ $(patsubst %,-framework %,$(FRAMEWORKS))
! libflext_d_a_LDFLAGS_  = @INCLUDEDIR@ -g -DFLEXT_DEBUG $(patsubst %,-framework %,$(FRAMEWORKS))
! libflext_t_a_LDFLAGS_  = @OPT_FLAGS@ @INCLUDEDIR@ -DFLEXT_THREADS $(patsubst %,-framework %,$(FRAMEWORKS))
! libflext_td_a_LDFLAGS_ = @INCLUDEDIR@ -g -DFLEXT_DEBUG -DFLEXT_THREADS $(patsubst %,-framework %,$(FRAMEWORKS))
  
  # for shared libraries, we can't ...
! libflext_la_CXXFLAGS   = @OPT_FLAGS@ @INCLUDEDIR@ -DFLEXT_SHARED -DFLEXT_EXPORTS $(DEFS)
! libflext_d_la_CXXFLAGS = @INCLUDEDIR@ -g -DFLEXT_DEBUG -DFLEXT_SHARED -DFLEXT_EXPORTS $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
! 
! libflext_la_LDFLAGS_   = @DYNAMIC_LDFLAGS@ $(LIB_STK) $(LIB_SNDOBJ) $(LDFLAGS) $(patsubst %,-framework %,$(FRAMEWORKS))
! libflext_d_la_LDFLAGS_ = @DYNAMIC_LDFLAGS@ $(LIB_STK) $(LIB_SNDOBJ) $(LDFLAGS) $(patsubst %,-framework %,$(FRAMEWORKS))
  
  libflext_la_NAME = libflext. at SOEXT@
  libflext_d_la_NAME = libflext_d. at SOEXT@
  
- 
  all-local: $(libflext_la_NAME) $(libflext_d_la_NAME)
  
  $(libflext_la_NAME): $(patsubst %.cpp,libflext_la-%.o,$(SRCS_FLEXT))
! 	$(CXX) -shared $(libflext_la_LDFLAGS_) $(LIBS) -o $(libflext_la_NAME) $^
  
! libflext_la-%.o: %.cpp
  	$(CXX) -shared -c $(libflext_la_CXXFLAGS) $< -o $@
  
  $(libflext_d_la_NAME): $(patsubst %.cpp,libflext_d_la-%.o,$(SRCS_FLEXT))
! 	$(CXX) -shared $(libflext_d_la_LDFLAGS_) $(LIBS) -o $(libflext_d_la_NAME) $^
  
  libflext_d_la-%.o: %.cpp
--- 87,122 ----
  libflext_td_a_CXXFLAGS = @INCLUDEDIR@ -g -DFLEXT_DEBUG -DFLEXT_THREADS 
  
! libflext_a_LDFLAGS    = @OPT_FLAGS@ @INCLUDEDIR@ \
! 	$(patsubst %,-framework %,$(FRAMEWORKS))
! libflext_d_a_LDFLAGS  = @INCLUDEDIR@ -g -DFLEXT_DEBUG \
! 	$(patsubst %,-framework %,$(FRAMEWORKS))
! libflext_t_a_LDFLAGS  = @OPT_FLAGS@ @INCLUDEDIR@ -DFLEXT_THREADS \
! 	$(patsubst %,-framework %,$(FRAMEWORKS))
! libflext_td_a_LDFLAGS = @INCLUDEDIR@ -g -DFLEXT_DEBUG -DFLEXT_THREADS \
! 	$(patsubst %,-framework %,$(FRAMEWORKS))
  
  # for shared libraries, we can't ...
! libflext_la_CXXFLAGS   = @OPT_FLAGS@ @INCLUDEDIR@ -DFLEXT_SHARED \
! 	-DFLEXT_EXPORTS $(DEFS)
! libflext_d_la_CXXFLAGS = @INCLUDEDIR@ -g -DFLEXT_DEBUG -DFLEXT_SHARED \
! 	-DFLEXT_EXPORTS $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
! libflext_la_LDFLAGS   = @DYNAMIC_LDFLAGS@ $(LIB_STK) $(LIB_SNDOBJ) $(LDFLAGS) \
! 	$(patsubst %,-framework %,$(FRAMEWORKS))
! libflext_d_la_LDFLAGS = @DYNAMIC_LDFLAGS@ $(LIB_STK) $(LIB_SNDOBJ) $(LDFLAGS)
! 	$(patsubst %,-framework %,$(FRAMEWORKS))
  
  libflext_la_NAME = libflext. at SOEXT@
  libflext_d_la_NAME = libflext_d. at SOEXT@
  
  all-local: $(libflext_la_NAME) $(libflext_d_la_NAME)
  
  $(libflext_la_NAME): $(patsubst %.cpp,libflext_la-%.o,$(SRCS_FLEXT))
! 	$(CXX) -shared $(libflext_la_LDFLAGS) $(LIBS) -o $(libflext_la_NAME) $^
  
! libflext_la-%.o : %.cpp
  	$(CXX) -shared -c $(libflext_la_CXXFLAGS) $< -o $@
  
  $(libflext_d_la_NAME): $(patsubst %.cpp,libflext_d_la-%.o,$(SRCS_FLEXT))
! 	$(CXX) -shared $(libflext_d_la_LDFLAGS) $(LIBS) -o $(libflext_d_la_NAME) $^
  
  libflext_d_la-%.o: %.cpp

Index: flmeth.cpp
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/source/flmeth.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** flmeth.cpp	11 Sep 2004 04:00:41 -0000	1.11
--- flmeth.cpp	28 Oct 2004 04:01:46 -0000	1.12
***************
*** 116,120 ****
      }
  
!     la(list[0].size()+list[1].size());
      int ix = 0;
      MethList::iterator it;
--- 116,120 ----
      }
  
!     la((int)list[0].size()+(int)list[1].size());
      int ix = 0;
      MethList::iterator it;