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/build/config-lnx.def | 11 +---------- externals/grill/flext/build/config-mac.def | 11 +---------- externals/grill/flext/build/config-win.def | 2 +- externals/grill/flext/build/gnumake-lnx-gcc.inc | 8 ++------ externals/grill/flext/build/gnumake-lnx-icc.inc | 8 ++------ externals/grill/flext/build/gnumake-mac-gcc.inc | 8 ++------ 6 files changed, 9 insertions(+), 39 deletions(-) (limited to 'externals/grill/flext/build') diff --git a/externals/grill/flext/build/config-lnx.def b/externals/grill/flext/build/config-lnx.def index 5f4a3d89..88c43f4d 100644 --- a/externals/grill/flext/build/config-lnx.def +++ b/externals/grill/flext/build/config-lnx.def @@ -1,11 +1,2 @@ -# use SIMD CPU instructions (Altivec, SSE)? +# comment out to inhibit SIMD (Altivec/SSE) usage SIMD=1 - -# where is the STK installation? -# (uncomment the line with # to disable STK support) -#STK=/usr/local/lib/stk - -# where is the Sndobjs installation? -# (uncomment the line with # to disable SNDOBJ support) -# please be sure to delete an eventual m_pd.h file from the SNDOBJ include folder!! -#SNDOBJ=/usr/local/lib/sndobj diff --git a/externals/grill/flext/build/config-mac.def b/externals/grill/flext/build/config-mac.def index 2fdee70b..88c43f4d 100644 --- a/externals/grill/flext/build/config-mac.def +++ b/externals/grill/flext/build/config-mac.def @@ -1,11 +1,2 @@ -# uncomment to inhibit SIMD usage +# comment out to inhibit SIMD (Altivec/SSE) usage SIMD=1 - -# where is the STK installation? -# (uncomment the line with # to disable STK support) -#STK=/usr/local/lib/stk - -# where is the Sndobjs installation? -# (uncomment the line with # to disable SNDOBJ support) -# please be sure to delete an eventual m_pd.h file from the SNDOBJ include folder!! -#SNDOBJ=/usr/local/lib/sndobj diff --git a/externals/grill/flext/build/config-win.def b/externals/grill/flext/build/config-win.def index 628831b2..88c43f4d 100644 --- a/externals/grill/flext/build/config-win.def +++ b/externals/grill/flext/build/config-win.def @@ -1,2 +1,2 @@ -# use SIMD instructions (Intel SSE)? +# comment out to inhibit SIMD (Altivec/SSE) usage SIMD=1 diff --git a/externals/grill/flext/build/gnumake-lnx-gcc.inc b/externals/grill/flext/build/gnumake-lnx-gcc.inc index 1eb1ce77..aec212c5 100644 --- a/externals/grill/flext/build/gnumake-lnx-gcc.inc +++ b/externals/grill/flext/build/gnumake-lnx-gcc.inc @@ -2,16 +2,12 @@ ifdef SIMD DEFS += -DFLEXT_USE_SIMD endif -ifdef SNDOBJ +ifdef SNDOBJ_LIB SRCS+=$(SRCS_SNDOBJ) HDRS+=$(HDRS_SNDOBJ) -INCPATH+=-I$(SNDOBJ) -LIBS+=-lsndobj endif -ifdef STK +ifdef STK_LIB SRCS+=$(SRCS_STK) HDRS+=$(HDRS_STK) -INCPATH+=-I$(STK) -LIBS+=-lstk endif diff --git a/externals/grill/flext/build/gnumake-lnx-icc.inc b/externals/grill/flext/build/gnumake-lnx-icc.inc index 1eb1ce77..aec212c5 100644 --- a/externals/grill/flext/build/gnumake-lnx-icc.inc +++ b/externals/grill/flext/build/gnumake-lnx-icc.inc @@ -2,16 +2,12 @@ ifdef SIMD DEFS += -DFLEXT_USE_SIMD endif -ifdef SNDOBJ +ifdef SNDOBJ_LIB SRCS+=$(SRCS_SNDOBJ) HDRS+=$(HDRS_SNDOBJ) -INCPATH+=-I$(SNDOBJ) -LIBS+=-lsndobj endif -ifdef STK +ifdef STK_LIB SRCS+=$(SRCS_STK) HDRS+=$(HDRS_STK) -INCPATH+=-I$(STK) -LIBS+=-lstk endif diff --git a/externals/grill/flext/build/gnumake-mac-gcc.inc b/externals/grill/flext/build/gnumake-mac-gcc.inc index 1eb1ce77..aec212c5 100644 --- a/externals/grill/flext/build/gnumake-mac-gcc.inc +++ b/externals/grill/flext/build/gnumake-mac-gcc.inc @@ -2,16 +2,12 @@ ifdef SIMD DEFS += -DFLEXT_USE_SIMD endif -ifdef SNDOBJ +ifdef SNDOBJ_LIB SRCS+=$(SRCS_SNDOBJ) HDRS+=$(HDRS_SNDOBJ) -INCPATH+=-I$(SNDOBJ) -LIBS+=-lsndobj endif -ifdef STK +ifdef STK_LIB SRCS+=$(SRCS_STK) HDRS+=$(HDRS_STK) -INCPATH+=-I$(STK) -LIBS+=-lstk endif -- cgit v1.2.1