diff options
-rw-r--r-- | LICENSE.txt (renamed from COPYING.txt) | 0 | ||||
-rw-r--r-- | Makefile | 410 | ||||
-rw-r--r-- | Makefile.nt (renamed from makefile) | 0 | ||||
-rw-r--r-- | README.build.txt | 15 | ||||
-rw-r--r-- | Release/BuildLog.htm | 87 | ||||
-rw-r--r-- | Release/chaos.dll | bin | 69632 -> 0 bytes | |||
-rw-r--r-- | Release/chaos.pd_darwin | bin | 13768 -> 0 bytes | |||
-rw-r--r-- | attract1-help.pd (renamed from tools/attract1-help.pd) | 0 | ||||
-rw-r--r-- | attract1.c | 2 | ||||
-rw-r--r-- | base-help.pd (renamed from tools/base-help.pd) | 0 | ||||
-rw-r--r-- | base.c | 2 | ||||
-rw-r--r-- | base3.c | 2 | ||||
-rw-r--r-- | chaos-meta.pd | 6 | ||||
-rw-r--r-- | chaos.h (renamed from lyapunov.h) | 2 | ||||
-rw-r--r-- | dejong.c | 2 | ||||
-rw-r--r-- | examples/fractal-tools.pd (renamed from tools/fractal-tools.pd) | 0 | ||||
-rw-r--r-- | examples/loop.pd (renamed from tools/loop.pd) | 0 | ||||
-rw-r--r-- | examples/martin-test-help.pd (renamed from tools/martin-test-help.pd) | 0 | ||||
-rw-r--r-- | examples/popcorn-test-help.pd (renamed from tools/popcorn-test-help.pd) | 0 | ||||
-rw-r--r-- | examples/quaruptwo-test-help.pd (renamed from tools/quaruptwo-test-help.pd) | 0 | ||||
-rw-r--r-- | examples/readme-frac-format.pd (renamed from tools/readme-frac-format.pd) | 0 | ||||
-rw-r--r-- | examples/readme-fractals.pd (renamed from tools/readme-fractals.pd) | 0 | ||||
-rw-r--r-- | examples/readme-gen-fractal.pd (renamed from tools/readme-gen-fractal.pd) | 0 | ||||
-rw-r--r-- | examples/readme-lyapunov.pd (renamed from tools/readme-lyapunov.pd) | 0 | ||||
-rw-r--r-- | examples/readme-operation.pd (renamed from tools/readme-operation.pd) | 0 | ||||
-rw-r--r-- | examples/readme-parameter-ranges.pd (renamed from tools/readme-parameter-ranges.pd) | 0 | ||||
-rw-r--r-- | examples/readme-searching.pd (renamed from tools/readme-searching.pd) | 0 | ||||
-rw-r--r-- | examples/search-tools.pd (renamed from tools/search-tools.pd) | 0 | ||||
-rw-r--r-- | gingerbreadman-help.pd (renamed from tools/gingerbreadman-help.pd) | 0 | ||||
-rw-r--r-- | henon-help.pd (renamed from tools/henon-help.pd) | 0 | ||||
-rw-r--r-- | henon.c | 2 | ||||
-rw-r--r-- | hopalong-help.pd (renamed from tools/hopalong-help.pd) | 0 | ||||
-rw-r--r-- | hopalong.c | 2 | ||||
-rw-r--r-- | ikeda-help.pd (renamed from tools/ikeda-help.pd) | 0 | ||||
-rw-r--r-- | ikeda.c | 2 | ||||
-rw-r--r-- | latoocarfian-help.pd (renamed from tools/latoocarfian-help.pd) | 0 | ||||
-rw-r--r-- | latoocarfian.c | 2 | ||||
-rw-r--r-- | latoomutalpha-help.pd (renamed from tools/latoomutalpha-help.pd) | 0 | ||||
-rw-r--r-- | latoomutalpha.c | 2 | ||||
-rw-r--r-- | latoomutbeta-help.pd (renamed from tools/latoomutbeta-help.pd) | 0 | ||||
-rw-r--r-- | latoomutbeta.c | 2 | ||||
-rw-r--r-- | latoomutgamma-help.pd (renamed from tools/latoomutgamma-help.pd) | 0 | ||||
-rw-r--r-- | latoomutgamma.c | 2 | ||||
-rw-r--r-- | libchaos.c (renamed from lyapunov.c) | 2 | ||||
-rw-r--r-- | logistic.c | 2 | ||||
-rw-r--r-- | lorenz-help.pd (renamed from tools/lorenz-help.pd) | 0 | ||||
-rw-r--r-- | lorenz.c | 2 | ||||
-rw-r--r-- | lotka_volterra.c | 2 | ||||
-rw-r--r-- | martin-help.pd (renamed from tools/martin-help.pd) | 0 | ||||
-rw-r--r-- | martin.c | 2 | ||||
-rw-r--r-- | mlogistic.c | 2 | ||||
-rw-r--r-- | pickover.c | 2 | ||||
-rw-r--r-- | popcorn-help.pd (renamed from tools/popcorn-help.pd) | 0 | ||||
-rw-r--r-- | popcorn.c | 2 | ||||
-rw-r--r-- | quadruptwo.c | 2 | ||||
-rw-r--r-- | quaruptwo-help.pd (renamed from tools/quaruptwo-help.pd) | 0 | ||||
-rw-r--r-- | rossler.c | 2 | ||||
-rw-r--r-- | standardmap-help.pd (renamed from tools/standardmap-help.pd) | 0 | ||||
-rw-r--r-- | standardmap.c | 2 | ||||
-rw-r--r-- | strange1.c | 2 | ||||
-rw-r--r-- | tent.c | 2 | ||||
-rw-r--r-- | three_d.c | 2 | ||||
-rw-r--r-- | threeply.c | 2 | ||||
-rw-r--r-- | tinkerbell.c | 2 |
64 files changed, 444 insertions, 130 deletions
diff --git a/COPYING.txt b/LICENSE.txt index 486449c..486449c 100644 --- a/COPYING.txt +++ b/LICENSE.txt diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..9b667dc --- /dev/null +++ b/Makefile @@ -0,0 +1,410 @@ +## Pd library template version 1.0.11 +# For instructions on how to use this template, see: +# http://puredata.info/docs/developer/MakefileTemplate +LIBRARY_NAME = chaos + +# add your .c source files, one object per file, to the SOURCES +# variable, help files will be included automatically, and for GUI +# objects, the matching .tcl file too +SOURCES = attract1.c base3.c base.c chaos.c dejong.c gingerbreadman.c henon.c hopalong.c ikeda.c latoocarfian.c latoomutalpha.c latoomutbeta.c latoomutgamma.c logistic.c lorenz.c lotka_volterra.c martin.c mlogistic.c pickover.c popcorn.c quadruptwo.c rossler.c standardmap.c strange1.c tent.c three_d.c threeply.c tinkerbell.c unity.c + +# list all pd objects (i.e. myobject.pd) files here, and their helpfiles will +# be included automatically +PDOBJECTS = + +# example patches and related files, in the 'examples' subfolder +EXAMPLES = fractal-tools.pd loop.pd martin-test-help.pd popcorn-test-help.pd quaruptwo-test-help.pd readme-frac-format.pd readme-fractals.pd readme-gen-fractal.pd readme-lyapunov.pd readme-operation.pd readme-parameter-ranges.pd readme-searching.pd search-tools.pd + +# manuals and related files, in the 'manual' subfolder +MANUAL = + +# if you want to include any other files in the source and binary tarballs, +# list them here. This can be anything from header files, test patches, +# documentation, etc. README.txt and LICENSE.txt are required and therefore +# automatically included +EXTRA_DIST = chaos.ncb chaos.sln chaos.suo chaos.vcproj Makefile.nt + + + +#------------------------------------------------------------------------------# +# +# things you might need to edit if you are using other C libraries +# +#------------------------------------------------------------------------------# + +ALL_CFLAGS = -I"$(PD_INCLUDE)" +ALL_LDFLAGS = +SHARED_LDFLAGS = +ALL_LIBS = + + +#------------------------------------------------------------------------------# +# +# you shouldn't need to edit anything below here, if we did it right :) +# +#------------------------------------------------------------------------------# + +# these can be set from outside without (usually) breaking the build +CFLAGS = -Wall -W -g +LDFLAGS = +LIBS = + +# get library version from meta file +LIBRARY_VERSION = $(shell sed -n 's|^\#X text [0-9][0-9]* [0-9][0-9]* VERSION \(.*\);|\1|p' $(LIBRARY_NAME)-meta.pd) + +ALL_CFLAGS += -DPD -DVERSION='"$(LIBRARY_VERSION)"' + +PD_INCLUDE = $(PD_PATH)/include/pd +# where to install the library, overridden below depending on platform +prefix = /usr/local +libdir = $(prefix)/lib +pkglibdir = $(libdir)/pd-externals +objectsdir = $(pkglibdir) + +INSTALL = install +INSTALL_PROGRAM = $(INSTALL) -p -m 644 +INSTALL_DATA = $(INSTALL) -p -m 644 +INSTALL_DIR = $(INSTALL) -p -m 755 -d + +ALLSOURCES := $(SOURCES) $(SOURCES_android) $(SOURCES_cygwin) $(SOURCES_macosx) \ + $(SOURCES_iphoneos) $(SOURCES_linux) $(SOURCES_windows) + +DISTDIR=$(LIBRARY_NAME)-$(LIBRARY_VERSION) +ORIGDIR=pd-$(LIBRARY_NAME:~=)_$(LIBRARY_VERSION) + +UNAME := $(shell uname -s) +ifeq ($(UNAME),Darwin) + CPU := $(shell uname -p) + ifeq ($(CPU),arm) # iPhone/iPod Touch + SOURCES += $(SOURCES_iphoneos) + EXTENSION = pd_darwin + SHARED_EXTENSION = dylib + OS = iphoneos + PD_PATH = /Applications/Pd-extended.app/Contents/Resources + IPHONE_BASE=/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin + CC=$(IPHONE_BASE)/gcc + CPP=$(IPHONE_BASE)/cpp + CXX=$(IPHONE_BASE)/g++ + ISYSROOT = -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS3.0.sdk + IPHONE_CFLAGS = -miphoneos-version-min=3.0 $(ISYSROOT) -arch armv6 + OPT_CFLAGS = -fast -funroll-loops -fomit-frame-pointer + ALL_CFLAGS := $(IPHONE_CFLAGS) $(ALL_CFLAGS) + ALL_LDFLAGS += -arch armv6 -bundle -undefined dynamic_lookup $(ISYSROOT) + SHARED_LDFLAGS += -arch armv6 -dynamiclib -undefined dynamic_lookup $(ISYSROOT) + ALL_LIBS += -lc $(LIBS_iphoneos) + STRIP = strip -x + DISTBINDIR=$(DISTDIR)-$(OS) + else # Mac OS X + SOURCES += $(SOURCES_macosx) + EXTENSION = pd_darwin + SHARED_EXTENSION = dylib + OS = macosx + PD_PATH = /Applications/Pd-extended.app/Contents/Resources + OPT_CFLAGS = -ftree-vectorize -ftree-vectorizer-verbose=2 -fast +# build universal 32-bit on 10.4 and 32/64 on newer + ifeq ($(shell uname -r | sed 's|\([0-9][0-9]*\)\.[0-9][0-9]*\.[0-9][0-9]*|\1|'), 8) + FAT_FLAGS = -arch ppc -arch i386 -mmacosx-version-min=10.4 + else + FAT_FLAGS = -arch ppc -arch i386 -arch x86_64 -mmacosx-version-min=10.4 + SOURCES += $(SOURCES_iphoneos) + endif + ALL_CFLAGS += $(FAT_FLAGS) -fPIC -I/sw/include + # if the 'pd' binary exists, check the linking against it to aid with stripping + BUNDLE_LOADER = $(shell test ! -e $(PD_PATH)/bin/pd || echo -bundle_loader $(PD_PATH)/bin/pd) + ALL_LDFLAGS += $(FAT_FLAGS) -bundle $(BUNDLE_LOADER) -undefined dynamic_lookup -L/sw/lib + SHARED_LDFLAGS += $(FAT_FLAGS) -dynamiclib -undefined dynamic_lookup \ + -install_name @loader_path/$(SHARED_LIB) -compatibility_version 1 -current_version 1.0 + ALL_LIBS += -lc $(LIBS_macosx) + STRIP = strip -x + DISTBINDIR=$(DISTDIR)-$(OS) +# install into ~/Library/Pd on Mac OS X since /usr/local isn't used much + pkglibdir=$(HOME)/Library/Pd + endif +endif +# Tho Android uses Linux, we use this fake uname to provide an easy way to +# setup all this things needed to cross-compile for Android using the NDK +ifeq ($(UNAME),ANDROID) + CPU := arm + SOURCES += $(SOURCES_android) + EXTENSION = pd_linux + SHARED_EXTENSION = so + OS = android + PD_PATH = /usr + NDK_BASE := /usr/local/android-ndk + NDK_PLATFORM_VERSION := 5 + NDK_SYSROOT=$(NDK_BASE)/platforms/android-$(NDK_PLATFORM_VERSION)/arch-arm + NDK_UNAME := $(shell uname -s | tr '[A-Z]' '[a-z]') + NDK_TOOLCHAIN_BASE=$(NDK_BASE)/toolchains/arm-linux-androideabi-4.4.3/prebuilt/$(NDK_UNAME)-x86 + CC := $(NDK_TOOLCHAIN_BASE)/bin/arm-linux-androideabi-gcc --sysroot=$(NDK_SYSROOT) + OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer + CFLAGS += + LDFLAGS += -rdynamic -shared + SHARED_LDFLAGS += -Wl,-soname,$(SHARED_LIB) -shared + LIBS += -lc $(LIBS_android) + STRIP := $(NDK_TOOLCHAIN_BASE)/bin/arm-linux-androideabi-strip \ + --strip-unneeded -R .note -R .comment + DISTBINDIR=$(DISTDIR)-$(OS)-$(shell uname -m) +endif +ifeq ($(UNAME),Linux) + CPU := $(shell uname -m) + SOURCES += $(SOURCES_linux) + EXTENSION = pd_linux + SHARED_EXTENSION = so + OS = linux + PD_PATH = /usr + OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer + ALL_CFLAGS += -fPIC + ALL_LDFLAGS += -rdynamic -shared -fPIC -Wl,-rpath,"\$$ORIGIN",--enable-new-dtags + SHARED_LDFLAGS += -Wl,-soname,$(SHARED_LIB) -shared + ALL_LIBS += -lc $(LIBS_linux) + STRIP = strip --strip-unneeded -R .note -R .comment + DISTBINDIR=$(DISTDIR)-$(OS)-$(shell uname -m) +endif +ifeq ($(UNAME),GNU) + # GNU/Hurd, should work like GNU/Linux for basically all externals + CPU := $(shell uname -m) + SOURCES += $(SOURCES_linux) + EXTENSION = pd_linux + SHARED_EXTENSION = so + OS = linux + PD_PATH = /usr + OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer + ALL_CFLAGS += -fPIC + ALL_LDFLAGS += -rdynamic -shared -fPIC -Wl,-rpath,"\$$ORIGIN",--enable-new-dtags + SHARED_LDFLAGS += -shared -Wl,-soname,$(SHARED_LIB) + ALL_LIBS += -lc $(LIBS_linux) + STRIP = strip --strip-unneeded -R .note -R .comment + DISTBINDIR=$(DISTDIR)-$(OS)-$(shell uname -m) +endif +ifeq ($(UNAME),GNU/kFreeBSD) + # Debian GNU/kFreeBSD, should work like GNU/Linux for basically all externals + CPU := $(shell uname -m) + SOURCES += $(SOURCES_linux) + EXTENSION = pd_linux + SHARED_EXTENSION = so + OS = linux + PD_PATH = /usr + OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer + ALL_CFLAGS += -fPIC + ALL_LDFLAGS += -rdynamic -shared -fPIC -Wl,-rpath,"\$$ORIGIN",--enable-new-dtags + SHARED_LDFLAGS += -shared -Wl,-soname,$(SHARED_LIB) + ALL_LIBS += -lc $(LIBS_linux) + STRIP = strip --strip-unneeded -R .note -R .comment + DISTBINDIR=$(DISTDIR)-$(OS)-$(shell uname -m) +endif +ifeq (CYGWIN,$(findstring CYGWIN,$(UNAME))) + CPU := $(shell uname -m) + SOURCES += $(SOURCES_cygwin) + EXTENSION = dll + SHARED_EXTENSION = dll + OS = cygwin + PD_PATH = $(shell cygpath $$PROGRAMFILES)/pd + OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer + ALL_CFLAGS += + ALL_LDFLAGS += -rdynamic -shared -L"$(PD_PATH)/src" -L"$(PD_PATH)/bin" + SHARED_LDFLAGS += -shared -Wl,-soname,$(SHARED_LIB) + ALL_LIBS += -lc -lpd $(LIBS_cygwin) + STRIP = strip --strip-unneeded -R .note -R .comment + DISTBINDIR=$(DISTDIR)-$(OS) +endif +ifeq (MINGW,$(findstring MINGW,$(UNAME))) + CPU := $(shell uname -m) + SOURCES += $(SOURCES_windows) + EXTENSION = dll + SHARED_EXTENSION = dll + OS = windows + PD_PATH = $(shell cd "$$PROGRAMFILES/pd" && pwd) + # MinGW doesn't seem to include cc so force gcc + CC=gcc + OPT_CFLAGS = -O3 -funroll-loops -fomit-frame-pointer + ALL_CFLAGS += -mms-bitfields + ALL_LDFLAGS += -s -shared -Wl,--enable-auto-import -L"$(PD_PATH)/src" -L"$(PD_PATH)/bin" -L"$(PD_PATH)/obj" + SHARED_LDFLAGS += -shared + ALL_LIBS += -lpd -lwsock32 -lkernel32 -luser32 -lgdi32 $(LIBS_windows) + STRIP = strip --strip-unneeded -R .note -R .comment + DISTBINDIR=$(DISTDIR)-$(OS) +endif + +# in case somebody manually set the HELPPATCHES above +HELPPATCHES ?= $(SOURCES:.c=-help.pd) $(PDOBJECTS:.pd=-help.pd) + +ALL_CFLAGS := $(ALL_CFLAGS) $(CFLAGS) $(OPT_CFLAGS) +ALL_LDFLAGS := $(LDFLAGS) $(ALL_LDFLAGS) +ALL_LIBS := $(LIBS) $(ALL_LIBS) + +SHARED_SOURCE ?= $(shell test ! -e lib$(LIBRARY_NAME).c || \ + echo lib$(LIBRARY_NAME).c ) +SHARED_HEADER ?= $(shell test ! -e $(LIBRARY_NAME).h || echo $(LIBRARY_NAME).h) +SHARED_LIB = $(SHARED_SOURCE:.c=.$(SHARED_EXTENSION)) + +.PHONY = install libdir_install single_install install-doc install-examples install-manual clean distclean dist etags $(LIBRARY_NAME) + +all: $(SOURCES:.c=.$(EXTENSION)) $(SHARED_LIB) + +%.o: %.c + $(CC) $(ALL_CFLAGS) -o "$*.o" -c "$*.c" + +%.$(EXTENSION): %.o $(SHARED_LIB) + $(CC) $(ALL_LDFLAGS) -o "$*.$(EXTENSION)" "$*.o" $(ALL_LIBS) $(SHARED_LIB) + chmod a-x "$*.$(EXTENSION)" + +# this links everything into a single binary file +$(LIBRARY_NAME): $(SOURCES:.c=.o) $(LIBRARY_NAME).o + $(CC) $(ALL_LDFLAGS) -o $(LIBRARY_NAME).$(EXTENSION) $(SOURCES:.c=.o) $(LIBRARY_NAME).o $(ALL_LIBS) + chmod a-x $(LIBRARY_NAME).$(EXTENSION) + +$(SHARED_LIB): $(SHARED_SOURCE:.c=.o) + $(CC) $(SHARED_LDFLAGS) -o $(SHARED_LIB) $(SHARED_SOURCE:.c=.o) $(LIBS) + +install: libdir_install + +# The meta and help files are explicitly installed to make sure they are +# actually there. Those files are not optional, then need to be there. +libdir_install: $(SOURCES:.c=.$(EXTENSION)) $(SHARED_LIB) install-doc install-examples install-manual + $(INSTALL_DIR) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) + $(INSTALL_DATA) $(LIBRARY_NAME)-meta.pd \ + $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) + test -z "$(strip $(SOURCES))" || (\ + $(INSTALL_PROGRAM) $(SOURCES:.c=.$(EXTENSION)) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) && \ + $(STRIP) $(addprefix $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/,$(SOURCES:.c=.$(EXTENSION)))) + test -z "$(strip $(SHARED_LIB))" || \ + $(INSTALL_DATA) $(SHARED_LIB) \ + $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) + test -z "$(strip $(wildcard $(SOURCES:.c=.tcl)))" || \ + $(INSTALL_DATA) $(wildcard $(SOURCES:.c=.tcl)) \ + $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) + test -z "$(strip $(PDOBJECTS))" || \ + $(INSTALL_DATA) $(PDOBJECTS) \ + $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) + +# install library linked as single binary +single_install: $(LIBRARY_NAME) install-doc install-examples install-manual + $(INSTALL_DIR) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) + $(INSTALL_PROGRAM) $(LIBRARY_NAME).$(EXTENSION) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) + $(STRIP) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/$(LIBRARY_NAME).$(EXTENSION) + +install-doc: + $(INSTALL_DIR) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) + test -z "$(strip $(SOURCES) $(PDOBJECTS))" || \ + $(INSTALL_DATA) $(HELPPATCHES) \ + $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) + $(INSTALL_DATA) README.txt $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/README.txt + $(INSTALL_DATA) LICENSE.txt $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/LICENSE.txt + +install-examples: + test -z "$(strip $(EXAMPLES))" || \ + $(INSTALL_DIR) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/examples && \ + for file in $(EXAMPLES); do \ + $(INSTALL_DATA) examples/$$file $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/examples; \ + done + +install-manual: + test -z "$(strip $(MANUAL))" || \ + $(INSTALL_DIR) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/manual && \ + for file in $(MANUAL); do \ + $(INSTALL_DATA) manual/$$file $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/manual; \ + done + + +clean: + -rm -f -- $(SOURCES:.c=.o) $(SOURCES_LIB:.c=.o) $(SHARED_SOURCE:.c=.o) + -rm -f -- $(SOURCES:.c=.$(EXTENSION)) + -rm -f -- $(LIBRARY_NAME).o + -rm -f -- $(LIBRARY_NAME).$(EXTENSION) + -rm -f -- $(SHARED_LIB) + +distclean: clean + -rm -f -- $(DISTBINDIR).tar.gz + -rm -rf -- $(DISTBINDIR) + -rm -f -- $(DISTDIR).tar.gz + -rm -rf -- $(DISTDIR) + -rm -f -- $(ORIGDIR).tar.gz + -rm -rf -- $(ORIGDIR) + + +$(DISTBINDIR): + $(INSTALL_DIR) $(DISTBINDIR) + +libdir: all $(DISTBINDIR) + $(INSTALL_DATA) $(LIBRARY_NAME)-meta.pd $(DISTBINDIR) + $(INSTALL_DATA) $(SOURCES) $(SHARED_SOURCE) $(SHARED_HEADER) $(DISTBINDIR) + $(INSTALL_DATA) $(HELPPATCHES) $(DISTBINDIR) + test -z "$(strip $(EXTRA_DIST))" || \ + $(INSTALL_DATA) $(EXTRA_DIST) $(DISTBINDIR) +# tar --exclude-vcs -czpf $(DISTBINDIR).tar.gz $(DISTBINDIR) + +$(DISTDIR): + $(INSTALL_DIR) $(DISTDIR) + +$(ORIGDIR): + $(INSTALL_DIR) $(ORIGDIR) + +dist: $(DISTDIR) + $(INSTALL_DATA) Makefile $(DISTDIR) + $(INSTALL_DATA) README.txt $(DISTDIR) + $(INSTALL_DATA) LICENSE.txt $(DISTDIR) + $(INSTALL_DATA) $(LIBRARY_NAME)-meta.pd $(DISTDIR) + test -z "$(strip $(ALLSOURCES))" || \ + $(INSTALL_DATA) $(ALLSOURCES) $(DISTDIR) + test -z "$(strip $(wildcard $(ALLSOURCES:.c=.tcl)))" || \ + $(INSTALL_DATA) $(wildcard $(ALLSOURCES:.c=.tcl)) $(DISTDIR) + test -z "$(strip $(SHARED_HEADER))" || \ + $(INSTALL_DATA) $(SHARED_HEADER) $(DISTDIR) + test -z "$(strip $(SHARED_SOURCE))" || \ + $(INSTALL_DATA) $(SHARED_SOURCE) $(DISTDIR) + test -z "$(strip $(PDOBJECTS))" || \ + $(INSTALL_DATA) $(PDOBJECTS) $(DISTDIR) + test -z "$(strip $(HELPPATCHES))" || \ + $(INSTALL_DATA) $(HELPPATCHES) $(DISTDIR) + test -z "$(strip $(EXTRA_DIST))" || \ + $(INSTALL_DATA) $(EXTRA_DIST) $(DISTDIR) + test -z "$(strip $(EXAMPLES))" || \ + $(INSTALL_DIR) $(DISTDIR)/examples && \ + for file in $(EXAMPLES); do \ + $(INSTALL_DATA) examples/$$file $(DISTDIR)/examples; \ + done + test -z "$(strip $(MANUAL))" || \ + $(INSTALL_DIR) $(DISTDIR)/manual && \ + for file in $(MANUAL); do \ + $(INSTALL_DATA) manual/$$file $(DISTDIR)/manual; \ + done + tar --exclude-vcs -czpf $(DISTDIR).tar.gz $(DISTDIR) + +# make a Debian source package +dpkg-source: + debclean + make distclean dist + mv $(DISTDIR) $(ORIGDIR) + tar --exclude-vcs -czpf ../$(ORIGDIR).orig.tar.gz $(ORIGDIR) + rm -f -- $(DISTDIR).tar.gz + rm -rf -- $(DISTDIR) $(ORIGDIR) + cd .. && dpkg-source -b $(LIBRARY_NAME) + +etags: + etags *.h $(SOURCES) ../../pd/src/*.[ch] /usr/include/*.h /usr/include/*/*.h + +showsetup: + @echo "CC: $(CC)" + @echo "CFLAGS: $(CFLAGS)" + @echo "LDFLAGS: $(LDFLAGS)" + @echo "LIBS: $(LIBS)" + @echo "ALL_CFLAGS: $(ALL_CFLAGS)" + @echo "ALL_LDFLAGS: $(ALL_LDFLAGS)" + @echo "ALL_LIBS: $(ALL_LIBS)" + @echo "PD_INCLUDE: $(PD_INCLUDE)" + @echo "PD_PATH: $(PD_PATH)" + @echo "objectsdir: $(objectsdir)" + @echo "LIBRARY_NAME: $(LIBRARY_NAME)" + @echo "LIBRARY_VERSION: $(LIBRARY_VERSION)" + @echo "SOURCES: $(SOURCES)" + @echo "SHARED_HEADER: $(SHARED_HEADER)" + @echo "SHARED_SOURCE: $(SHARED_SOURCE)" + @echo "SHARED_LIB: $(SHARED_LIB)" + @echo "PDOBJECTS: $(PDOBJECTS)" + @echo "ALLSOURCES: $(ALLSOURCES)" + @echo "ALLSOURCES TCL: $(wildcard $(ALLSOURCES:.c=.tcl))" + @echo "UNAME: $(UNAME)" + @echo "CPU: $(CPU)" + @echo "pkglibdir: $(pkglibdir)" + @echo "DISTDIR: $(DISTDIR)" + @echo "ORIGDIR: $(ORIGDIR)" diff --git a/README.build.txt b/README.build.txt deleted file mode 100644 index 638cbcb..0000000 --- a/README.build.txt +++ /dev/null @@ -1,15 +0,0 @@ -These objects where developed under Linux and have been tested -in Linux and OSX. The objects should also compile under Windows and IRIX. - -To build (under linux): - -make pd_linux - -To build (under OSX): - -make pd_darwin - - -To Install: - -Copy the .pd_* files where PD will seem them, like the "extra" folder. diff --git a/Release/BuildLog.htm b/Release/BuildLog.htm deleted file mode 100644 index 7b69af8..0000000 --- a/Release/BuildLog.htm +++ /dev/null @@ -1,87 +0,0 @@ -<html>
-<head>
-<META HTTP-EQUIV="Content-Type" content="text/html; charset=Windows-1252">
-</head>
-<body>
-<pre>
-<table width=100% bgcolor=#CFCFE5><tr> <td> <font face=arial size=+3>
-Build Log
-</font></table><table width=* cellspacing=0 cellpadding=0><tr><td width=0 bgcolor=#EDEDF5> </td><td width=0 bgcolor=#FFFFFF> </td><td width=*><pre>
-<h3>------- Build started: Project: chaos, Configuration: Release|Win32 -------
-</h3>
-</pre></table><table width=100% bgcolor=#DFDFE5><tr><td><font face=arial size=+2>
-Environment Space
-</font></table><table width=* cellspacing=0 cellpadding=0><tr><td width=0 bgcolor=#EDEDF5> </td><td width=0 bgcolor=#FFFFFF> </td><td width=*><pre> ALLUSERSPROFILE=C:\Documents and Settings\All Users
- APPDATA=C:\Documents and Settings\george\Application Data
- CLIENTNAME=Console
- CommonProgramFiles=C:\Program Files\Common Files
- COMPUTERNAME=BLUE
- ComSpec=C:\WINDOWS\system32\cmd.exe
- HOMEDRIVE=C:
- HOMEPATH=\Documents and Settings\george
- INCLUDE=C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
- LIB=C:\Program Files\Microsoft Visual Studio .NET\Vc7\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\lib
- LIBPATH=
- LOGONSERVER=\\BLUE
- NUMBER_OF_PROCESSORS=1
- OS=Windows_NT
- Path=C:\Program Files\Microsoft Visual Studio .NET\Vc7\bin;C:\Program Files\Microsoft Visual Studio .NET\Common7\Tools\bin\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Common7\Tools\bin;C:\Program Files\Microsoft Visual Studio .NET\Common7\tools;C:\Program Files\Microsoft Visual Studio .NET\Common7\ide;C:\Program Files\HTML Help Workshop\;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\bin;C:\WINDOWS\Microsoft.NET\Framework\v1.0.3705;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\PROGRA~1\ULTRAE~1;C:\Program Files\Common Files\Adaptec Shared\System
- PATHEXT=.COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH;.tcl;.py;.pyc;.pyo;.pyw;.pys
- PROCESSOR_ARCHITECTURE=x86
- PROCESSOR_IDENTIFIER=x86 Family 6 Model 4 Stepping 2, AuthenticAMD
- PROCESSOR_LEVEL=6
- PROCESSOR_REVISION=0402
- ProgramFiles=C:\Program Files
- SESSIONNAME=Console
- SystemDrive=C:
- SystemRoot=C:\WINDOWS
- TEMP=C:\DOCUME~1\george\LOCALS~1\Temp
- TMP=C:\DOCUME~1\george\LOCALS~1\Temp
- USERDOMAIN=BLUE
- USERNAME=george
- USERPROFILE=C:\Documents and Settings\george
- VSCOMNTOOLS="C:\Program Files\Microsoft Visual Studio .NET\Common7\Tools\"
- VST_PATH=C:\Audio\Vstplugins
- windir=C:\WINDOWS
- _ACP_ATLPROV=C:\Program Files\Microsoft Visual Studio .NET\Vc7\bin\ATLPROV.DLL
- _ACP_INCLUDE="E:\pd\pd-0.35-1\src";C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
- _ACP_LIB=C:\Program Files\Microsoft Visual Studio .NET\Vc7\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\lib;"E:\pd\pd-0.35-1\src";C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
- _ACP_PATH=C:\Program Files\Microsoft Visual Studio .NET\Vc7\bin;C:\Program Files\Microsoft Visual Studio .NET\Common7\Tools\bin\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Common7\Tools\bin;C:\Program Files\Microsoft Visual Studio .NET\Common7\tools;C:\Program Files\Microsoft Visual Studio .NET\Common7\ide;C:\Program Files\HTML Help Workshop\;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\bin;C:\WINDOWS\Microsoft.NET\Framework\v1.0.3705;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\PROGRA~1\ULTRAE~1;C:\Program Files\Common Files\Adaptec Shared\System
-</pre></table><table width=100% bgcolor=#DFDFE5><tr><td><font face=arial size=+2>
-Command Lines
-</font></table><table width=* cellspacing=0 cellpadding=0><tr><td width=0 bgcolor=#EDEDF5> </td><td width=0 bgcolor=#FFFFFF> </td><td width=*><pre>Creating temporary file "e:\pd\add_ons\-=[ Ben Bogart ]=-\Chaos Math Externals\chaos\Release\RSP000001.rsp" with contents
-[
-/O2 /Ob1 /Oy /I "E:\pd\pd-0.35-1\src" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "NT" /D "PD" /D "_MBCS" /D "_WINDLL" /GF /FD /EHsc /ML /GS /Gy /YX"stdafx.h" /Fp"Release/chaos.pch" /Fo"Release/" /Fd"Release/vc70.pdb" /W3 /c /Wp64
-"rossler.c"
-"lorenz.c"
-"ikeda.c"
-"henon.c"
-"chaos.c"
-]
-Creating command line "cl.exe @"e:\pd\add_ons\-=[ Ben Bogart ]=-\Chaos Math Externals\chaos\Release\RSP000001.rsp" /nologo"
-Creating temporary file "e:\pd\add_ons\-=[ Ben Bogart ]=-\Chaos Math Externals\chaos\Release\RSP000002.rsp" with contents
-[
-/OUT:"Release/chaos.dll" /INCREMENTAL:NO /NOLOGO /LIBPATH:"E:\pd\pd-0.35-1\bin" /DLL /DEBUG /PDB:"Release/chaos.pdb" /SUBSYSTEM:WINDOWS /OPT:REF /OPT:ICF /MACHINE:IX86 /EXPORT:chaos_setup E:\pd\pd-0.35-1\bin\pd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib "\pd\pd-0.35-1\bin\pd.lib"
-"Release\chaos.obj"
-"Release\henon.obj"
-"Release\ikeda.obj"
-"Release\lorenz.obj"
-"Release\rossler.obj"
-]
-Creating command line "link.exe @"e:\pd\add_ons\-=[ Ben Bogart ]=-\Chaos Math Externals\chaos\Release\RSP000002.rsp""
-</pre></table><table width=100% bgcolor=#DFDFE5><tr><td><font face=arial size=+2>
-Output Window
-</font></table><table width=* cellspacing=0 cellpadding=0><tr><td width=0 bgcolor=#EDEDF5> </td><td width=0 bgcolor=#FFFFFF> </td><td width=*><pre>Compiling...
-rossler.c
-lorenz.c
-ikeda.c
-henon.c
-chaos.c
-Linking...
- Creating library Release/chaos.lib and object Release/chaos.exp
-</pre></table><table width=100% bgcolor=#DFDFE5><tr><td><font face=arial size=+2>
-Results
-</font></table><table width=* cellspacing=0 cellpadding=0><tr><td width=0 bgcolor=#EDEDF5> </td><td width=0 bgcolor=#FFFFFF> </td><td width=*><pre>
-Build log was saved at "file://e:\pd\add_ons\-=[ Ben Bogart ]=-\Chaos Math Externals\chaos\Release\BuildLog.htm"
-chaos - 0 error(s), 0 warning(s)</pre></table><table width=100% height=20 bgcolor=#CFCFE5><tr><td><font face=arial size=+2>
-</font></table></body></html>
\ No newline at end of file diff --git a/Release/chaos.dll b/Release/chaos.dll Binary files differdeleted file mode 100644 index a81122f..0000000 --- a/Release/chaos.dll +++ /dev/null diff --git a/Release/chaos.pd_darwin b/Release/chaos.pd_darwin Binary files differdeleted file mode 100644 index 2feec5f..0000000 --- a/Release/chaos.pd_darwin +++ /dev/null diff --git a/tools/attract1-help.pd b/attract1-help.pd index cb737b9..cb737b9 100644 --- a/tools/attract1-help.pd +++ b/attract1-help.pd @@ -24,7 +24,7 @@ #include <stdlib.h> #include <math.h> #include <time.h> -#include "lyapunov.h" +#include "chaos.h" #define M_a0_lo -3 #define M_a0_hi 3 diff --git a/tools/base-help.pd b/base-help.pd index bc0fd83..bc0fd83 100644 --- a/tools/base-help.pd +++ b/base-help.pd @@ -24,7 +24,7 @@ #include <stdlib.h> #include <math.h> #include <time.h> -#include "lyapunov.h" +#include "chaos.h" #define M_a_lo 0 #define M_a_hi 3 @@ -24,7 +24,7 @@ #include <stdlib.h> #include <math.h> #include <time.h> -#include "lyapunov.h" +#include "chaos.h" #define M_a_lo 0 #define M_a_hi 3 diff --git a/chaos-meta.pd b/chaos-meta.pd new file mode 100644 index 0000000..6704ede --- /dev/null +++ b/chaos-meta.pd @@ -0,0 +1,6 @@ +#N canvas 15 49 200 200 10; +#N canvas 25 49 420 300 META 1; +#X text 13 41 NAME chaos; +#X text 10 25 AUTHOR Ben Bogart <ben@ekran.org>, Michael McGonagle <mjmogo@comcast.net>; +#X text 10 10 VERSION 0.1; +#X restore 10 10 pd META; @@ -1,5 +1,5 @@ /* - a test file for lyapunov.h + a test file for chaos.h */ #ifndef PD_VERSION @@ -24,7 +24,7 @@ #include <stdlib.h> #include <math.h> #include <time.h> -#include "lyapunov.h" +#include "chaos.h" #define M_a_lo -1000 #define M_a_hi 1000 diff --git a/tools/fractal-tools.pd b/examples/fractal-tools.pd index 2170d6a..2170d6a 100644 --- a/tools/fractal-tools.pd +++ b/examples/fractal-tools.pd diff --git a/tools/loop.pd b/examples/loop.pd index 19896ab..19896ab 100644 --- a/tools/loop.pd +++ b/examples/loop.pd diff --git a/tools/martin-test-help.pd b/examples/martin-test-help.pd index b8f294a..b8f294a 100644 --- a/tools/martin-test-help.pd +++ b/examples/martin-test-help.pd diff --git a/tools/popcorn-test-help.pd b/examples/popcorn-test-help.pd index cbfdc4b..cbfdc4b 100644 --- a/tools/popcorn-test-help.pd +++ b/examples/popcorn-test-help.pd diff --git a/tools/quaruptwo-test-help.pd b/examples/quaruptwo-test-help.pd index 4fcc159..4fcc159 100644 --- a/tools/quaruptwo-test-help.pd +++ b/examples/quaruptwo-test-help.pd diff --git a/tools/readme-frac-format.pd b/examples/readme-frac-format.pd index 950f56c..950f56c 100644 --- a/tools/readme-frac-format.pd +++ b/examples/readme-frac-format.pd diff --git a/tools/readme-fractals.pd b/examples/readme-fractals.pd index 2281c6a..2281c6a 100644 --- a/tools/readme-fractals.pd +++ b/examples/readme-fractals.pd diff --git a/tools/readme-gen-fractal.pd b/examples/readme-gen-fractal.pd index 2af4657..2af4657 100644 --- a/tools/readme-gen-fractal.pd +++ b/examples/readme-gen-fractal.pd diff --git a/tools/readme-lyapunov.pd b/examples/readme-lyapunov.pd index 056e6bd..056e6bd 100644 --- a/tools/readme-lyapunov.pd +++ b/examples/readme-lyapunov.pd diff --git a/tools/readme-operation.pd b/examples/readme-operation.pd index be93969..be93969 100644 --- a/tools/readme-operation.pd +++ b/examples/readme-operation.pd diff --git a/tools/readme-parameter-ranges.pd b/examples/readme-parameter-ranges.pd index 27fe5f0..27fe5f0 100644 --- a/tools/readme-parameter-ranges.pd +++ b/examples/readme-parameter-ranges.pd diff --git a/tools/readme-searching.pd b/examples/readme-searching.pd index 0135779..0135779 100644 --- a/tools/readme-searching.pd +++ b/examples/readme-searching.pd diff --git a/tools/search-tools.pd b/examples/search-tools.pd index f00a011..f00a011 100644 --- a/tools/search-tools.pd +++ b/examples/search-tools.pd diff --git a/tools/gingerbreadman-help.pd b/gingerbreadman-help.pd index 701b33e..701b33e 100644 --- a/tools/gingerbreadman-help.pd +++ b/gingerbreadman-help.pd diff --git a/tools/henon-help.pd b/henon-help.pd index b8abd1d..b8abd1d 100644 --- a/tools/henon-help.pd +++ b/henon-help.pd @@ -24,7 +24,7 @@ #include <stdlib.h> #include <math.h> #include <time.h> -#include "lyapunov.h" +#include "chaos.h" #define M_a_lo -1 #define M_a_hi 2 diff --git a/tools/hopalong-help.pd b/hopalong-help.pd index 4b6433b..4b6433b 100644 --- a/tools/hopalong-help.pd +++ b/hopalong-help.pd @@ -24,7 +24,7 @@ #include <stdlib.h> #include <math.h> #include <time.h> -#include "lyapunov.h" +#include "chaos.h" #define M_a_lo -1000 #define M_a_hi 1000 diff --git a/tools/ikeda-help.pd b/ikeda-help.pd index ea7436b..ea7436b 100644 --- a/tools/ikeda-help.pd +++ b/ikeda-help.pd @@ -24,7 +24,7 @@ #include <stdlib.h> #include <math.h> #include <time.h> -#include "lyapunov.h" +#include "chaos.h" #define M_a_lo -350 #define M_a_hi 350 diff --git a/tools/latoocarfian-help.pd b/latoocarfian-help.pd index ee592be..ee592be 100644 --- a/tools/latoocarfian-help.pd +++ b/latoocarfian-help.pd diff --git a/latoocarfian.c b/latoocarfian.c index 098cbec..b70b22c 100644 --- a/latoocarfian.c +++ b/latoocarfian.c @@ -24,7 +24,7 @@ #include <stdlib.h> #include <math.h> #include <time.h> -#include "lyapunov.h" +#include "chaos.h" #define M_a_lo -3 #define M_a_hi 3 diff --git a/tools/latoomutalpha-help.pd b/latoomutalpha-help.pd index dda50f5..dda50f5 100644 --- a/tools/latoomutalpha-help.pd +++ b/latoomutalpha-help.pd diff --git a/latoomutalpha.c b/latoomutalpha.c index b3d4ac1..94a8082 100644 --- a/latoomutalpha.c +++ b/latoomutalpha.c @@ -24,7 +24,7 @@ #include <stdlib.h> #include <math.h> #include <time.h> -#include "lyapunov.h" +#include "chaos.h" #define M_a_lo -3 #define M_a_hi 3 diff --git a/tools/latoomutbeta-help.pd b/latoomutbeta-help.pd index 775b542..775b542 100644 --- a/tools/latoomutbeta-help.pd +++ b/latoomutbeta-help.pd diff --git a/latoomutbeta.c b/latoomutbeta.c index 3c2e77b..bace348 100644 --- a/latoomutbeta.c +++ b/latoomutbeta.c @@ -24,7 +24,7 @@ #include <stdlib.h> #include <math.h> #include <time.h> -#include "lyapunov.h" +#include "chaos.h" #define M_a_lo -3 #define M_a_hi 3 diff --git a/tools/latoomutgamma-help.pd b/latoomutgamma-help.pd index 256b795..256b795 100644 --- a/tools/latoomutgamma-help.pd +++ b/latoomutgamma-help.pd diff --git a/latoomutgamma.c b/latoomutgamma.c index dbe4064..6d5c07c 100644 --- a/latoomutgamma.c +++ b/latoomutgamma.c @@ -24,7 +24,7 @@ #include <stdlib.h> #include <math.h> #include <time.h> -#include "lyapunov.h" +#include "chaos.h" #define M_a_lo -3 #define M_a_hi 3 @@ -1,6 +1,6 @@ #include <stdio.h> #include <math.h> -#include "lyapunov.h" +#include "chaos.h" #define LY_ITERATIONS 50000 @@ -24,7 +24,7 @@ #include <stdlib.h> #include <math.h> #include <time.h> -#include "lyapunov.h" +#include "chaos.h" #define M_a_lo 0 #define M_a_hi 4 diff --git a/tools/lorenz-help.pd b/lorenz-help.pd index eefd792..eefd792 100644 --- a/tools/lorenz-help.pd +++ b/lorenz-help.pd @@ -24,7 +24,7 @@ #include <stdlib.h> #include <math.h> #include <time.h> -#include "lyapunov.h" +#include "chaos.h" #define M_h_lo -1000 #define M_h_hi 1000 diff --git a/lotka_volterra.c b/lotka_volterra.c index 15db274..aad45c4 100644 --- a/lotka_volterra.c +++ b/lotka_volterra.c @@ -24,7 +24,7 @@ #include <stdlib.h> #include <math.h> #include <time.h> -#include "lyapunov.h" +#include "chaos.h" #define M_a_lo -1000 #define M_a_hi 1000 diff --git a/tools/martin-help.pd b/martin-help.pd index ef12d0d..ef12d0d 100644 --- a/tools/martin-help.pd +++ b/martin-help.pd @@ -24,7 +24,7 @@ #include <stdlib.h> #include <math.h> #include <time.h> -#include "lyapunov.h" +#include "chaos.h" #define M_a_lo 0 #define M_a_hi 1000 diff --git a/mlogistic.c b/mlogistic.c index ad1ea30..cfed03d 100644 --- a/mlogistic.c +++ b/mlogistic.c @@ -24,7 +24,7 @@ #include <stdlib.h> #include <math.h> #include <time.h> -#include "lyapunov.h" +#include "chaos.h" #define M_c_lo 0 #define M_c_hi 4 @@ -24,7 +24,7 @@ #include <stdlib.h> #include <math.h> #include <time.h> -#include "lyapunov.h" +#include "chaos.h" #define M_a_lo -1000 #define M_a_hi 1000 diff --git a/tools/popcorn-help.pd b/popcorn-help.pd index 119edea..119edea 100644 --- a/tools/popcorn-help.pd +++ b/popcorn-help.pd @@ -24,7 +24,7 @@ #include <stdlib.h> #include <math.h> #include <time.h> -#include "lyapunov.h" +#include "chaos.h" #define M_h_lo -1000 #define M_h_hi 1000 diff --git a/quadruptwo.c b/quadruptwo.c index 89543eb..e074bcf 100644 --- a/quadruptwo.c +++ b/quadruptwo.c @@ -24,7 +24,7 @@ #include <stdlib.h> #include <math.h> #include <time.h> -#include "lyapunov.h" +#include "chaos.h" #define M_a_lo -1000 #define M_a_hi 1000 diff --git a/tools/quaruptwo-help.pd b/quaruptwo-help.pd index 292b46e..292b46e 100644 --- a/tools/quaruptwo-help.pd +++ b/quaruptwo-help.pd @@ -24,7 +24,7 @@ #include <stdlib.h> #include <math.h> #include <time.h> -#include "lyapunov.h" +#include "chaos.h" #define M_h_lo -1000 #define M_h_hi 1000 diff --git a/tools/standardmap-help.pd b/standardmap-help.pd index 02fb992..02fb992 100644 --- a/tools/standardmap-help.pd +++ b/standardmap-help.pd diff --git a/standardmap.c b/standardmap.c index c55823c..c062dee 100644 --- a/standardmap.c +++ b/standardmap.c @@ -24,7 +24,7 @@ #include <stdlib.h> #include <math.h> #include <time.h> -#include "lyapunov.h" +#include "chaos.h" #define M_k_lo -1000 #define M_k_hi 1000 @@ -24,7 +24,7 @@ #include <stdlib.h> #include <math.h> #include <time.h> -#include "lyapunov.h" +#include "chaos.h" #define M_a0_lo -2 #define M_a0_hi 2 @@ -24,7 +24,7 @@ #include <stdlib.h> #include <math.h> #include <time.h> -#include "lyapunov.h" +#include "chaos.h" #define M_r_lo -1000 #define M_r_hi 1000 @@ -24,7 +24,7 @@ #include <stdlib.h> #include <math.h> #include <time.h> -#include "lyapunov.h" +#include "chaos.h" #define M_a_lo -1000 #define M_a_hi 1000 @@ -24,7 +24,7 @@ #include <stdlib.h> #include <math.h> #include <time.h> -#include "lyapunov.h" +#include "chaos.h" #define M_a_lo -1000 #define M_a_hi 1000 diff --git a/tinkerbell.c b/tinkerbell.c index bd4b1bb..7ccdd47 100644 --- a/tinkerbell.c +++ b/tinkerbell.c @@ -24,7 +24,7 @@ #include <stdlib.h> #include <math.h> #include <time.h> -#include "lyapunov.h" +#include "chaos.h" #define M_a_lo -1000 #define M_a_hi 1000 |