From 1752fb6e156816af068872cdc8d560b996b1e5b2 Mon Sep 17 00:00:00 2001
From: Sojourner Truth <jon.w.wilkes@gmail.com>
Date: Sun, 17 Jul 2016 14:51:37 -0400
Subject: [PATCH] use a variable for cyclist binary since it's called
"cyclist.exe" on Windows
---
externals/miXed/cyclone/Makefile.libdir | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/externals/miXed/cyclone/Makefile.libdir b/externals/miXed/cyclone/Makefile.libdir
index bd83ada62..968ea718c 100644
--- a/externals/miXed/cyclone/Makefile.libdir
+++ b/externals/miXed/cyclone/Makefile.libdir
@@ -17,6 +17,7 @@ ifeq ($(UNAME),Darwin)
CPU := $(shell uname -p)
ifeq ($(CPU),arm) # iPhone/iPod Touch
EXTENSION = pd_darwin
+ CYCLIST_BIN = cyclist
OS = iphoneos
PD_PATH = /Applications/Pd-extended.app/Contents/Resources
IPHONE_BASE=/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin
@@ -32,6 +33,7 @@ ifeq ($(UNAME),Darwin)
STRIP = strip -x
else # Mac OS X
EXTENSION = pd_darwin
+ CYCLIST_BIN = cyclist
OS = macosx
PD_PATH = /Applications/Pd-extended.app/Contents/Resources
OPT_CFLAGS = -ftree-vectorize -ftree-vectorizer-verbose=2 -fast
@@ -54,6 +56,7 @@ endif
ifeq ($(UNAME),Linux)
CPU := $(shell uname -m)
EXTENSION = pd_linux
+ CYCLIST_BIN = cyclist
OS = linux
PD_PATH = /usr
OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer
@@ -65,6 +68,7 @@ endif
ifeq (CYGWIN,$(findstring CYGWIN,$(UNAME)))
CPU := $(shell uname -m)
EXTENSION = dll
+ CYCLIST_BIN = cyclist.exe
OS = cygwin
PD_PATH = $(cygpath $(PROGRAMFILES))/pd
OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer
@@ -76,6 +80,7 @@ endif
ifeq (MINGW,$(findstring MINGW,$(UNAME)))
CPU := $(shell uname -m)
EXTENSION = dll
+ CYCLIST_BIN = cyclist.exe
OS = windows
PD_PATH = $(shell cd "$(PROGRAMFILES)"/pd && pwd)
OPT_CFLAGS = -O3 -funroll-loops -fomit-frame-pointer
@@ -114,13 +119,13 @@ install: cyclone
$(DESTDIR)$(objectsdir)/cyclone/examples
# install "cyclist" command line app with pd
$(INSTALL_DIR) $(DESTDIR)$(bindir)
- $(INSTALL_PROGRAM) ../bin/cyclist $(DESTDIR)$(bindir)
- $(STRIP) $(DESTDIR)$(bindir)/cyclist
+ $(INSTALL_PROGRAM) ../bin/$(CYCLIST_BIN) $(DESTDIR)$(bindir)
+ $(STRIP) $(DESTDIR)$(bindir)/$(CYCLIST_BIN)
clean:
-$(MAKE) -f Makefile $(DEST_PATHS) clean
-rm -f ../bin/*.pd_linux
- -rm -f ../bin/cyclist
+ -rm -f ../bin/$(CYCLIST_BIN)
-rm -f Makefile.deps
-rm -f shadow/Makefile.deps
-rm -f hammer/Makefile.deps
--
GitLab