diff options
author | Thomas Grill <xovo@users.sourceforge.net> | 2005-01-08 04:58:31 +0000 |
---|---|---|
committer | Thomas Grill <xovo@users.sourceforge.net> | 2005-01-08 04:58:31 +0000 |
commit | 0709ac9fabf4184675df1c3d8e205a2790adaadb (patch) | |
tree | 828916c3a4f0cde9641a4ed40961f5e7d56966be /externals/grill/flext/build | |
parent | dad0b0542c08240f4431a34d46e6676461e0d83b (diff) |
minor updates
adapted the queue stuff to work with the new set_callback functionality
reconsidered flext::buffer:Update
added object construction and destruction flags
updated autoconf system
small updates
better templates, some minor changes
update for linux
cleanups
svn path=/trunk/; revision=2476
Diffstat (limited to 'externals/grill/flext/build')
-rw-r--r-- | externals/grill/flext/build/bmake-win-bcc.inc | 34 | ||||
-rw-r--r-- | externals/grill/flext/build/config-lnx.def | 17 | ||||
-rw-r--r-- | externals/grill/flext/build/config-mac.def | 20 | ||||
-rw-r--r-- | externals/grill/flext/build/config-win.def | 14 | ||||
-rw-r--r-- | externals/grill/flext/build/gnumake-lnx-gcc.inc | 17 | ||||
-rw-r--r-- | externals/grill/flext/build/gnumake-mac-gcc.inc | 34 | ||||
-rw-r--r-- | externals/grill/flext/build/gnumake-win-cygwin.inc | 34 | ||||
-rw-r--r-- | externals/grill/flext/build/gnumake-win-mingw.inc | 34 | ||||
-rw-r--r-- | externals/grill/flext/build/nmake-win-msvc.inc | 34 |
9 files changed, 129 insertions, 109 deletions
diff --git a/externals/grill/flext/build/bmake-win-bcc.inc b/externals/grill/flext/build/bmake-win-bcc.inc index d39b9bf4..a54bb367 100644 --- a/externals/grill/flext/build/bmake-win-bcc.inc +++ b/externals/grill/flext/build/bmake-win-bcc.inc @@ -1,17 +1,17 @@ -!ifdef SIMD
-DEFS=$(DEFS) /DFLEXT_USE_SIMD
-!endif
-
-!ifdef SNDOBJ
-SRCS=$(SRCS) $(SRCS_SNDOBJ)
-HDRS=$(HDRS) $(HDRS_SNDOBJ)
-INCPATH=$(INCPATH) /I$(SNDOBJ)\include
-LIBS=$(LIBS) $(SNDOBJ)\lib\sndobj.lib
-!endif
-
-!ifdef STK
-SRCS=$(SRCS) $(SRCS_STK)
-HDRS=$(HDRS) $(HDRS_STK)
-INCPATH=$(INCPATH) /I$(STK)\include
-LIBS=$(LIBS) $(STK)\lib\stk.lib
-!endif
+!ifdef SIMD +DEFS=$(DEFS) /DFLEXT_USE_SIMD +!endif + +!ifdef SNDOBJ +SRCS=$(SRCS) $(SRCS_SNDOBJ) +HDRS=$(HDRS) $(HDRS_SNDOBJ) +INCPATH=$(INCPATH) /I$(SNDOBJ)\include +LIBS=$(LIBS) $(SNDOBJ)\lib\sndobj.lib +!endif + +!ifdef STK +SRCS=$(SRCS) $(SRCS_STK) +HDRS=$(HDRS) $(HDRS_STK) +INCPATH=$(INCPATH) /I$(STK)\include +LIBS=$(LIBS) $(STK)\lib\stk.lib +!endif diff --git a/externals/grill/flext/build/config-lnx.def b/externals/grill/flext/build/config-lnx.def index d112b5a3..354c6c3b 100644 --- a/externals/grill/flext/build/config-lnx.def +++ b/externals/grill/flext/build/config-lnx.def @@ -1,7 +1,10 @@ -# 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)
-#SNDOBJ=/usr/local/lib/sndobj
+# use SIMD CPU instructions (Altivec, SSE)? +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) +#SNDOBJ=/usr/local/lib/sndobj diff --git a/externals/grill/flext/build/config-mac.def b/externals/grill/flext/build/config-mac.def index 3d789fc6..280fff90 100644 --- a/externals/grill/flext/build/config-mac.def +++ b/externals/grill/flext/build/config-mac.def @@ -1,10 +1,10 @@ -# uncomment to inhibit SIMD 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)
-#SNDOBJ=/usr/local/lib/sndobj
+# uncomment to inhibit SIMD 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) +#SNDOBJ=/usr/local/lib/sndobj diff --git a/externals/grill/flext/build/config-win.def b/externals/grill/flext/build/config-win.def index 13515818..a5afc913 100644 --- a/externals/grill/flext/build/config-win.def +++ b/externals/grill/flext/build/config-win.def @@ -1,7 +1,7 @@ -# where is the STK installation?
-# (uncomment the line with # to disable STK support)
-#STK=c:\data\prog\audio\stk
-
-# where is the Sndobjs installation?
-# (uncomment the line with # to disable SNDOBJ support)
-#SNDOBJ=c:\data\prog\audio\sndobj
+# where is the STK installation? +# (uncomment the line with # to disable STK support) +#STK=c:\data\prog\audio\stk + +# where is the Sndobjs installation? +# (uncomment the line with # to disable SNDOBJ support) +#SNDOBJ=c:\data\prog\audio\sndobj diff --git a/externals/grill/flext/build/gnumake-lnx-gcc.inc b/externals/grill/flext/build/gnumake-lnx-gcc.inc new file mode 100644 index 00000000..9cd5ac8f --- /dev/null +++ b/externals/grill/flext/build/gnumake-lnx-gcc.inc @@ -0,0 +1,17 @@ +ifdef SIMD
+DEFS += -DFLEXT_USE_SIMD
+endif
+
+ifdef SNDOBJ
+SRCS+=$(SRCS_SNDOBJ)
+HDRS+=$(HDRS_SNDOBJ)
+INCPATH+=-I$(SNDOBJ)
+LIBS+=-lsndobj
+endif
+
+ifdef STK
+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 9cd5ac8f..1eb1ce77 100644 --- a/externals/grill/flext/build/gnumake-mac-gcc.inc +++ b/externals/grill/flext/build/gnumake-mac-gcc.inc @@ -1,17 +1,17 @@ -ifdef SIMD
-DEFS += -DFLEXT_USE_SIMD
-endif
-
-ifdef SNDOBJ
-SRCS+=$(SRCS_SNDOBJ)
-HDRS+=$(HDRS_SNDOBJ)
-INCPATH+=-I$(SNDOBJ)
-LIBS+=-lsndobj
-endif
-
-ifdef STK
-SRCS+=$(SRCS_STK)
-HDRS+=$(HDRS_STK)
-INCPATH+=-I$(STK)
-LIBS+=-lstk
-endif
+ifdef SIMD +DEFS += -DFLEXT_USE_SIMD +endif + +ifdef SNDOBJ +SRCS+=$(SRCS_SNDOBJ) +HDRS+=$(HDRS_SNDOBJ) +INCPATH+=-I$(SNDOBJ) +LIBS+=-lsndobj +endif + +ifdef STK +SRCS+=$(SRCS_STK) +HDRS+=$(HDRS_STK) +INCPATH+=-I$(STK) +LIBS+=-lstk +endif diff --git a/externals/grill/flext/build/gnumake-win-cygwin.inc b/externals/grill/flext/build/gnumake-win-cygwin.inc index 9cd5ac8f..1eb1ce77 100644 --- a/externals/grill/flext/build/gnumake-win-cygwin.inc +++ b/externals/grill/flext/build/gnumake-win-cygwin.inc @@ -1,17 +1,17 @@ -ifdef SIMD
-DEFS += -DFLEXT_USE_SIMD
-endif
-
-ifdef SNDOBJ
-SRCS+=$(SRCS_SNDOBJ)
-HDRS+=$(HDRS_SNDOBJ)
-INCPATH+=-I$(SNDOBJ)
-LIBS+=-lsndobj
-endif
-
-ifdef STK
-SRCS+=$(SRCS_STK)
-HDRS+=$(HDRS_STK)
-INCPATH+=-I$(STK)
-LIBS+=-lstk
-endif
+ifdef SIMD +DEFS += -DFLEXT_USE_SIMD +endif + +ifdef SNDOBJ +SRCS+=$(SRCS_SNDOBJ) +HDRS+=$(HDRS_SNDOBJ) +INCPATH+=-I$(SNDOBJ) +LIBS+=-lsndobj +endif + +ifdef STK +SRCS+=$(SRCS_STK) +HDRS+=$(HDRS_STK) +INCPATH+=-I$(STK) +LIBS+=-lstk +endif diff --git a/externals/grill/flext/build/gnumake-win-mingw.inc b/externals/grill/flext/build/gnumake-win-mingw.inc index 9cd5ac8f..1eb1ce77 100644 --- a/externals/grill/flext/build/gnumake-win-mingw.inc +++ b/externals/grill/flext/build/gnumake-win-mingw.inc @@ -1,17 +1,17 @@ -ifdef SIMD
-DEFS += -DFLEXT_USE_SIMD
-endif
-
-ifdef SNDOBJ
-SRCS+=$(SRCS_SNDOBJ)
-HDRS+=$(HDRS_SNDOBJ)
-INCPATH+=-I$(SNDOBJ)
-LIBS+=-lsndobj
-endif
-
-ifdef STK
-SRCS+=$(SRCS_STK)
-HDRS+=$(HDRS_STK)
-INCPATH+=-I$(STK)
-LIBS+=-lstk
-endif
+ifdef SIMD +DEFS += -DFLEXT_USE_SIMD +endif + +ifdef SNDOBJ +SRCS+=$(SRCS_SNDOBJ) +HDRS+=$(HDRS_SNDOBJ) +INCPATH+=-I$(SNDOBJ) +LIBS+=-lsndobj +endif + +ifdef STK +SRCS+=$(SRCS_STK) +HDRS+=$(HDRS_STK) +INCPATH+=-I$(STK) +LIBS+=-lstk +endif diff --git a/externals/grill/flext/build/nmake-win-msvc.inc b/externals/grill/flext/build/nmake-win-msvc.inc index d39b9bf4..a54bb367 100644 --- a/externals/grill/flext/build/nmake-win-msvc.inc +++ b/externals/grill/flext/build/nmake-win-msvc.inc @@ -1,17 +1,17 @@ -!ifdef SIMD
-DEFS=$(DEFS) /DFLEXT_USE_SIMD
-!endif
-
-!ifdef SNDOBJ
-SRCS=$(SRCS) $(SRCS_SNDOBJ)
-HDRS=$(HDRS) $(HDRS_SNDOBJ)
-INCPATH=$(INCPATH) /I$(SNDOBJ)\include
-LIBS=$(LIBS) $(SNDOBJ)\lib\sndobj.lib
-!endif
-
-!ifdef STK
-SRCS=$(SRCS) $(SRCS_STK)
-HDRS=$(HDRS) $(HDRS_STK)
-INCPATH=$(INCPATH) /I$(STK)\include
-LIBS=$(LIBS) $(STK)\lib\stk.lib
-!endif
+!ifdef SIMD +DEFS=$(DEFS) /DFLEXT_USE_SIMD +!endif + +!ifdef SNDOBJ +SRCS=$(SRCS) $(SRCS_SNDOBJ) +HDRS=$(HDRS) $(HDRS_SNDOBJ) +INCPATH=$(INCPATH) /I$(SNDOBJ)\include +LIBS=$(LIBS) $(SNDOBJ)\lib\sndobj.lib +!endif + +!ifdef STK +SRCS=$(SRCS) $(SRCS_STK) +HDRS=$(HDRS) $(HDRS_STK) +INCPATH=$(INCPATH) /I$(STK)\include +LIBS=$(LIBS) $(STK)\lib\stk.lib +!endif |