From fcba7773bcd2d7c22cef9cd7b6c7364d2e6459ab Mon Sep 17 00:00:00 2001
From: Jonathan Wilkes <jancsika@yahoo.com>
Date: Mon, 7 Aug 2017 16:44:07 -0400
Subject: [PATCH] Revert "remove "matrix~" from iemmatrix to prevent nameclash
with cyclone/matrix~"
This reverts commit 3964dea2046433dd6a15d3f016708311ede48e46.
---
externals/iem/iemmatrix/alias/matrix~.c | 5 +++++
externals/iem/iemmatrix/src/mtx_mul~.c | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
create mode 100644 externals/iem/iemmatrix/alias/matrix~.c
diff --git a/externals/iem/iemmatrix/alias/matrix~.c b/externals/iem/iemmatrix/alias/matrix~.c
new file mode 100644
index 000000000..b50d1d933
--- /dev/null
+++ b/externals/iem/iemmatrix/alias/matrix~.c
@@ -0,0 +1,5 @@
+#include "../src/mtx_mul~.c"
+void matrix_tilde_setup()
+{
+ mtx_mul_tilde_setup();
+}
diff --git a/externals/iem/iemmatrix/src/mtx_mul~.c b/externals/iem/iemmatrix/src/mtx_mul~.c
index 64f31edc1..3f072f35b 100644
--- a/externals/iem/iemmatrix/src/mtx_mul~.c
+++ b/externals/iem/iemmatrix/src/mtx_mul~.c
@@ -925,7 +925,7 @@ void mtx_mul_tilde_setup(void)
/* compatibility with tm's iem_matrix */
class_addcreator((t_newmethod)matrix_multilde_new, gensym("matrix_mul_line~"), A_GIMME, 0);
/* compatibility with jmz's zexy */
- //class_addcreator((t_newmethod)matrix_multilde_new, gensym("matrix~"), A_GIMME, 0);
+ class_addcreator((t_newmethod)matrix_multilde_new, gensym("matrix~"), A_GIMME, 0);
class_addmethod(matrix_multilde_class, (t_method)matrix_multilde_dsp, gensym("dsp"), 0);
--
GitLab