From 942e21c0517370cb8163562d9b5b9990d6e84863 Mon Sep 17 00:00:00 2001 From: Thomas Grill Date: Tue, 13 Mar 2007 23:41:23 +0000 Subject: fix build system for STK and SndObj support (currently unix only) fixed SndObjs include files changed eol-style no stripping of local symbols small changes to flext build system update docs svn path=/trunk/; revision=7483 --- externals/grill/flext/buildsys/lnx/gnumake-gcc.inc | 18 ++++++++++++++ externals/grill/flext/buildsys/lnx/gnumake-icc.inc | 18 ++++++++++++++ .../grill/flext/buildsys/lnx/pd/config-gcc.def | 24 +++++++++++++++++++ .../grill/flext/buildsys/lnx/pd/config-icc.def | 24 +++++++++++++++++++ externals/grill/flext/buildsys/mac/gnumake-gcc.inc | 18 ++++++++++++++ .../grill/flext/buildsys/mac/max/config-gcc.def | 28 ++++++++++++++++++++-- .../grill/flext/buildsys/mac/pd/config-gcc.def | 26 +++++++++++++++++++- 7 files changed, 153 insertions(+), 3 deletions(-) (limited to 'externals/grill/flext/buildsys') diff --git a/externals/grill/flext/buildsys/lnx/gnumake-gcc.inc b/externals/grill/flext/buildsys/lnx/gnumake-gcc.inc index a0d12ed1..39639d86 100644 --- a/externals/grill/flext/buildsys/lnx/gnumake-gcc.inc +++ b/externals/grill/flext/buildsys/lnx/gnumake-gcc.inc @@ -40,6 +40,24 @@ endif ############################################## +ifdef STK_INC +INCPATH += -I$(STK_INC) +endif +ifdef STK_LIB +LIBS += $(STK_LIB) +endif + +############################################## + +ifdef SNDOBJ_INC +INCPATH += -I$(SNDOBJ_INC) +endif +ifdef SNDOBJ_LIB +LIBS += $(SNDOBJ_LIB) +endif + +############################################## + CSRCS=$(patsubst %.c,$(SRCDIR)/%.c,$(filter %.c,$(SRCS))) CPPSRCS=$(patsubst %.cpp,$(SRCDIR)/%.cpp,$(filter %.cpp,$(SRCS))) COBJS=$(patsubst %.c,$(OBJPATH)/%.o,$(filter %.c,$(SRCS))) diff --git a/externals/grill/flext/buildsys/lnx/gnumake-icc.inc b/externals/grill/flext/buildsys/lnx/gnumake-icc.inc index 7e665db3..b95dd55a 100644 --- a/externals/grill/flext/buildsys/lnx/gnumake-icc.inc +++ b/externals/grill/flext/buildsys/lnx/gnumake-icc.inc @@ -40,6 +40,24 @@ endif ############################################## +ifdef STK_INC +INCPATH += -I$(STK_INC) +endif +ifdef STK_LIB +LIBS += $(STK_LIB) +endif + +############################################## + +ifdef SNDOBJ_INC +INCPATH += -I$(SNDOBJ_INC) +endif +ifdef SNDOBJ_LIB +LIBS += $(SNDOBJ_LIB) +endif + +############################################## + CSRCS=$(patsubst %.c,$(SRCDIR)/%.c,$(filter %.c,$(SRCS))) CPPSRCS=$(patsubst %.cpp,$(SRCDIR)/%.cpp,$(filter %.cpp,$(SRCS))) COBJS=$(patsubst %.c,$(OBJPATH)/%.o,$(filter %.c,$(SRCS))) diff --git a/externals/grill/flext/buildsys/lnx/pd/config-gcc.def b/externals/grill/flext/buildsys/lnx/pd/config-gcc.def index be09f6d8..e0340e77 100644 --- a/externals/grill/flext/buildsys/lnx/pd/config-gcc.def +++ b/externals/grill/flext/buildsys/lnx/pd/config-gcc.def @@ -21,6 +21,30 @@ INSTPATH=/usr/local/lib/pd/extra ############################################################### +# STK (synthesis tool kit) support +# http://ccrma.stanford.edu/software/stk + +# where to find the STK header files (e.g. stk.h) +STK_INC=/usr/local/include/stk + +# where to find the STK library (normally libstk.a) +# (comment out STK_LIB if you don't use STK) +#STK_LIB=/usr/local/lib/libstk.a + +############################################################### + +# SndObj support +# http://music.nuim.ie//musictec/SndObj + +# where to find the SndObj header files (e.g. sndobj.h) +SNDOBJ_INC=/usr/local/include/sndobj + +# where to find the SndObj library (normally libsndobj.a) +# (comment out STK_LIB if you don't use SndObj) +#SNDOBJ_LIB=/usr/local/lib/libsndobj.a + +############################################################### + # user defined compiler flags # (check if they match your system!) UFLAGS=-msse -mfpmath=sse -ffast-math diff --git a/externals/grill/flext/buildsys/lnx/pd/config-icc.def b/externals/grill/flext/buildsys/lnx/pd/config-icc.def index 526eba11..6032cfa2 100644 --- a/externals/grill/flext/buildsys/lnx/pd/config-icc.def +++ b/externals/grill/flext/buildsys/lnx/pd/config-icc.def @@ -21,6 +21,30 @@ INSTPATH=/usr/local/lib/pd/extra ############################################################### +# STK (synthesis tool kit) support +# http://ccrma.stanford.edu/software/stk + +# where to find the STK header files (e.g. stk.h) +STK_INC=/usr/local/include/stk + +# where to find the STK library (normally libstk.a) +# (comment out STK_LIB if you don't use STK) +#STK_LIB=/usr/local/lib/libstk.a + +############################################################### + +# SndObj support +# http://music.nuim.ie//musictec/SndObj + +# where to find the SndObj header files (e.g. sndobj.h) +SNDOBJ_INC=/usr/local/include/sndobj + +# where to find the SndObj library (normally libsndobj.a) +# (comment out STK_LIB if you don't use SndObj) +#SNDOBJ_LIB=/usr/local/lib/libsndobj.a + +############################################################### + # user defined compiler flags # (check if they match your system!) UFLAGS= diff --git a/externals/grill/flext/buildsys/mac/gnumake-gcc.inc b/externals/grill/flext/buildsys/mac/gnumake-gcc.inc index 7572e455..41eac3fd 100644 --- a/externals/grill/flext/buildsys/mac/gnumake-gcc.inc +++ b/externals/grill/flext/buildsys/mac/gnumake-gcc.inc @@ -48,6 +48,24 @@ endif ############################################## +ifdef STK_INC +INCPATH += -I$(STK_INC) +endif +ifdef STK_LIB +LIBS += $(STK_LIB) +endif + +############################################## + +ifdef SNDOBJ_INC +INCPATH += -I$(SNDOBJ_INC) +endif +ifdef SNDOBJ_LIB +LIBS += $(SNDOBJ_LIB) +endif + +############################################## + LDFLAGS += $(patsubst %,-arch %,$(ARCH)) ifdef OSXSDK diff --git a/externals/grill/flext/buildsys/mac/max/config-gcc.def b/externals/grill/flext/buildsys/mac/max/config-gcc.def index 5f9a1904..cec5b624 100644 --- a/externals/grill/flext/buildsys/mac/max/config-gcc.def +++ b/externals/grill/flext/buildsys/mac/max/config-gcc.def @@ -1,6 +1,6 @@ # where are the Max/MSP SDK header files? # you should have the latest version! -MAXSDKPATH=/Applications/MaxMSP\ 4.5/MaxMSP-SDK/c74support +MAXSDKPATH=/Applications/MaxMSP\ 4.6/MaxMSP-SDK/c74support ############################################################### @@ -23,7 +23,31 @@ INSTPATH=/Library/Application\ Support/Cycling\ \'74/externals/flext INITPATH=/Library/Application\ Support/Cycling\ \'74/init # where should the help files be installed? -HELPPATH=/Applications/MaxMSP\ 4.5/max-help/flext +HELPPATH=/Applications/MaxMSP\ 4.6/max-help/flext + +############################################################### + +# STK (synthesis tool kit) support +# http://ccrma.stanford.edu/software/stk + +# where to find the STK header files (e.g. stk.h) +STK_INC=/usr/local/include/stk + +# where to find the STK library (normally libstk.a) +# (comment out STK_LIB if you don't use STK) +#STK_LIB=/usr/local/lib/libstk.a + +############################################################### + +# SndObj support +# http://music.nuim.ie//musictec/SndObj + +# where to find the SndObj header files (e.g. sndobj.h) +SNDOBJ_INC=/usr/local/include/sndobj + +# where to find the SndObj library (normally libsndobj.a) +# (comment out STK_LIB if you don't use SndObj) +#SNDOBJ_LIB=/usr/local/lib/libsndobj.a ############################################################### diff --git a/externals/grill/flext/buildsys/mac/pd/config-gcc.def b/externals/grill/flext/buildsys/mac/pd/config-gcc.def index 038fe1c1..a724b2e4 100644 --- a/externals/grill/flext/buildsys/mac/pd/config-gcc.def +++ b/externals/grill/flext/buildsys/mac/pd/config-gcc.def @@ -1,6 +1,6 @@ # where is the PD installation including source code? # (this should point to the main folder, which has a "src" subfolder) -PDPATH=/Applications/Pd-0.38-3.app/Contents/Resources +PDPATH=/Applications/Pd-0.40-2.app/Contents/Resources # where is the PD executable? PDBIN=$(PDPATH)/bin/pd @@ -24,6 +24,30 @@ INSTPATH=$(PDPATH)/extra ############################################################### +# STK (synthesis tool kit) support +# http://ccrma.stanford.edu/software/stk + +# where to find the STK header files (e.g. stk.h) +STK_INC=/usr/local/include/stk + +# where to find the STK library (normally libstk.a) +# (comment out STK_LIB if you don't use STK) +#STK_LIB=/usr/local/lib/libstk.a + +############################################################### + +# SndObj support +# http://music.nuim.ie//musictec/SndObj + +# where to find the SndObj header files (e.g. sndobj.h) +SNDOBJ_INC=/usr/local/include/sndobj + +# where to find the SndObj library (normally libsndobj.a) +# (comment out STK_LIB if you don't use SndObj) +#SNDOBJ_LIB=/usr/local/lib/libsndobj.a + +############################################################### + # user defined compiler flags UFLAGS += -ffast-math -- cgit v1.2.1