From 416c6486ac179b79b4af169c2e20e21115a276c3 Mon Sep 17 00:00:00 2001
From: Sojourner Truth <jon.w.wilkes@gmail.com>
Date: Sat, 6 Aug 2016 23:12:04 -0400
Subject: [PATCH] begin porting the disis_* dirs to a single library in
externals/, starting with disis_phasor~.c. We're just using the most recent
version of pdlibbuilder to do the heavy lifting.
---
externals/Makefile | 14 +++++++++++++-
.../disis}/disis_phasor~-help.pd | 0
.../disis}/disis_phasor~.c | 0
.../disis_phasor => externals/disis}/makefile | 0
l2ork_addons/tar_em_up.sh | 6 ------
5 files changed, 13 insertions(+), 7 deletions(-)
rename {l2ork_addons/disis_phasor => externals/disis}/disis_phasor~-help.pd (100%)
rename {l2ork_addons/disis_phasor => externals/disis}/disis_phasor~.c (100%)
rename {l2ork_addons/disis_phasor => externals/disis}/makefile (100%)
diff --git a/externals/Makefile b/externals/Makefile
index f4ef3dbab..93922a2fc 100644
--- a/externals/Makefile
+++ b/externals/Makefile
@@ -128,7 +128,7 @@ CXXFLAGS = $(CFLAGS)
#
# WARNING! this MUST be all on one line because the automatic package
# building scripts rely on it being that way.
-LIB_TARGETS = adaptive arraysize autotune bassemu boids bsaylor comport creb cxc cyclone earplug ekext ext13 fftease freeverb ggee hcs iem_ambi iem_bin_ambi iemlib iemgui iemguts iem_adaptfilt iemmatrix iemxmlrpc iem_delay iem_roomsim iem_spec2 iem_tab jasch_lib loaders-hexloader loaders-libdir lyonpotpourri mapping markex maxlib mjlib moocow moonlib motex mrpeach oscx pan pdcontainer pddp pdogg plugin pmpd rtcmix sigpack smlib tof unauthorized vbap windowing zexy flext
+LIB_TARGETS = adaptive arraysize autotune bassemu boids bsaylor comport creb cxc cyclone disis earplug ekext ext13 fftease freeverb ggee hcs iem_ambi iem_bin_ambi iemlib iemgui iemguts iem_adaptfilt iemmatrix iemxmlrpc iem_delay iem_roomsim iem_spec2 iem_tab jasch_lib loaders-hexloader loaders-libdir lyonpotpourri mapping markex maxlib mjlib moocow moonlib motex mrpeach oscx pan pdcontainer pddp pdogg plugin pmpd rtcmix sigpack smlib tof unauthorized vbap windowing zexy flext
# DISABLED: flatgui
@@ -445,6 +445,18 @@ cyclone_clean:
make -C $(externals_src)/miXed/cyclone -f Makefile.libdir \
clean
+#------------------------------------------------------------------------------#
+# DISIS
+disis:
+ make -C $(externals_src)/disis PD_PATH=$(pd_src)
+
+disis_install:
+ make -C $(externals_src)/disis \
+ DESTDIR="$(DESTDIR)" objectsdir="$(objectsdir)" \
+ install
+
+disis_clean:
+ make -C $(externals_src)/disis clean
#------------------------------------------------------------------------------#
# EKEXT
diff --git a/l2ork_addons/disis_phasor/disis_phasor~-help.pd b/externals/disis/disis_phasor~-help.pd
similarity index 100%
rename from l2ork_addons/disis_phasor/disis_phasor~-help.pd
rename to externals/disis/disis_phasor~-help.pd
diff --git a/l2ork_addons/disis_phasor/disis_phasor~.c b/externals/disis/disis_phasor~.c
similarity index 100%
rename from l2ork_addons/disis_phasor/disis_phasor~.c
rename to externals/disis/disis_phasor~.c
diff --git a/l2ork_addons/disis_phasor/makefile b/externals/disis/makefile
similarity index 100%
rename from l2ork_addons/disis_phasor/makefile
rename to externals/disis/makefile
diff --git a/l2ork_addons/tar_em_up.sh b/l2ork_addons/tar_em_up.sh
index 77b5b59cd..76cfafdcc 100755
--- a/l2ork_addons/tar_em_up.sh
+++ b/l2ork_addons/tar_em_up.sh
@@ -320,12 +320,6 @@ then
make
cp -f disis_netreceive.pd_linux ../../packages/linux_make/build$inst_dir/lib/pd-l2ork/extra
cp -f disis_netreceive-help.pd ../../packages/linux_make/build$inst_dir/lib/pd-l2ork/extra
- # disis_phasor
- cd ../disis_phasor
- make clean
- make
- cp -f disis_phasor~.pd_linux ../../packages/linux_make/build$inst_dir/lib/pd-l2ork/extra
- cp -f disis_phasor~-help.pd ../../packages/linux_make/build$inst_dir/lib/pd-l2ork/extra
# spectdelay
cd ../spectdelay/spectdelay~
./linux-install.sh
--
GitLab