Merge branch 'master' of https://github.com/opentrack/opentrack into dev/ewma2

Resolved conflicts manually in files:
	ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp
	ftnoir_filter_ewma2/ftnoir_filter_ewma2.h

1 files changed, 19 insertions, 0 deletions

diff --git a/install-fail-tool b/install-fail-tool
new file mode 100755
index 00000000..99f8fbdf
--- /dev/null
+++ b/install-fail-tool
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+test -n "$1" || exit 1
+
+dir="$1"
+
+for i in "$dir"/* "$dir"/*/*; do
+	{ test -x "$i" && test -f "$i"; } || continue
+	echo ---- $i ----
+	install_name_tool -id "@executable_path/$(basename -- "$i")" "$i"
+
+	otool -L "$i" | awk '{ print $1 }' |
+	while read l; do
+		j="$(basename -- "$l")"
+		if test -e "$dir/$j"; then
+			install_name_tool -change "$l" "@executable_path/$j" "$i"
+		fi
+	done
+done