From 028a78e679046fe99fbc067ec13c99309acb9a60 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sun, 27 Dec 2020 21:06:16 +0000 Subject: [PATCH] Allow to use EXE_WRAPPER as makefile option --- Makefile | 8 +++++++- dpf/utils/generate-ttl.sh | 16 ++++++++-------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index a6e1846..e31dbb4 100644 --- a/Makefile +++ b/Makefile @@ -19,6 +19,12 @@ HAVE_PROJM = $(shell pkg-config --exists libprojectM && echo true) # -------------------------------------------------------------- +ifeq ($(CROSS_COMPILING),true) +CAN_GENERATE_TTL = true +else ifneq ($(EXE_WRAPPER),) +CAN_GENERATE_TTL = true +endif + dgl: ifeq ($(HAVE_CAIRO_OR_OPENGL),true) $(MAKE) -C dpf/dgl @@ -61,7 +67,7 @@ endif # HAVE_PROJM endif # HAVE_CAIRO_OR_OPENGL gen: plugins dpf/utils/lv2_ttl_generator -ifneq ($(CROSS_COMPILING),true) +ifeq ($(CAN_GENERATE_TTL),true) @$(CURDIR)/dpf/utils/generate-ttl.sh endif ifeq ($(MACOS),true) diff --git a/dpf/utils/generate-ttl.sh b/dpf/utils/generate-ttl.sh index 7522b26..26cf663 100755 --- a/dpf/utils/generate-ttl.sh +++ b/dpf/utils/generate-ttl.sh @@ -9,13 +9,13 @@ else exit fi -PWD="$(dirname "$0")" +PWD="$(dirname "${0}")" -if [ -f "$PWD/lv2_ttl_generator.exe" ]; then - GEN="$PWD/lv2_ttl_generator.exe" +if [ -f "${PWD}/lv2_ttl_generator.exe" ]; then + GEN="${PWD}/lv2_ttl_generator.exe" EXT=dll else - GEN="$PWD/lv2_ttl_generator" + GEN="${PWD}/lv2_ttl_generator" if [ -d /Library/Audio ]; then EXT=dylib else @@ -25,9 +25,9 @@ fi FOLDERS=`find . -type d -name \*.lv2` -for i in $FOLDERS; do - cd $i - FILE="$(ls *.$EXT | sort | head -n 1)" - "$GEN" "./$FILE" +for i in ${FOLDERS}; do + cd ${i} + FILE="$(ls *.${EXT} | sort | head -n 1)" + "${EXE_WRAPPER}" "${GEN}" "./${FILE}" cd .. done