diff options
| -rw-r--r-- | chaos/AUTHORS | 3 | ||||
| -rw-r--r-- | chaos/ChangeLog | 0 | ||||
| -rw-r--r-- | chaos/Makefile.am | 2 | ||||
| -rw-r--r-- | chaos/NEWS | 0 | ||||
| -rw-r--r-- | chaos/README | 0 | ||||
| -rw-r--r-- | chaos/SConstruct | 19 | ||||
| -rwxr-xr-x | chaos/bootstrap.sh | 5 | ||||
| -rw-r--r-- | chaos/configure.ac | 145 | ||||
| -rw-r--r-- | chaos/src/Makefile.am | 66 |
9 files changed, 12 insertions, 228 deletions
diff --git a/chaos/AUTHORS b/chaos/AUTHORS deleted file mode 100644 index 022e6c0..0000000 --- a/chaos/AUTHORS +++ /dev/null @@ -1,3 +0,0 @@ -Tim Blechmann <TimBlechmann@gmx.net> -Mike McGonagle <mjmogo@gmail.com> -B. Bogart <ben@ekran.org>
\ No newline at end of file diff --git a/chaos/ChangeLog b/chaos/ChangeLog deleted file mode 100644 index e69de29..0000000 --- a/chaos/ChangeLog +++ /dev/null diff --git a/chaos/Makefile.am b/chaos/Makefile.am deleted file mode 100644 index 5db2166..0000000 --- a/chaos/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -SUBDIRS = src -EXTRA_DIST = src
\ No newline at end of file diff --git a/chaos/NEWS b/chaos/NEWS deleted file mode 100644 index e69de29..0000000 --- a/chaos/NEWS +++ /dev/null diff --git a/chaos/README b/chaos/README deleted file mode 100644 index e69de29..0000000 --- a/chaos/README +++ /dev/null diff --git a/chaos/SConstruct b/chaos/SConstruct index 2c682b8..e02934e 100644 --- a/chaos/SConstruct +++ b/chaos/SConstruct @@ -27,8 +27,9 @@ opt = Options(['options.cache']) opt.AddOptions( BoolOption('debug', 'Build with debugging symbols', False), ('optimize', 'Optimize for specific architecture', None), - ('icc', 'Build with intel c compiler', False), + BoolOption('icc', 'Build with intel c compiler', False), BoolOption('simd', 'build with simd instructions', False), + BoolOption('cmem', 'build with normal memory allocation', True), ('prefix', 'install prefix', '/usr/local'), ('flext_path', 'flext path', None), ('pd_path', 'pd path', None), @@ -39,8 +40,7 @@ opt.Update(env) opt.Save('options.cache',env) Help(opt.GenerateHelpText(env)) - -if env.Dictionary().has_key('icc') and env['icc']: +if env['icc']: env.Replace(CC="icc", SHCC="icc", CXX="icc", @@ -55,6 +55,10 @@ if env.Dictionary().has_key('icc') and env['icc']: print "Using intel c compiler" +if env['cmem']: + env.Append(CPPDEFINES=['FLEXT_USE_CMEM']) + + if env.Dictionary().has_key('flext_path'): env.Append(CPPPATH=[env['flext_path']]) else: @@ -75,13 +79,14 @@ if env.Dictionary().has_key('optimize'): if env.Dictionary().has_key('debug') and env['debug']: env.Append(CCFLAGS=' -g ') env.Append(CPPDEFINES=['_DEBUG']) - env.Append(LIBS = 'flext-pd') + env.Append(LIBS = 'flext-pd_d') env.Append(LINKFLAGS=' -g') else: - env.Append(CPPDEFINES=['FLEXT_SHARED']) env.Append(LIBS = 'flext-pd') env.Append(CPPDEFINES="NDEBUG") +env.Append(CPPDEFINES=['FLEXT_SHARED']) + ###################################################################### # # read package.txt @@ -149,5 +154,5 @@ except: external = env.SharedLibrary(name, sources, SHLIBPREFIX='', SHLIBSUFFIX='.pd_linux') prefix = env['prefix'] -env.Install(prefix+'/lib/pd/extra',external) -env.Alias('install', prefix+'/lib/pd/extra') +install = env.Install(prefix+'/lib/pd/extra',external) +env.Alias('install', install) diff --git a/chaos/bootstrap.sh b/chaos/bootstrap.sh deleted file mode 100755 index 695f2bd..0000000 --- a/chaos/bootstrap.sh +++ /dev/null @@ -1,5 +0,0 @@ -#! /bin/sh - -aclocal \ -&& automake-1.8 --gnu --add-missing \ -&& autoconf
\ No newline at end of file diff --git a/chaos/configure.ac b/chaos/configure.ac deleted file mode 100644 index 67bf056..0000000 --- a/chaos/configure.ac +++ /dev/null @@ -1,145 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. -AC_INIT(chaos~, 0.01, TimBlechmann@gmx.de, chaos~) -AM_INIT_AUTOMAKE - -dnl Checks for programs. -AC_PROG_MAKE_SET -AC_PROG_CC -AC_PROG_CXX - -dnl Checks for libraries. -AC_CHECK_LIB(m, sin) - -dnl Checks for header files. -AC_HEADER_STDC - -dnl Checks for typedefs, structures, and compiler characteristics. -AC_C_CONST -AC_C_INLINE -AC_TYPE_SIZE_T -AC_HEADER_TIME - - -dnl Checks for command line arguments -AC_ARG_WITH(flextdir, - [ --with-flextdir path to flext headers], - [ - flextdir=$withval - INCLUDEDIR="-I$withval $INCLUDEDIR" - ], - [echo "path to flext headers required" && exit 1]) - -AC_CHECK_FILE("$flextdir/flext.h",, - [echo "$flextdir/flext.h not found" && exit 1]) - - -AC_ARG_ENABLE(system, - [ --enable-system system (default: pd)], - [ - if test "enableval" == "max"; then - AC_DEFINE(FLEXT_SYS,1) - else - AC_DEFINE(FLEXT_SYS,2) - fi - system = $enabeval - ], - AC_DEFINE(FLEXT_SYS,2) - ) - - -AC_ARG_WITH(sysdir, - [ --with-sysdir path pd / max installation], - [ - SYSDIR=$withval - INCLUDEDIR="-I$withval $INCLUDEDIR" - ], - [echo "path to pd / max installation required" && exit 1]) - - -AC_ARG_ENABLE(static, - [ --enable-static static linking with libflext], - LDFLAGS="-Bstatic $LDFLAGS" - , - [ - AC_DEFINE(FLEXT_SHARED) - AC_DEFINE(FLEXT_THREADS) - LDFLAGS="-Bdynamic $LDFLAGS" - ] - ) - -AC_ARG_ENABLE(debug, - [ --enable-debug link with libflext_d library for debugging], - [ - LDFLAGS="-lflext_d $LDFLAGS" - CXXFLAGS="-g" - ], - [ - LDFLAGS="-lflext $LDFLAGS" - CXXFLAGS="-O3" - ]) - -dnl mtune will break gcc 3.3.x -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";; - 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";; - G5 | G4) - OPT_FLAGS="-mtune=$enableval -march=$enableval -maltivec -faltivec -malign-natural";; - G3) - OPT_FLAGS="-mtune=$enableval -march=$enableval -malign-natural";; - *) - ;; - esac - ]) - -dnl select build -if test `uname -s` == "Linux"; then - dnl no max/msp for linux - OBJEXT=o - EXTENSION=pd_linux -fi - -if test `uname -s` == "Darwin"; then - dnl just a guess - if test "$system" = "max"; then - echo "build system doesn't support max, yet" && exit 1; - else - LDFLAGS="-bundle -bundle_loader $LDFLAGS" - FRAMEWORKS= - EXTENSION=pd_darwin - LIBS="gcc $LIBS" - fi - OBJEXT=o -fi - -if test `uname -s` == "Cygwin"; then - dnl just a guess - if test "$system" = "max"; then - echo "build system doesn't support max, yet" && exit 1; - else - EXTENSION=dll - LIBS="gcc $LIBS bin/pd bin/pthreadVC.dll" - LDFLAGS="-L$SYSDIR" - fi -fi - - -AC_SUBST(EXTENSION) -AC_SUBST(INCLUDEDIR) -AC_SUBST(CXXFLAGS) -AC_SUBST(OPT_FLAGS) -AC_SUBST(LDFLAGS) -AC_SUBST(DEFS) -AC_SUBST(LIBS) -AC_SUBST(OBJEXT) -AC_SUBST(FRAMEWORKS) -AC_SUBST(SYSDIR) -AC_OUTPUT([Makefile - src/Makefile]) diff --git a/chaos/src/Makefile.am b/chaos/src/Makefile.am deleted file mode 100644 index e85310c..0000000 --- a/chaos/src/Makefile.am +++ /dev/null @@ -1,66 +0,0 @@ -NAME = chaos - -BUILT_SOURCES = main.cpp ode_base.cpp chaos_dsp.cpp \ - bernoulli_dsp.cpp bernoulli_msg.cpp \ - bungalow_tent_dsp.cpp bungalow_tent_msg.cpp \ - circle_map_dsp.cpp circle_map_msg.cpp \ - coupled_logistic_dsp.cpp coupled_logistic_msg.cpp \ - chua_dsp.cpp chua_msg.cpp \ - driven_anharmonic_dsp.cpp driven_anharmonic_msg.cpp \ - driven_van_der_pol_dsp.cpp driven_van_der_pol_msg.cpp \ - duffing_map_dsp.cpp duffing_map_msg.cpp \ - gauss_map_dsp.cpp gauss_map_msg.cpp \ - henon_map_dsp.cpp henon_map_msg.cpp \ - ikeda_laser_map_dsp.cpp ikeda_laser_map_msg.cpp \ - latoocarfian_dsp.cpp latoocarfian_msg.cpp \ - latoomutalpha_dsp.cpp latoomutalpha_msg.cpp \ - latoomutbeta_dsp.cpp latoomutbeta_msg.cpp \ - latoomutgamma_dsp.cpp latoomutgamma_msg.cpp \ - logistic_dsp.cpp logistic_msg.cpp logistic_search.cpp\ - lorenz_dsp.cpp lorenz_msg.cpp \ - lozi_map_dsp.cpp lozi_map_msg.cpp \ - roessler_dsp.cpp roessler_msg.cpp \ - sine_map_dsp.cpp sine_map_msg.cpp \ - standard_map_dsp.cpp standard_map_msg.cpp \ - tent_map_dsp.cpp tent_map_msg.cpp - -CXXFLAGS = @CXXFLAGS@ \ - @OPT_FLAGS@ \ - @INCLUDEDIR@ \ - $(DEFS) - -LDFLAGS = @LDFLAGS@ \ - $(patsubst %,-framework %,$(FRAMEWORKS)) - -LIBS = @LIBS@ - -FRAMEWORKS = @FRAMEWORKS@ - -TARGET =$(NAME).@EXTENSION@ - -OBJECTS = $(patsubst %.cpp,%.@OBJEXT@,$(BUILT_SOURCES)) - -SYSDIR = @SYSDIR@ - - -# ----------------------------- targets -------------------------------- - - -all-local: $(OBJECTS) - $(CXX) $(LDFLAGS) -shared $^ $(LIBS) -o ../$(TARGET) - strip --strip-unneeded ../$(TARGET) - -%.@OBJEXT@ : %.cpp - $(CXX) -c $(CXXFLAGS) $< -o $@ - -dist-hook: - rm -f ./*~ - rm -f ./*.@OBJEXT@ - rm ./Makefile - -clean-local: - rm -f ../$(TARGET) - rm -f ./*.@OBJEXT@ - -install-exec-local: - install ../$(TARGET) $(SYSDIR)extra
\ No newline at end of file |