aboutsummaryrefslogtreecommitdiff
path: root/externals/grill/flext/source
diff options
context:
space:
mode:
authorThomas Grill <xovo@users.sourceforge.net>2004-10-28 04:02:11 +0000
committerThomas Grill <xovo@users.sourceforge.net>2004-10-28 04:02:11 +0000
commitb196f48d32e04274f98baf06fbd981cd9f60d0a0 (patch)
treedd04d1d2e13c2ed562ab8f03036c252383a921bf /externals/grill/flext/source
parentd417beb73087b6b39bc6a8c0321a589ea4bf3cac (diff)
autoconf files by Tim Blechmann
changes for OSX added required autoconf files svn path=/trunk/; revision=2183
Diffstat (limited to 'externals/grill/flext/source')
-rwxr-xr-xexternals/grill/flext/source/Makefile.am59
-rw-r--r--externals/grill/flext/source/flattr.cpp2
-rwxr-xr-xexternals/grill/flext/source/flmeth.cpp2
-rw-r--r--externals/grill/flext/source/flsupport.cpp2
4 files changed, 38 insertions, 27 deletions
diff --git a/externals/grill/flext/source/Makefile.am b/externals/grill/flext/source/Makefile.am
index 49f0b5f7..0429724f 100755
--- a/externals/grill/flext/source/Makefile.am
+++ b/externals/grill/flext/source/Makefile.am
@@ -54,59 +54,70 @@ pkginclude_HEADERS = \
fldefs_attradd.h
-if SNDOBJ
+# handling for stk / sndobj
+SRCS_STK = flstk.cpp
+HDRS_STK = flstk.cpp
+
SRCS_SNDOBJ = flsndobj.cpp
HDRS_SNDOBJ = flsndobj.cpp
-LIB_SNDOBJ = -lsndobj
+
+if SNDOBJ
+SRCS_FLEXT += $(SRCS_SNDOBJ)
+pkginclude_HEADERS += $(HDRS_SNDOBJ)
+LIB_SNDOBJ = -lsndobj
endif
if STK
-SRCS_STK = flstk.cpp
-HDRS_STK = flstk.cpp
-LIB_STK = -lstk
+SRCS_FLEXT += $(SRCS_STK)
+pkginclude_HEADERS += $(HDRS_STK)
+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_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@
libflext_d_a_CXXFLAGS = @INCLUDEDIR@ -g -DFLEXT_DEBUG
libflext_t_a_CXXFLAGS = @OPT_FLAGS@ @INCLUDEDIR@ -DFLEXT_THREADS
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))
+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_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.@SOEXT@
libflext_d_la_NAME = libflext_d.@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) $^
+ $(CXX) -shared $(libflext_la_LDFLAGS) $(LIBS) -o $(libflext_la_NAME) $^
-libflext_la-%.o: %.cpp
+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) $^
+ $(CXX) -shared $(libflext_d_la_LDFLAGS) $(LIBS) -o $(libflext_d_la_NAME) $^
libflext_d_la-%.o: %.cpp
$(CXX) -shared -c $(libflext_d_la_CXXFLAGS) $< -o $@
diff --git a/externals/grill/flext/source/flattr.cpp b/externals/grill/flext/source/flattr.cpp
index b40a5807..f4036949 100644
--- a/externals/grill/flext/source/flattr.cpp
+++ b/externals/grill/flext/source/flattr.cpp
@@ -120,7 +120,7 @@ void flext_base::ListAttrib(AtomList &la) const
}
}
- la(list[0].size()+list[1].size());
+ la((int)(list[0].size()+list[1].size()));
int ix = 0;
AttrList::iterator it;
for(i = 0; i <= 1; ++i)
diff --git a/externals/grill/flext/source/flmeth.cpp b/externals/grill/flext/source/flmeth.cpp
index eaaca622..e0ecb172 100755
--- a/externals/grill/flext/source/flmeth.cpp
+++ b/externals/grill/flext/source/flmeth.cpp
@@ -115,7 +115,7 @@ void flext_base::ListMethods(AtomList &la,int inlet) const
}
}
- la(list[0].size()+list[1].size());
+ la((int)list[0].size()+(int)list[1].size());
int ix = 0;
MethList::iterator it;
for(i = 0; i <= 1; ++i)
diff --git a/externals/grill/flext/source/flsupport.cpp b/externals/grill/flext/source/flsupport.cpp
index b4c3d09f..9eec7abd 100644
--- a/externals/grill/flext/source/flsupport.cpp
+++ b/externals/grill/flext/source/flsupport.cpp
@@ -239,7 +239,7 @@ void flext_root::FreeAligned(void *blk)
void flext::GetAString(const t_atom &a,char *buf,size_t szbuf)
{
#if FLEXT_SYS == FLEXT_SYS_PD
- atom_string(const_cast<t_atom *>(&a),buf,szbuf);
+ atom_string(const_cast<t_atom *>(&a),buf,(int)szbuf);
#else
if(IsSymbol(a)) STD::strncpy(buf,GetString(a),szbuf);
else if(IsFloat(a)) STD::snprintf(buf,szbuf,"%f",GetFloat(a));