From fdce2724d4d9d973e143c4c9b9c381612cfc0994 Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Tue, 12 Jun 2018 19:32:38 -0400 Subject: [PATCH] Add pffft and fftpack to Rack --- Makefile | 1 + dep.mk | 2 +- dep/Makefile | 8 +++++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 253f8cae..d258fe08 100644 --- a/Makefile +++ b/Makefile @@ -13,6 +13,7 @@ STRIP ?= strip SOURCES += dep/nanovg/src/nanovg.c SOURCES += dep/osdialog/osdialog.c +SOURCES += $(wildcard dep/jpommier-pffft-*/pffft.c) $(wildcard dep/jpommier-pffft-*/fftpack.c) SOURCES += $(wildcard src/*.cpp src/*/*.cpp) ifdef ARCH_MAC diff --git a/dep.mk b/dep.mk index 48b3c290..6ad37f06 100644 --- a/dep.mk +++ b/dep.mk @@ -15,7 +15,7 @@ DEP_CXXFLAGS += $(DEP_FLAGS) # Commands WGET := wget -c UNTAR := tar xf -UNZIP := unzip +UNZIP := unzip -o CONFIGURE := ./configure --prefix="$(realpath $(DEP_LOCAL))" ifeq ($(ARCH), win) CMAKE := cmake -G 'MSYS Makefiles' -DCMAKE_INSTALL_PREFIX="$(realpath $(DEP_LOCAL))" diff --git a/dep/Makefile b/dep/Makefile index ae9a4305..5a9f16c4 100755 --- a/dep/Makefile +++ b/dep/Makefile @@ -49,8 +49,9 @@ nanovg = include/nanovg.h nanosvg = include/nanosvg.h oui-blendish = include/blendish.h osdialog = include/osdialog.h +pffft = include/pffft.h -DEPS += $(glew) $(glfw) $(jansson) $(libspeexdsp) $(libcurl) $(libzip) $(rtmidi) $(rtaudio) $(nanovg) $(nanosvg) $(oui-blendish) $(osdialog) +DEPS += $(glew) $(glfw) $(jansson) $(libspeexdsp) $(libcurl) $(libzip) $(rtmidi) $(rtaudio) $(nanovg) $(nanosvg) $(oui-blendish) $(osdialog) $(pffft) include $(RACK_DIR)/dep.mk @@ -158,6 +159,11 @@ $(oui-blendish): $(wildcard oui-blendish/*.h) $(osdialog): $(wildcard osdialog/*.h) cp $^ include/ +$(pffft): + $(WGET) "https://bitbucket.org/jpommier/pffft/get/29e4f76ac53b.zip" + $(UNZIP) 29e4f76ac53b.zip + cp jpommier-pffft-29e4f76ac53b/*.h include/ + clean: git clean -fdx git submodule foreach git clean -fdx