From 50d01b1366e4e99ea32e73015780bcddceace893 Mon Sep 17 00:00:00 2001 From: Thomas Grill Date: Sat, 18 Dec 2004 05:05:23 +0000 Subject: wmax makefiles use flext build system using flext build system updated build system svn path=/trunk/; revision=2409 --- externals/grill/fftease/build-lnx-pd-gcc.sh | 1 + externals/grill/fftease/build-mac-pd-gcc.sh | 1 + externals/grill/fftease/build-pd-darwin.sh | 11 --- externals/grill/fftease/build-pd-linux.sh | 11 --- externals/grill/fftease/build-win-max-msvc.bat | 3 +- externals/grill/fftease/build-win-pd-msvc.bat | 3 +- externals/grill/fftease/config-lnx-gcc.txt | 6 ++ externals/grill/fftease/config-mac-gcc.txt | 6 ++ externals/grill/fftease/config-pd-darwin.txt | 37 --------- externals/grill/fftease/config-pd-linux.txt | 35 -------- externals/grill/fftease/config-win-max-msvc.txt | 12 --- externals/grill/fftease/config-win-msvc.txt | 6 ++ externals/grill/fftease/config-win-pd-msvc.txt | 12 --- externals/grill/fftease/makefile-lnx-gcc.txt | 3 + externals/grill/fftease/makefile-mac-gcc.txt | 3 + externals/grill/fftease/makefile-win-msvc.txt | 8 -- externals/grill/fftease/makefile.pd-darwin | 79 ------------------ externals/grill/fftease/makefile.pd-linux | 102 ------------------------ 18 files changed, 28 insertions(+), 311 deletions(-) create mode 100644 externals/grill/fftease/build-lnx-pd-gcc.sh create mode 100644 externals/grill/fftease/build-mac-pd-gcc.sh delete mode 100644 externals/grill/fftease/build-pd-darwin.sh delete mode 100644 externals/grill/fftease/build-pd-linux.sh create mode 100644 externals/grill/fftease/config-lnx-gcc.txt create mode 100644 externals/grill/fftease/config-mac-gcc.txt delete mode 100644 externals/grill/fftease/config-pd-darwin.txt delete mode 100644 externals/grill/fftease/config-pd-linux.txt delete mode 100644 externals/grill/fftease/config-win-max-msvc.txt create mode 100644 externals/grill/fftease/config-win-msvc.txt delete mode 100644 externals/grill/fftease/config-win-pd-msvc.txt create mode 100644 externals/grill/fftease/makefile-lnx-gcc.txt create mode 100644 externals/grill/fftease/makefile-mac-gcc.txt delete mode 100644 externals/grill/fftease/makefile.pd-darwin delete mode 100644 externals/grill/fftease/makefile.pd-linux (limited to 'externals/grill/fftease') diff --git a/externals/grill/fftease/build-lnx-pd-gcc.sh b/externals/grill/fftease/build-lnx-pd-gcc.sh new file mode 100644 index 00000000..e76f5ed1 --- /dev/null +++ b/externals/grill/fftease/build-lnx-pd-gcc.sh @@ -0,0 +1 @@ +make -f ../flext/build/gnumake.mak PLATFORM=lnx RTSYS=pd COMPILER=gcc $* diff --git a/externals/grill/fftease/build-mac-pd-gcc.sh b/externals/grill/fftease/build-mac-pd-gcc.sh new file mode 100644 index 00000000..a88a3dbb --- /dev/null +++ b/externals/grill/fftease/build-mac-pd-gcc.sh @@ -0,0 +1 @@ +make -f ../flext/build/gnumake.mak PLATFORM=mac RTSYS=pd COMPILER=gcc $* diff --git a/externals/grill/fftease/build-pd-darwin.sh b/externals/grill/fftease/build-pd-darwin.sh deleted file mode 100644 index 8f21ebcb..00000000 --- a/externals/grill/fftease/build-pd-darwin.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -. config-pd-darwin.txt - -make -f makefile.pd-darwin && -{ - if [ "${INSTPATH}" != "" ]; then - echo Now install as root - sudo make -f makefile.pd-darwin install - fi -} diff --git a/externals/grill/fftease/build-pd-linux.sh b/externals/grill/fftease/build-pd-linux.sh deleted file mode 100644 index 421cb6e1..00000000 --- a/externals/grill/fftease/build-pd-linux.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -. config-pd-linux.txt - -make -f makefile.pd-linux && -{ - if [ ${INSTPATH} != "" ]; then - echo Now install as root - su -c "make -f makefile.pd-linux install" - fi -} diff --git a/externals/grill/fftease/build-win-max-msvc.bat b/externals/grill/fftease/build-win-max-msvc.bat index d99ba534..c43e576c 100644 --- a/externals/grill/fftease/build-win-max-msvc.bat +++ b/externals/grill/fftease/build-win-max-msvc.bat @@ -1,4 +1,3 @@ @echo --- Building with MS Visual C++ --- -nmake -f ..\flext\build\make-win-max-msvc.txt clean -nmake -f ..\flext\build\make-win-max-msvc.txt +nmake -f ..\flext\build\nmake.mak PLATFORM=win RTSYS=max COMPILER=msvc %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/externals/grill/fftease/build-win-pd-msvc.bat b/externals/grill/fftease/build-win-pd-msvc.bat index 942ee174..5a3958b9 100644 --- a/externals/grill/fftease/build-win-pd-msvc.bat +++ b/externals/grill/fftease/build-win-pd-msvc.bat @@ -1,4 +1,3 @@ @echo --- Building with MS Visual C++ --- -nmake -f ..\flext\build\make-win-pd-msvc.txt clean -nmake -f ..\flext\build\make-win-pd-msvc.txt +nmake -f ..\flext\build\nmake.mak PLATFORM=win RTSYS=pd COMPILER=msvc %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/externals/grill/fftease/config-lnx-gcc.txt b/externals/grill/fftease/config-lnx-gcc.txt new file mode 100644 index 00000000..93669034 --- /dev/null +++ b/externals/grill/fftease/config-lnx-gcc.txt @@ -0,0 +1,6 @@ +# Your settings are defined in the files +# ../flext/build/config-mac-pd-gcc.txt +# and +# ../flext/build/config-mac-max-gcc.txt +# +# You can override them here. diff --git a/externals/grill/fftease/config-mac-gcc.txt b/externals/grill/fftease/config-mac-gcc.txt new file mode 100644 index 00000000..93669034 --- /dev/null +++ b/externals/grill/fftease/config-mac-gcc.txt @@ -0,0 +1,6 @@ +# Your settings are defined in the files +# ../flext/build/config-mac-pd-gcc.txt +# and +# ../flext/build/config-mac-max-gcc.txt +# +# You can override them here. diff --git a/externals/grill/fftease/config-pd-darwin.txt b/externals/grill/fftease/config-pd-darwin.txt deleted file mode 100644 index 10bb0bd8..00000000 --- a/externals/grill/fftease/config-pd-darwin.txt +++ /dev/null @@ -1,37 +0,0 @@ -# FFTease - A set of Live Spectral Processors -# Originally written by Eric Lyon and Christopher Penrose for the Max/MSP platform -# -# Copyright (c)Thomas Grill (xovo@gmx.net) -# For information on usage and redistribution, and for a DISCLAIMER OF ALL -# WARRANTIES, see the file, "license.txt," in this distribution. -# - -# your c/c++ compilers (define only if not gcc/g++) -# C=gcc -# CXX=g++ - - -# where is PD installed? -PDDIR=/usr/local/lib/pd - -# where are the PD header files? -# leave it blank if it is a system directory (like /usr/local/include), -# since gcc 3.2 complains about it -PDPATH=${PDDIR}/src - -# where is the PD executable? -PD=/usr/local/bin/pd - -# where do the flext libraries reside? -FLEXTPATH=${PDDIR}/flext - - -# where should flext libraries be built? -TARGDIR=./pd-darwin -# where should the external be installed? -# (leave blank to omit installation) -INSTPATH=${PDDIR}/extra - -# additional compiler flags -# (check if they fit for your system!) -UFLAGS=-malign-power -faltivec -maltivec diff --git a/externals/grill/fftease/config-pd-linux.txt b/externals/grill/fftease/config-pd-linux.txt deleted file mode 100644 index 7599bb50..00000000 --- a/externals/grill/fftease/config-pd-linux.txt +++ /dev/null @@ -1,35 +0,0 @@ -# FFTease - A set of Live Spectral Processors -# Originally written by Eric Lyon and Christopher Penrose for the Max/MSP platform -# -# Copyright (c)Thomas Grill (xovo@gmx.net) -# For information on usage and redistribution, and for a DISCLAIMER OF ALL -# WARRANTIES, see the file, "license.txt," in this distribution. -# - - -# your c/c++ compilers (define only if not gcc/g++) -# CC=gcc - -# where are the PD header files? -# leave it blank if it is a system directory (like /usr/local/include), -# since gcc 3.2 complains about it -PDPATH= - -# where do the flext libraries reside? -FLEXTPATH=/usr/local/lib/pd/flext - -# where should flext libraries be built? -TARGDIR=./pd-linux - -# where should the external be installed? -# (leave blank to omit installation) -INSTPATH=/usr/local/lib/pd/extra - -# additional compiler flags -# (check if they fit for your system!) -# UFLAGS=-mcpu=pentiumpro # gcc 2.95 -# UFLAGS=-mcpu=pentium3 -msse # gcc 3.2 - -# define for shared build -# FLEXT_SHARED=1 - diff --git a/externals/grill/fftease/config-win-max-msvc.txt b/externals/grill/fftease/config-win-max-msvc.txt deleted file mode 100644 index 903453bf..00000000 --- a/externals/grill/fftease/config-win-max-msvc.txt +++ /dev/null @@ -1,12 +0,0 @@ -# FFTease - A set of Live Spectral Processors -# Originally written by Eric Lyon and Christopher Penrose for the Max/MSP platform -# -# Copyright (c)Thomas Grill (gr@grrrr.org) -# For information on usage and redistribution, and for a DISCLAIMER OF ALL -# WARRANTIES, see the file, "license.txt," in this distribution. -# -# -# Your settings are defined in the file -# ..\flext\build\config-win-max-msvc.txt -# -# You can override them here. diff --git a/externals/grill/fftease/config-win-msvc.txt b/externals/grill/fftease/config-win-msvc.txt new file mode 100644 index 00000000..effe3b0f --- /dev/null +++ b/externals/grill/fftease/config-win-msvc.txt @@ -0,0 +1,6 @@ +# Your settings are defined in the files +# ..\flext\build\config-win-pd-msvc.txt +# and +# ..\flext\build\config-win-max-msvc.txt +# +# You can override them here. diff --git a/externals/grill/fftease/config-win-pd-msvc.txt b/externals/grill/fftease/config-win-pd-msvc.txt deleted file mode 100644 index 6d4799bb..00000000 --- a/externals/grill/fftease/config-win-pd-msvc.txt +++ /dev/null @@ -1,12 +0,0 @@ -# FFTease - A set of Live Spectral Processors -# Originally written by Eric Lyon and Christopher Penrose for the Max/MSP platform -# -# Copyright (c)Thomas Grill (gr@grrrr.org) -# For information on usage and redistribution, and for a DISCLAIMER OF ALL -# WARRANTIES, see the file, "license.txt," in this distribution. -# -# -# Your settings are defined in the file -# ..\flext\build\config-win-pd-msvc.txt -# -# You can override them here. diff --git a/externals/grill/fftease/makefile-lnx-gcc.txt b/externals/grill/fftease/makefile-lnx-gcc.txt new file mode 100644 index 00000000..fed16156 --- /dev/null +++ b/externals/grill/fftease/makefile-lnx-gcc.txt @@ -0,0 +1,3 @@ +# usage: +# to build run "sh build-mac-max-gcc.sh" or "sh build-mac-pd-gcc.sh" +# diff --git a/externals/grill/fftease/makefile-mac-gcc.txt b/externals/grill/fftease/makefile-mac-gcc.txt new file mode 100644 index 00000000..fed16156 --- /dev/null +++ b/externals/grill/fftease/makefile-mac-gcc.txt @@ -0,0 +1,3 @@ +# usage: +# to build run "sh build-mac-max-gcc.sh" or "sh build-mac-pd-gcc.sh" +# diff --git a/externals/grill/fftease/makefile-win-msvc.txt b/externals/grill/fftease/makefile-win-msvc.txt index 5b0f5793..0a613fd7 100644 --- a/externals/grill/fftease/makefile-win-msvc.txt +++ b/externals/grill/fftease/makefile-win-msvc.txt @@ -1,11 +1,3 @@ -# FFTease - A set of Live Spectral Processors -# Originally written by Eric Lyon and Christopher Penrose for the Max/MSP platform -# -# Copyright (c)Thomas Grill (gr@grrrr.org) -# For information on usage and redistribution, and for a DISCLAIMER OF ALL -# WARRANTIES, see the file, "license.txt," in this distribution. -# -# # Makefile for MSVC++ 6 and .NET # # usage: diff --git a/externals/grill/fftease/makefile.pd-darwin b/externals/grill/fftease/makefile.pd-darwin deleted file mode 100644 index c0f1b0a4..00000000 --- a/externals/grill/fftease/makefile.pd-darwin +++ /dev/null @@ -1,79 +0,0 @@ -# FFTease - A set of Live Spectral Processors -# Originally written by Eric Lyon and Christopher Penrose for the Max/MSP platform -# -# Copyright (c)Thomas Grill (xovo@gmx.net) -# For information on usage and redistribution, and for a DISCLAIMER OF ALL -# WARRANTIES, see the file, "license.txt," in this distribution. -# -# -# Makefile for gcc @ darwin (OSX) -# -# usage: -# to build run "make -f makefile.pd-darwin" -# to install (as root), do "make -f makefile.pd-darwin install" -# - -CONFIG=config-pd-darwin.txt - -include ${CONFIG} - -FLEXTLIB=${FLEXTPATH}/flext.a - -# compiler+linker stuff -INCLUDES=${PDPATH} ${FLEXTPATH} -LIBPATH= -FLAGS=-DFLEXT_SYS=2 ${UFLAGS} -CFLAGS=-O2 -Wno-unused -Wno-parentheses -Wno-switch -Wstrict-prototypes -CPPFLAGS=-fno-exceptions -fno-rtti -LIBS= -LDFLAGS=-bundle -bundle_loader ${PD} -FRAMEWORKS=Carbon vecLib - -# --------------------------------------------- -# the rest can stay untouched -# ---------------------------------------------- -NAME=fftease - -# all the source files from the package -include make-files.txt - -DIR=src - -TARGET=$(TARGDIR)/$(NAME).pd_darwin -MAKEFILE=makefile.pd-darwin - -# default target -all: $(TARGDIR) $(TARGET) - -$(patsubst %,$(DIR)/%,$(SRCS)): $(patsubst %,$(DIR)/%,$(HDRS)) $(FLEXTLIB) $(MAKEFILE) $(CONFIG) - touch $@ - -$(TARGDIR): - -mkdir $(TARGDIR) - -$(TARGDIR)/%.o : $(DIR)/%.cpp - $(CXX) -c $(CPPFLAGS) $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES)) $< -o $@ - -$(TARGDIR)/%.co : $(DIR)/%.c - $(CC) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES)) $< -o $@ - -$(TARGET) : $(patsubst %.c,$(TARGDIR)/%.co,$(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS))) $(FLEXTLIB) - $(CXX) $(LDFLAGS) $^ $(patsubst %,-framework %,$(FRAMEWORKS)) $(patsubst %,-L%,$(LIBPATH)) $(patsubst %,-l%,$(LIBS)) -o $@ - chmod 755 $@ - -$(INSTPATH): - -mkdir $(INSTPATH) - -install:: $(INSTPATH) - -install:: $(TARGET) - cp $^ $(INSTPATH) -# chown root.root $(patsubst %,$(INSTPATH)/%,$(notdir $^)) -# chmod 755 $(patsubst %,$(INSTPATH)/%,$(notdir $^)) - -.PHONY: clean - -clean: - rm -f $(TARGDIR)/*.o $(TARGET) - - diff --git a/externals/grill/fftease/makefile.pd-linux b/externals/grill/fftease/makefile.pd-linux deleted file mode 100644 index ab4204fb..00000000 --- a/externals/grill/fftease/makefile.pd-linux +++ /dev/null @@ -1,102 +0,0 @@ -# FFTease - A set of Live Spectral Processors -# Originally written by Eric Lyon and Christopher Penrose for the Max/MSP platform -# -# Copyright (c)Thomas Grill (xovo@gmx.net) -# For information on usage and redistribution, and for a DISCLAIMER OF ALL -# WARRANTIES, see the file, "license.txt," in this distribution. -# -# -# Makefile for gcc @ linux -# -# usage: -# to build run "make -f makefile.pd-linux" -# to install (as root), do "make -f makefile.pd-linux install" -# - -CONFIG=config-pd-linux.txt - -include $(CONFIG) - -# compiler+linker stuff -INCLUDES=$(PDPATH) -LIBPATH= -FLAGS=-DFLEXT_SYS=2 -CFLAGS=-O2 $(UFLAGS) -LDFLAGS=$(UFLAGS) # needed by icc -LIBS=stdc++ - -ifdef FLEXT_SHARED -CFLAGS+=-shared -DFLEXT_SHARED -LDFLAGS+=-L $(FLEXTPATH) -LIBFLEXT=-lflext - -ifeq ($(CXX),icc) -LDFLAGS+=-i_dynamic -else -LDFLAGS+=-Wl,-Bdynamic -endif - -else - -LIBFLEXT=$(FLEXTPATH)/libflext.a - -endif - - - - -# --------------------------------------------- -# the rest can stay untouched -# ---------------------------------------------- - -NAME=fftease - -# all the source files from the package -include make-files.txt - -MAKEFILE=makefile.pd-linux -TARGET=$(TARGDIR)/$(NAME).pd_linux -DIR=src - -# default target -all: $(TARGDIR) $(TARGET) - -$(patsubst %,$(DIR)/%,$(SRCS)): $(patsubst %,$(DIR)/%,$(HDRS)) $(MAKEFILE) $(CONFIG) - touch $@ - -$(TARGDIR): - mkdir $(TARGDIR) - -$(TARGDIR)/%.o : $(DIR)/%.cpp - $(CC) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(FLEXTPATH)) $< -o $@ - -$(TARGDIR)/%.co : $(DIR)/%.c - $(CC) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(FLEXTPATH)) $< -o $@ - -$(TARGET) : $(patsubst %.c,$(TARGDIR)/%.co,$(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS))) - $(CC) $(LDFLAGS) -shared -o $@ $^ $(LIBFLEXT) $(patsubst %,-l%,$(LIBS)) - strip --strip-unneeded $@ - chmod 755 $@ - -$(INSTPATH): - mkdir $(INSTDIR) - -install:: $(INSTDIR) - -install:: $(TARGET) - cp $^ $(INSTPATH) - chown root.root $(patsubst %,$(INSTPATH)/%,$(notdir $^)) - chmod 755 $(patsubst %,$(INSTPATH)/%,$(notdir $^)) - -.PHONY: clean -clean: - rm -f $(TARGDIR)/*.o $(TARGET) - - - - - - - - - -- cgit v1.2.1