aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/Makefile51
-rw-r--r--packages/Makefile.buildlayout30
-rw-r--r--packages/TODO2
-rw-r--r--packages/darwin_app/Makefile13
-rw-r--r--packages/darwin_app/TODO6
-rw-r--r--packages/patches/build_vars_4_makefile.in.patch36
-rw-r--r--packages/patches/darwin/darwin_jack_weak_linking.patch6
-rw-r--r--packages/patches/fftw_support-0.39-1.patch298
-rw-r--r--packages/win32_inno/TODO16
9 files changed, 394 insertions, 64 deletions
diff --git a/packages/Makefile b/packages/Makefile
index 0bad98cc..fc2034ad 100644
--- a/packages/Makefile
+++ b/packages/Makefile
@@ -92,6 +92,7 @@ DEST_PATHS = BUILDLAYOUT_DIR=$(BUILDLAYOUT_DIR) \
cvs_root_dir=$(cvs_root_dir) \
DESTDIR=$(DESTDIR) \
prefix=$(prefix) \
+ libpddir=$(libpddir) \
UNAME=$(UNAME)
@@ -136,10 +137,13 @@ gem:
#------------------------------------------------------------------------------
# pd
-# pd's makefile has some of its own variables that need to be remapped,
-# this relies on patches/build_vars_4_makefile.in.patch.
-PD_CONFIGURE_FLAGS =
+ifeq ($(OS_NAME),win)
+ PD_CONFIGURE_FLAGS =
+else
+ PD_CONFIGURE_FLAGS = --enable-jack
+endif
+
PD_BUILD_FLAGS =
# Pd sometimes needs a specific autoconf, which is labeled differently on different
@@ -148,16 +152,6 @@ PD_BUILD_FLAGS =
PD_AUTOCONF = autoconf
pd:
- @echo "OS_NAME $(OS_NAME)"
- @echo "==================================================================="
- @echo "DESTDIR $(DESTDIR) libpdbindir $(libpdbindir)"
- @echo "==================================================================="
- @echo "DEST_PATHS $(DEST_PATHS)"
- @echo "==================================================================="
- @echo "DEST_PATHS $(DEST_PATHS)"
- @echo "==================================================================="
- @echo "PD_BUILD_FLAGS $(PD_BUILD_FLAGS)"
- @echo "==================================================================="
-cd $(pd_src)/src/ && $(PD_AUTOCONF)
-cd $(pd_src)/src && ./configure $(PD_CONFIGURE_FLAGS) && \
make $(DEST_PATHS) $(PD_BUILD_FLAGS)
@@ -532,10 +526,6 @@ devsymlinks:
patch_pd:
@echo pd_src $(pd_src)
-# change Pd's version number to reflect the extended build
- cd $(pd_src)/src/ && \
- sed 's/\(pd_version\[\] = "Pd version \)[0-9extndRC.-]*/\1$(PD_VERSION)-$(PACKAGE_VERSION)/' s_main.c > s_main.c.tmp && \
- mv s_main.c.tmp s_main.c
# apply all platform-neutral patches
for patch in $(wildcard $(CWD)/patches/*.patch); do \
echo "Applying $$patch"; \
@@ -547,23 +537,35 @@ patch_pd:
cd $(pd_src)/src/ && patch -p0 < $$patch; \
done
-rm -f -- $(pd_src)/src/configure $(pd_src)/src/makefile
+# change Pd's version number to reflect the extended build
+ cd $(pd_src)/src/ && \
+ sed 's/\(pd_version\[\] = "Pd version \)[0-9extndRC.-]*/\1$(PD_VERSION)-$(PACKAGE_VERSION)/' s_main.c > s_main.c.tmp && \
+ mv s_main.c.tmp s_main.c
+ for file in $(wildcard *.[ch]); do \
+ sed 's/MACOSX/__APPLE__/g' $${file} > $${file}.tmp && \
+ mv -f $${file}.tmp $$file;\
+ done
@echo " "
@echo "patching succeeded!"
unpatch_pd:
+ for file in $(wildcard *.[ch]); do \
+ sed 's/__APPLE__/MACOSX/g' $${file} > $${file}.tmp && \
+ mv -f $${file}.tmp $$file;\
+ done
# this sed pattern won't work with TEST versions
cd $(pd_src)/src && \
sed 's/\(pd_version\[\] = "Pd version [0-9]\.[0-9]*[.-][0-9]*\)[0-9extndRC.-]*/\1/' \
s_main.c > s_main.c.tmp && \
mv s_main.c.tmp s_main.c
-# apply all platform-neutral patches
- for patch in $(wildcard $(CWD)/patches/*.patch); do \
+# apply all platform-specific patches
+ for patch in $(wildcard $(CWD)/patches/$(OS_NAME)/*.patch); do \
echo "Applying $$patch"; \
cd $(pd_src)/src/ && patch -p0 -R < $$patch; \
done
-# apply all platform-specific patches
- for patch in $(wildcard $(CWD)/patches/$(OS_NAME)/*.patch); do \
+# apply all platform-neutral patches
+ for patch in $(wildcard $(CWD)/patches/*.patch); do \
echo "Applying $$patch"; \
cd $(pd_src)/src/ && patch -p0 -R < $$patch; \
done
@@ -605,6 +607,11 @@ clean: gem_clean pd_clean
distclean: clean cruft_clean
+ cd $(abstractions_src) && make distclean
+ cd $(doc_src) && make distclean
+ cd $(extensions_src) && make distclean
+ cd $(externals_src) && make distclean
+ cd $(pd_src) && make distclean
test:
@echo "PD_VERSION: $(PD_VERSION)"
@@ -616,6 +623,8 @@ test:
@echo "LIBDIR $(libdir)"
@echo "OBJECTSDIR $(objectsdir)"
@echo "PDDOCDIR $(pddocdir)"
+ @echo "LIBPDDIR $(libpddir)"
+ @echo "LIBPDBINDIR $(libpdbindir)"
@echo "HELPDIR $(helpdir)"
@echo "MANUALSDIR $(manualsdir)"
@echo "EXAMPLESDIR $(examplesdir)"
diff --git a/packages/Makefile.buildlayout b/packages/Makefile.buildlayout
index 6a2dab6d..d485cfec 100644
--- a/packages/Makefile.buildlayout
+++ b/packages/Makefile.buildlayout
@@ -81,18 +81,20 @@ libdir = $(DESTDIR)$(prefix)/lib
mandir = $(DESTDIR)$(prefix)/man
ifeq ($(OS_NAME),darwin)
- objectsdir = $(DESTDIR)$(prefix)/extra
- pddocdir = $(DESTDIR)$(prefix)/doc
+ libpddir = $(DESTDIR)$(prefix)
+ libpdbindir = $(bindir)
else
ifeq ($(OS_NAME),win)
- objectsdir = $(DESTDIR)$(prefix)/extra
- pddocdir = $(DESTDIR)$(prefix)/doc
+ libpddir = $(DESTDIR)$(prefix)
+ libpdbindir = $(bindir)
else
- objectsdir = $(libdir)/pd/extra
- pddocdir = $(libdir)/pd/doc
+ libpddir = $(libdir)/pd
+ libpdbindir = $(libpdbindir)/bin
endif
endif
+objectsdir = $(libpddir)/extra
+pddocdir = $(libpddir)/doc
examplesdir = $(pddocdir)/examples
helpdir = $(pddocdir)/5.reference
manualsdir = $(pddocdir)/manuals
@@ -218,11 +220,17 @@ cruft_clean:
-rm -f -- *.*~
-rm -f -- Makefile~ Makefile.buildlayout~
# sed replace litter
- -rm -f -- */*/*/*/*.*.bak
- -rm -f -- */*/*/*.*.bak
- -rm -f -- */*/*.*.bak
- -rm -f -- */*.*.bak
- -rm -f -- *.*.bak
+ -rm -f -- */*/*/*/*.bak
+ -rm -f -- */*/*/*.bak
+ -rm -f -- */*/*.bak
+ -rm -f -- */*.bak
+ -rm -f -- *.bak
+# patching replace litter
+ -rm -f -- */*/*/*/*.rej
+ -rm -f -- */*/*/*.rej
+ -rm -f -- */*/*.rej
+ -rm -f -- */*.rej
+ -rm -f -- *.rej
# autoconf cache
-rm -rf -- */*/*/*/autom4te.cache
-rm -rf -- */*/*/autom4te.cache
diff --git a/packages/TODO b/packages/TODO
index 7c454300..78cddcbf 100644
--- a/packages/TODO
+++ b/packages/TODO
@@ -1,4 +1,6 @@
+- try out FFTW patch from patch tracker
+
- document generate-libdir-metafile.sh
- move darwin_app_perms to here and make generic prerelease_clean target which
diff --git a/packages/darwin_app/Makefile b/packages/darwin_app/Makefile
index 4f6cb658..53ae96ca 100644
--- a/packages/darwin_app/Makefile
+++ b/packages/darwin_app/Makefile
@@ -89,6 +89,7 @@ rez_install:
#------------------------------------------------------------------------------#
darwin_app_core: darwin_app_wrapper
+ export MACOSX_DEPLOYMENT_TARGET=10.3
cd $(packages_src) && \
make $(DEST_PATHS) PD_CONFIGURE_FLAGS=--enable-jack pd_install
cd "$(PD_APP_CONTENTS)/Resources/Scripts" && \
@@ -160,15 +161,17 @@ clean: darwin_app_clean darwin_app_externals_flext_clean \
darwin_app_clean:
- -sudo rm -Rf -- $(BUILD_BASE) "$(DMG_NAME)"
+ -sudo rm -Rf -- $(PD_APP_CONTENTS)/Frameworks
+ -rm -f -- $(PD_APP_CONTENTS)/Plugins $(PD_APP_CONTENTS)/Info.plist
+ -rm -f -- $(PD_APP_CONTENTS)/MacOS/Pd
+ -rmdir $(PD_APP_CONTENTS)/MacOS
+ -rm -f -- $(PD_APP_CONTENTS)/Resources/Scripts/AppMain.tcl
+ -rmdir $(PD_APP_CONTENTS)/Resources/Scripts
+ -rm -f -- $(DESTDIR)
-rm -f -- *~ 1 $(README_FILE) $(WELCOME_FILE) $(LICENSE_FILE) \
$(UNIX_PACKAGE_NAME).pkg "$(DMG_NAME).dmg"
-
-
- cd $(gem_src)/Gem && xcodebuild clean
-
darwin_app_externals_flext_clean:
cd $(externals_src)/footils/syncgrain && make -f makefile.pd-darwin clean
-cd $(externals_src)/grill && \
diff --git a/packages/darwin_app/TODO b/packages/darwin_app/TODO
index 38bc6a39..e8e9d0ee 100644
--- a/packages/darwin_app/TODO
+++ b/packages/darwin_app/TODO
@@ -16,6 +16,12 @@
guidelines:
http://developer.apple.com/documentation/MacOSX/Conceptual/BPFileSystem/Articles/WhereToPutFiles.html
+- Pd should then test to see if Jack is available before switching to it,
+ otherwise it'll just crash. Here's apple's method of testing:
+
+ http://developer.apple.com/documentation/mac/runtimehtml/RTArch-43.html
+
+
- help menu
- check up on this bug: Opening Help patches from "Pure Documentation"
diff --git a/packages/patches/build_vars_4_makefile.in.patch b/packages/patches/build_vars_4_makefile.in.patch
index a6903173..eaa43080 100644
--- a/packages/patches/build_vars_4_makefile.in.patch
+++ b/packages/patches/build_vars_4_makefile.in.patch
@@ -4,7 +4,7 @@ RCS file: /cvsroot/pure-data/pd/src/makefile.in,v
retrieving revision 1.5
diff -u -w -r1.5 makefile.in
--- makefile.in 6 Nov 2004 16:07:33 -0000 1.5
-+++ makefile.in 28 Nov 2005 06:37:05 -0000
++++ makefile.in 2 Dec 2005 15:46:04 -0000
@@ -5,10 +5,20 @@
EXT= @EXT@
GUINAME= @GUINAME@
@@ -58,26 +58,26 @@ diff -u -w -r1.5 makefile.in
- chmod 644 $(MANINSTDIR)/man1/pdsend.1.gz
- gzip < ../man/pdreceive.1 > $(MANINSTDIR)/man1/pdreceive.1.gz
- chmod 644 $(MANINSTDIR)/man1/pdreceive.1.gz
-+ install -d $(DESTDIR)$(libpdbindir)
-+ install $(BIN_DIR)/$(GUINAME) $(DESTDIR)$(libpdbindir)/$(GUINAME)
-+ install $(BIN_DIR)/pd-watchdog $(DESTDIR)$(libpdbindir)/pd-watchdog
-+ install -m644 $(BIN_DIR)/pd.tk $(DESTDIR)$(libpdbindir)/pd.tk
++ install -d $(libpdbindir)
++ install $(BIN_DIR)/$(GUINAME) $(libpdbindir)/$(GUINAME)
++ install $(BIN_DIR)/pd-watchdog $(libpdbindir)/pd-watchdog
++ install -m644 $(BIN_DIR)/pd.tk $(libpdbindir)/pd.tk
+ install -d $(DESTDIR)$(bindir)
+ install $(BINARYMODE) $(PDEXEC) $(DESTDIR)$(bindir)/pd
+ install -m755 $(BIN_DIR)/pdsend $(DESTDIR)$(bindir)/pdsend
+ install -m755 $(BIN_DIR)/pdreceive $(DESTDIR)$(bindir)/pdreceive
+ for dir in $(shell ls -1 ../doc | grep -v CVS); do \
+ echo "installing $$dir"; \
-+ install -d $(DESTDIR)$(pddocdir)/$$dir ; \
-+ install -p ../doc/$$dir/*.* $(DESTDIR)$(pddocdir)/$$dir ; \
++ install -d $(pddocdir)/$$dir ; \
++ install -p ../doc/$$dir/*.* $(pddocdir)/$$dir ; \
+ done
+ for dir in $(shell ls -1 ../doc/7.stuff | grep -v CVS); do \
+ echo "installing 7.stuff/$$dir"; \
-+ install -d $(DESTDIR)$(pddocdir)/7.stuff/$$dir ; \
-+ install -p ../doc/7.stuff/$$dir/*.* $(DESTDIR)$(pddocdir)/7.stuff/$$dir ; \
++ install -d $(pddocdir)/7.stuff/$$dir ; \
++ install -p ../doc/7.stuff/$$dir/*.* $(pddocdir)/7.stuff/$$dir ; \
+ done
-+ cp -pr ../extra $(DESTDIR)$(libpddir)/
-+ rm -f $(DESTDIR)$(libpddir)/extra/*/*.o
++ cp -pr ../extra $(libpddir)/
++ rm -f $(libpddir)/extra/*/*.o
+ install -d $(DESTDIR)$(includedir)
+ install -m644 m_pd.h $(DESTDIR)$(includedir)/m_pd.h
+ install -d $(DESTDIR)$(mandir)/man1
@@ -104,13 +104,13 @@ diff -u -w -r1.5 makefile.in
- rm -f $(MANINSTDIR)/man1/pdsend.1.gz
- rm -f $(MANINSTDIR)/man1/pdreceive.1.gz
+ rm -f -r $(libpddir)
-+ rm -f $(bindir)/pd
-+ rm -f $(bindir)/pdsend
-+ rm -f $(bindir)/pdreceive
-+ rm -f $(includedir)/m_pd.h
-+ rm -f $(mandir)/man1/pd.1.gz
-+ rm -f $(mandir)/man1/pdsend.1.gz
-+ rm -f $(mandir)/man1/pdreceive.1.gz
++ rm -f $(DESTDIR)$(bindir)/pd
++ rm -f $(DESTDIR)$(bindir)/pdsend
++ rm -f $(DESTDIR)$(bindir)/pdreceive
++ rm -f $(DESTDIR)$(includedir)/m_pd.h
++ rm -f $(DESTDIR)$(mandir)/man1/pd.1.gz
++ rm -f $(DESTDIR)$(mandir)/man1/pdsend.1.gz
++ rm -f $(DESTDIR)$(mandir)/man1/pdreceive.1.gz
include makefile.dependencies
diff --git a/packages/patches/darwin/darwin_jack_weak_linking.patch b/packages/patches/darwin/darwin_jack_weak_linking.patch
index fa0f6601..2cdbc13f 100644
--- a/packages/patches/darwin/darwin_jack_weak_linking.patch
+++ b/packages/patches/darwin/darwin_jack_weak_linking.patch
@@ -9,13 +9,13 @@ diff -u -w -r1.8 makefile.in
$(BIN_DIR)/pdreceive: u_pdreceive.c
$(CC) $(CFLAGS) $(STRIPFLAG) -o $(BIN_DIR)/pdreceive u_pdreceive.c
-+# MACOSX_DEPLOYMENT_TARGET=10.2 is necessary on Mac OS X to support weak
++# MACOSX_DEPLOYMENT_TARGET=10.3 is necessary on Mac OS X to support weak
+# linking of frameworks. Since its just a environment variable, it should be
-+# safely ignored on other platforms. <hans@eds.org>
++# safely ignored on other platforms. <hans@at.or.at>
$(PDEXEC): $(OBJ)
- cd ../obj; $(CC) $(LDFLAGS) $(DBG_CFLAGS) -o $(PDEXEC) $(OBJ) \
- $(LIB)
-+ cd ../obj; MACOSX_DEPLOYMENT_TARGET=10.2 $(CC) $(LDFLAGS) $(DBG_CFLAGS) \
++ cd ../obj; MACOSX_DEPLOYMENT_TARGET=10.3 $(CC) $(LDFLAGS) $(DBG_CFLAGS) \
+ -o $(PDEXEC) $(OBJ) $(LIB)
$(BIN_DIR)/pd-gui: $(GOBJ) $(GSRC)
diff --git a/packages/patches/fftw_support-0.39-1.patch b/packages/patches/fftw_support-0.39-1.patch
new file mode 100644
index 00000000..fb787d9a
--- /dev/null
+++ b/packages/patches/fftw_support-0.39-1.patch
@@ -0,0 +1,298 @@
+Index: d_fft.c
+===================================================================
+RCS file: /cvsroot/pure-data/pd/src/d_fft.c,v
+retrieving revision 1.2
+diff -u -w -r1.2 d_fft.c
+--- d_fft.c 6 Sep 2004 20:20:33 -0000 1.2
++++ d_fft.c 2 Dec 2005 05:37:43 -0000
+@@ -4,6 +4,12 @@
+
+ #include "m_pd.h"
+
++#ifdef HAVE_LIBFFTW3F
++#include "fftw3.h"
++#include <string.h>
++#endif
++
++#ifndef HAVE_LIBFFTW3F
+ /* ------------------------ fft~ and ifft~ -------------------------------- */
+ static t_class *sigfft_class, *sigifft_class;
+
+@@ -244,6 +250,259 @@
+ class_sethelpsymbol(sigrifft_class, gensym("fft~"));
+ }
+
++#else
++
++/* Support for fftw3 by Tim Blechmann */
++
++/* ------------------------ fft~ and ifft~ -------------------------------- */
++
++static t_class *sigfftw_class, *sigifftw_class;
++
++typedef struct fftw
++{
++ t_object x_obj;
++ float x_f;
++
++ fftwf_plan plan;
++ fftwf_iodim dim;
++} t_sigfftw;
++
++static void *sigfftw_new(void)
++{
++ t_sigfftw *x = (t_sigfftw *)pd_new(sigfftw_class);
++ outlet_new(&x->x_obj, gensym("signal"));
++ outlet_new(&x->x_obj, gensym("signal"));
++ inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_signal, &s_signal);
++ x->x_f = 0;
++ return (x);
++}
++
++static void sigfftw_free(t_sigfftw * x)
++{
++ fftwf_destroy_plan(x->plan);
++}
++
++static t_int *sigfftw_perform(t_int *w)
++{
++ fftwf_execute(*(fftwf_plan *)w[1]);
++
++ return (w+2);
++}
++
++static void sigfftw_dsp(t_sigfftw *x, t_signal **sp)
++{
++ int n = sp[0]->s_n;
++ float *in1 = sp[0]->s_vec;
++ float *in2 = sp[1]->s_vec;
++ float *out1 = sp[2]->s_vec;
++ float *out2 = sp[3]->s_vec;
++
++ x->dim.n=n;
++ x->dim.is=1;
++ x->dim.os=1;
++ x->plan = fftwf_plan_guru_split_dft(1, &(x->dim), 0, NULL, in1,
++ in2, out1, out2, FFTW_MEASURE);
++ dsp_add(sigfftw_perform, 1, &x->plan);
++}
++
++static void sigifftw_dsp(t_sigfftw *x, t_signal **sp)
++{
++ int n = sp[0]->s_n;
++ float *in1 = sp[0]->s_vec;
++ float *in2 = sp[1]->s_vec;
++ float *out1 = sp[2]->s_vec;
++ float *out2 = sp[3]->s_vec;
++
++ x->dim.n=n;
++ x->dim.is=1;
++ x->dim.os=1;
++ x->plan = fftwf_plan_guru_split_dft(1, &(x->dim), 0, NULL, in2,
++ in1, out2, out1, FFTW_MEASURE);
++ dsp_add(sigfftw_perform, 1, &x->plan);
++}
++
++static void sigfftw_setup(void)
++{
++ sigfftw_class = class_new(gensym("fft~"), sigfftw_new,
++ (t_method) sigfftw_free,
++ sizeof(t_sigfftw), 0, 0);
++ CLASS_MAINSIGNALIN(sigfftw_class, t_sigfftw, x_f);
++ class_addmethod(sigfftw_class, (t_method)sigfftw_dsp,
++ gensym("dsp"), 0);
++
++ sigifftw_class = class_new(gensym("ifft~"), sigfftw_new,
++ (t_method) sigfftw_free,
++ sizeof(t_sigfftw), 0, 0);
++ CLASS_MAINSIGNALIN(sigifftw_class, t_sigfftw, x_f);
++ class_addmethod(sigifftw_class, (t_method)sigifftw_dsp,
++ gensym("dsp"), 0);
++ class_sethelpsymbol(sigifftw_class, gensym("fft~"));
++
++}
++
++
++/* ----------------------- rfft~ --------------------------------- */
++
++static t_class *sigrfftw_class;
++
++typedef struct rfftw
++{
++ t_object x_obj;
++ float x_f;
++
++ fftwf_plan plan;
++ fftwf_iodim dim;
++} t_sigrfftw;
++
++static void *sigrfftw_new(void)
++{
++ t_sigrfftw *x = (t_sigrfftw *)pd_new(sigrfftw_class);
++ outlet_new(&x->x_obj, gensym("signal"));
++ outlet_new(&x->x_obj, gensym("signal"));
++ x->x_f = 0;
++ return (x);
++}
++
++static void sigrfftw_free(t_sigrfftw *x)
++{
++ fftwf_destroy_plan(x->plan);
++}
++
++/*
++ * for compatibility reasons with the mayer fft, we'll have to invert
++ * some samples ... this is ugly, but someone might rely on that ...
++ */
++static void sigrfftw_invert(t_sample * s, t_int n)
++{
++ while (n!=0)
++ {
++ --n;
++ s[n]=-s[n];
++ }
++}
++
++static t_int *sigrfftw_perform(t_int *w)
++{
++ fftwf_execute(*(fftwf_plan*)w[1]);
++ sigrfftw_invert((t_sample*)w[2],(t_int)w[3]);
++
++ return (w+4);
++}
++
++static void sigrfftw_dsp(t_sigrfftw *x, t_signal **sp)
++{
++ int n = sp[0]->s_n, n2 = (n>>1);
++ float *in = sp[0]->s_vec;
++ float *out1 = sp[1]->s_vec;
++ float *out2 = sp[2]->s_vec;
++
++ if (n < 4)
++ {
++ error("fft: minimum 4 points");
++ return;
++ }
++ else
++ {
++ x->dim.n=n;
++ x->dim.is=1;
++ x->dim.os=1;
++ x->plan = fftwf_plan_guru_split_dft_r2c(1, &(x->dim), 0, NULL,
++ in, out1, out2,
++ FFTW_MEASURE);
++ dsp_add(sigrfftw_perform,3,&x->plan,out2+1,n2-1);
++ }
++
++ dsp_add_zero(out1 + n2, n2);
++ dsp_add_zero(out2 + n2, n2);
++}
++
++static void sigrfftw_setup(void)
++{
++ sigrfftw_class = class_new(gensym("rfft~"), sigrfftw_new,
++ (t_method)sigrfftw_free,
++ sizeof(t_sigrfftw), 0, 0);
++ CLASS_MAINSIGNALIN(sigrfftw_class, t_sigrfftw, x_f);
++ class_addmethod(sigrfftw_class, (t_method)sigrfftw_dsp,
++ gensym("dsp"), 0);
++ class_sethelpsymbol(sigrfftw_class, gensym("fft~"));
++}
++
++
++/* ----------------------- rifft~ -------------------------------- */
++
++static t_class *sigrifftw_class;
++
++typedef struct rifftw
++{
++ t_object x_obj;
++ float x_f;
++
++ fftwf_plan plan;
++ fftwf_iodim dim;
++} t_sigrifftw;
++
++static void *sigrifftw_new(void)
++{
++ t_sigrifftw *x = (t_sigrifftw *)pd_new(sigrifftw_class);
++ inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_signal, &s_signal);
++ outlet_new(&x->x_obj, gensym("signal"));
++ x->x_f = 0;
++ return (x);
++}
++
++static void sigrifftw_free(t_sigrifftw *x)
++{
++ fftwf_destroy_plan(x->plan);
++}
++
++static t_int *sigrifftw_perform(t_int *w)
++{
++ sigrfftw_invert((t_sample *)w[2],w[3]);
++ fftwf_execute(*(fftwf_plan*)w[1]);
++
++ return (w+4);
++}
++
++static void sigrifftw_dsp(t_sigrifftw *x, t_signal **sp)
++{
++ int n = sp[0]->s_n, n2 = (n>>1);
++ float *in1 = sp[0]->s_vec;
++ float *in2 = sp[1]->s_vec;
++ float *out = sp[2]->s_vec;
++
++ if (n < 4)
++ {
++ error("fft: minimum 4 points");
++ return;
++ }
++
++ else
++ {
++ x->dim.n=n;
++ x->dim.is=1;
++ x->dim.os=1;
++ x->plan = fftwf_plan_guru_split_dft_c2r(1, &(x->dim), 0, NULL,
++ in1, in2, out,
++ FFTW_MEASURE);
++ dsp_add(sigrifftw_perform,3,&x->plan,in2,n2);
++ }
++}
++
++static void sigrifftw_setup(void)
++{
++ sigrifftw_class = class_new(gensym("rifft~"), sigrifftw_new,
++ (t_method)sigrifftw_free,
++ sizeof(t_sigrifftw), 0, 0);
++ CLASS_MAINSIGNALIN(sigrifftw_class, t_sigrifftw, x_f);
++ class_addmethod(sigrifftw_class, (t_method)sigrifftw_dsp,
++ gensym("dsp"), 0);
++ class_sethelpsymbol(sigrifftw_class, gensym("fft~"));
++}
++
++#endif /* HAVE_LIBFFTW3F */
++/* end of FFTW support */
++
++
+ /* ----------------------- framp~ -------------------------------- */
+
+ static t_class *sigframp_class;
+@@ -335,8 +594,16 @@
+
+ void d_fft_setup(void)
+ {
++ sigframp_setup();
++
++#ifndef HAVE_LIBFFTW3F
+ sigfft_setup();
+ sigrfft_setup();
+ sigrifft_setup();
+- sigframp_setup();
++#else
++ sigfftw_setup(); /* added by Tim Blechmann to support fftw */
++ sigrifftw_setup();
++ sigrfftw_setup();
++#endif /* HAVE_LIBFFTW3F */
++
+ }
diff --git a/packages/win32_inno/TODO b/packages/win32_inno/TODO
index 3a82f593..3d778f03 100644
--- a/packages/win32_inno/TODO
+++ b/packages/win32_inno/TODO
@@ -1,7 +1,15 @@
-- Another detail is that the menu item "help/1 manual" results in no action - possibly some link pointing to the wrong place?
+- check out using env vars in Path settings in registry, or make relative paths
+
+- move gripd files to pd\gripd
+
+- Another detail is that the menu item "help/1 manual" results in no action -
+ possibly some link pointing to the wrong place? It turns out that the
+ rundll "open" thingy isn't working...
+ - make Pd.exe using MinGW's "start.exe" like MacOSX's "open"
+ - menu_openhtml on Win32 with rundll should be able to open other
+ filetypes like open on MACOSX.
-- add SMlib from email from Anders
- get Pd compiling on MinGW:. From Carmen:
@@ -11,8 +19,4 @@
if you dont feel like doing that.."
-- make Pd.exe using MinGW's "start.exe" like MacOSX's "open"
-
-- menu_openhtml on Win32 with rundll should be able to open other filetypes like open on MACOSX.
-
- get Windows Makefiles for Gem