From 397571d03ca1d874c094336fce12cc4883ba72b3 Mon Sep 17 00:00:00 2001
From: Jonathan Wilkes <jon.w.wilkes@gmail.com>
Date: Mon, 14 Aug 2017 21:54:25 -0400
Subject: [PATCH] change setup symbol in "||~" to the new format, remove
unnecessary symlinks for aliased zexy classes from externals/Makefile
---
externals/Makefile | 40 ++++++++++++++---------------
externals/zexy/src/0x7c0x7c_tilde.c | 2 +-
2 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/externals/Makefile b/externals/Makefile
index 5e67a92a1..10554ccf4 100644
--- a/externals/Makefile
+++ b/externals/Makefile
@@ -1834,26 +1834,26 @@ zexy_install: zexy
# add missing aliases
# can't do these on Windows because FAT, NTFS don't support these chars in filenames
# on Windows, these are faked in by loading them as libs
-ifneq ($(OS_NAME),windows)
- test -e $(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/..$(EXTENSION) || \
- ln -s 0x2e.$(EXTENSION) \
- $(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/..$(EXTENSION)
- test -e '$(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/&&~.$(EXTENSION)' || \
- ln -s 0x260x260x7e.$(EXTENSION) \
- '$(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/&&~.$(EXTENSION)'
- test -e '$(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/<~.$(EXTENSION)' || \
- ln -s 0x3c0x7e.$(EXTENSION) \
- '$(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/<~.$(EXTENSION)'
- test -e '$(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/==~.$(EXTENSION)' || \
- ln -s 0x3d0x3d0x7e.$(EXTENSION) \
- '$(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/==~.$(EXTENSION)'
- test -e '$(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/>~.$(EXTENSION)' || \
- ln -s 0x3e0x7e.$(EXTENSION) \
- '$(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/>~.$(EXTENSION)'
- test -e '$(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/||~.$(EXTENSION)' || \
- ln -s 0x7c0x7c0x7e.$(EXTENSION) \
- '$(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/||~.$(EXTENSION)'
-endif
+#ifneq ($(OS_NAME),windows)
+# test -e $(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/..$(EXTENSION) || \
+# ln -s 0x2e.$(EXTENSION) \
+# $(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/..$(EXTENSION)
+# test -e '$(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/&&~.$(EXTENSION)' || \
+# ln -s 0x260x26_tilde.$(EXTENSION) \
+# '$(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/&&~.$(EXTENSION)'
+# test -e '$(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/<~.$(EXTENSION)' || \
+# ln -s 0x3c_tilde.$(EXTENSION) \
+# '$(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/<~.$(EXTENSION)'
+# test -e '$(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/==~.$(EXTENSION)' || \
+# ln -s 0x3d0x3d_tilde.$(EXTENSION) \
+# '$(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/==~.$(EXTENSION)'
+# test -e '$(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/>~.$(EXTENSION)' || \
+# ln -s 0x3e_tilde.$(EXTENSION) \
+# '$(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/>~.$(EXTENSION)'
+# test -e '$(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/||~.$(EXTENSION)' || \
+# ln -s 0x7c0x7c_tilde.$(EXTENSION) \
+# '$(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/||~.$(EXTENSION)'
+#endif
zexy_clean:
cd $(externals_src)/zexy && ./autogen.sh
diff --git a/externals/zexy/src/0x7c0x7c_tilde.c b/externals/zexy/src/0x7c0x7c_tilde.c
index 58376d434..9b43d7306 100644
--- a/externals/zexy/src/0x7c0x7c_tilde.c
+++ b/externals/zexy/src/0x7c0x7c_tilde.c
@@ -257,7 +257,7 @@ static void oror_tilde_help(t_object*x)
post("\n"HEARTSYMBOL " &&~\t\t:: logical OR operation on 2 signals");
}
-void setup_0x7c0x7c0x7e(void)
+void setup_0x7c0x7c_tilde(void)
{
oror_tilde_class = class_new(gensym("||~"), (t_newmethod)oror_tilde_new, 0,
sizeof(t_oror_tilde), 0, A_GIMME, 0);
--
GitLab