Update of /cvsroot/pure-data/externals/grill/flext In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19219
Modified Files: changes.txt config-pd-darwin.txt flext.vcproj makefile.pd-darwin makefile.pd-linux Added Files: Makefile.am bootstrap.sh configure.ac Removed Files: .cvsignore flext.vcproj.vspscc Log Message: ""
--- .cvsignore DELETED ---
Index: makefile.pd-linux =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/makefile.pd-linux,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** makefile.pd-linux 8 Aug 2004 02:37:16 -0000 1.19 --- makefile.pd-linux 26 Oct 2004 20:03:32 -0000 1.20 *************** *** 17,27 ****
# general compiler flags ! FLAGS=-DFLEXT_SYS=2 ${UFLAGS}
# compiler flags for optimized build ! CFLAGS=-O2
# compiler flags for debug build ! CFLAGS_D=-g -DFLEXT_DEBUG
# additional flags for threading --- 17,27 ----
# general compiler flags ! FLAGS=-DFLEXT_SYS=2 -fPIC ${UFLAGS}
# compiler flags for optimized build ! CFLAGS=-O2
# compiler flags for debug build ! CFLAGS_D=-g -DFLEXT_DEBUG
# additional flags for threading
Index: config-pd-darwin.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/config-pd-darwin.txt,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** config-pd-darwin.txt 23 Sep 2004 04:00:37 -0000 1.17 --- config-pd-darwin.txt 26 Oct 2004 20:03:23 -0000 1.18 *************** *** 26,28 **** # additional compiler flags # (check if they fit for your system!) ! UFLAGS=-DFLEXT_USE_SIMD -malign-power -maltivec -faltivec --- 26,33 ---- # additional compiler flags # (check if they fit for your system!) ! UFLAGS=-DFLEXT_USE_SIMD -maltivec -faltivec ! ! ! ! !
Index: makefile.pd-darwin =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/makefile.pd-darwin,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** makefile.pd-darwin 30 Dec 2003 03:32:46 -0000 1.15 --- makefile.pd-darwin 26 Oct 2004 20:03:32 -0000 1.16 *************** *** 32,35 **** --- 32,40 ---- LSHFLAGS= -dylib -dynamic -flat_namespace -undefined suppress
+ ifdef $(INSTDIR) + LSHFLAGS_R=-dylib_install_name $(INSTDIR)/libflext.dylib + LSHFLAGS_D=-dylib_install_name $(INSTDIR)/libflext_d.dylib + endif + # frameworks #FRAMEWORKS=Carbon veclib *************** *** 60,64 ****
! MAKEFILE=makefile.pd-darwin
TARGET=$(TARGDIR)/lib$(NAME).a --- 65,69 ----
! MAKEFILE=#makefile.pd-darwin
TARGET=$(TARGDIR)/lib$(NAME).a *************** *** 109,116 ****
$(TARGET_S) : $(patsubst %.cpp,$(TARGDIR)/%.so,$(SRCS)) ! ld $(LSHFLAGS) -o $@ $^ -ldylib1.o -lgcc -lstdc++ $(patsubst %,-framework %,$(FRAMEWORKS))
$(TARGET_SD) : $(patsubst %.cpp,$(TARGDIR)/%.sdo,$(SRCS)) ! ld $(LSHFLAGS) -o $@ $^ -ldylib1.o -lgcc -lstdc++ $(patsubst %,-framework %,$(FRAMEWORKS))
.PHONY: clean install --- 114,121 ----
$(TARGET_S) : $(patsubst %.cpp,$(TARGDIR)/%.so,$(SRCS)) ! ld $(LSHFLAGS) $(LSHFLAGS_R) -o $@ $^ -ldylib1.o -lgcc -lstdc++ $(patsubst %,-framework %,$(FRAMEWORKS))
$(TARGET_SD) : $(patsubst %.cpp,$(TARGDIR)/%.sdo,$(SRCS)) ! ld $(LSHFLAGS) $(LSHFLAGS_D) -o $@ $^ -ldylib1.o -lgcc -lstdc++ $(patsubst %,-framework %,$(FRAMEWORKS))
.PHONY: clean install
--- NEW FILE: bootstrap.sh --- #! /bin/sh
aclocal \ && automake --add-missing \ && autoconf
--- NEW FILE: configure.ac --- dnl dnl autoconf template dnl added by tim blechmann dnl
dnl flext API version (current:release:age) API_VERSION=0:0:0
AC_INIT([flext],[0.4.7],[gr@grrrr.org],[flext]) AM_INIT_AUTOMAKE(1.6)
dnl configure options AC_ARG_ENABLE(system, [ --enable-system flext system (default: pd)], [ case $enableval in max) AC_DEFINE(FLEXT_SYS,1);; *) AC_DEFINE(FLEXT_SYS,2);; esac system = $enableval ], AC_DEFINE(FLEXT_SYS,2))
AC_ARG_WITH(sysdir, [ --with-sysdir path to pd or max headers], [ sysdir=$withval INCLUDEDIR="-I$withval $INCLUDEDIR" ], [echo "path to system headers required "$enableval && exit 1])
dnl check for g_canvas.h in pd folder AC_CHECK_FILE("$sysdir/g_canvas.h",,[echo "$sysdir/g_canvas.h not found" && exit 1])
AC_ARG_WITH(stkdir, [ --with-stkdir path to stk headers], [ AC_CHECK_FILE("$withval/Stk.h",,[echo "$withval/Stk.h not found" && exit 1]) stkdir=$withval INCLUDEDIR="-I$withval $INCLUDEDIR" ])
AM_CONDITIONAL([STK],[test "$stkdir"])
AC_ARG_WITH(sndobjdir, [ --with-sndobjdir path to SndObj headers], [ AC_CHECK_FILE("$withval/SndObj.h",,[echo "$withval/SndObj.h not found" && exit 1]) sndobjdir=$withval INCLUDEDIR="-I$withval $INCLUDEDIR" ])
AM_CONDITIONAL([SNDOBJ],[test "$sndobjdir"])
AC_ARG_ENABLE(optimize, [ --enable-optimize enables optimized builds for: pentium4, pentium3, G4, G5], [ case $enableval in pentium3 | pentium3m) OPT_FLAGS = "-mtune=$enableval -march=$enableval -mmmx -msse -mfpmath=sse"; AC_DEFINE(FLEXT_USE_SIMD);; pentium2 | athlon | pentium-mmx) OPT_FLAGS="-mtune=$enableval -march=$enableval -mmmx";; pentium) OPT_FLAGS="-mtune=$enableval -march=$enableval";; pentium4 | pentium4m | pentium-m | prescott | nocona | athlon-xp | athlon-mp | athlon64 | opteron) OPT_FLAGS="-mtune=$enableval -march=$enableval -mmmx -msse -msse2 -mfpmath=sse"; AC_DEFINE(FLEXT_USE_SIMD);; G5 | G4) OPT_FLAGS="-mtune=$enableval -march=$enableval -maltivec -faltivec -malign-natural"; AC_DEFINE(FLEXT_USE_SIMD);; G3) OPT_FLAGS="-mtune=$enableval -march=$enableval -malign-natural";; *) ;; esac ])
dnl Checks for programs. AC_PROG_CC AC_PROG_CXX AC_PROG_INSTALL AC_PROG_MAKE_SET AC_PROG_RANLIB
dnl Checks for libraries.
dnl Checks for header files.
dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST AC_C_INLINE AC_TYPE_SIZE_T AC_STRUCT_TM
dnl Checks for library functions.
dnl system specific
if test $(uname -s) == Linux ; then DYNAMIC_LDFLAGS="-Wl,-Bdynamic" PDEXT=pd_linux SOEXT=so fi if test $(uname -s) == Darwin ; then DYNAMIC_LDFLAGS="-version-info $API_VERSION -release $AC_PACKAGE_VERSION -dylib -dynamic -flat_namespace -undefined suppress"
if test $system == max ; then PDEXT=mxo SOEXT=dylib FRAMEWORKS=vecLib maxlib maxaudio else PDEXT=pd_darwin SOEXT=dylib FRAMEWORKS=vecLib fi fi
dnl else dnl echo "Platform NOT supported" dnl exit 1 dnl fi
dnl todo: mingw / cygwin
AC_SUBST(INCLUDEDIR) AC_SUBST(OPT_FLAGS) AC_SUBST(DYNAMIC_LDFLAGS) AC_SUBST(stkdir) AC_SUBST(sndobjdir) AC_SUBST(PDEXT) AC_SUBST(SOEXT) AC_SUBST(FRAMEWORKS) dnl for osx AC_OUTPUT([ Makefile tutorial/Makefile source/Makefile])
--- flext.vcproj.vspscc DELETED ---
Index: flext.vcproj =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/flext.vcproj,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** flext.vcproj 18 Sep 2004 04:00:28 -0000 1.29 --- flext.vcproj 26 Oct 2004 20:03:23 -0000 1.30 *************** *** 4,12 **** Version="7.10" Name="flext" ! ProjectGUID="{817F8B42-38B6-401B-9D36-E3C77429A9F2}" ! SccProjectName="max/flext" ! SccAuxPath="" ! SccLocalPath="." ! SccProvider="MSSCCI:Jalindi Igloo"> <Platforms> <Platform --- 4,9 ---- Version="7.10" Name="flext" ! ProjectGUID="{B94DB81C-B5FB-4984-99DC-5063C3793BFE}" ! Keyword="Win32Proj"> <Platforms> <Platform *************** *** 337,340 **** --- 334,338 ---- WarningLevel="3" SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" DebugInformationFormat="3" CompileAs="0"/>
--- NEW FILE: Makefile.am --- # # automake template # added by tim blechmann #
SUBDIRS = source
EXTRA_DIST = flext.doxy # examples tutorial
AUTOMAKE_OPTIONS = foreign Index: changes.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/changes.txt,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** changes.txt 26 Sep 2004 22:55:14 -0000 1.57 --- changes.txt 26 Oct 2004 20:03:23 -0000 1.58 *************** *** 14,17 **** --- 14,21 ---- Version history:
+ 0.4.8: + - fixes for 64 bit builds (size_t is integer type of pointer size) + - finally added a autoconf system (many many thanks to Tim Blechmann) + 0.4.7: - added flext::GetBool (just because flext::GetInt has been there for a while)