diff options
author | Taybin Rutkin <taybin@taybin.com> | 2009-12-06 14:21:46 +0000 |
---|---|---|
committer | Taybin Rutkin <taybin@taybin.com> | 2009-12-06 14:21:46 +0000 |
commit | 52b4b464f9657860e07b224564245ce22ea03df8 (patch) | |
tree | eb920d2cfde38a4b2b5c38ef06d95c492665003d /libs/fst | |
parent | 3fdcba185980896366cc0d3d14f6dfd6bbaf1d0a (diff) |
Merged revisions 6292,6294-6295,6311,6314 via svnmerge from
svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/build_fixes
........
r6292 | trutkin | 2009-12-05 08:31:25 -0500 (Sat, 05 Dec 2009) | 1 line
remove scons build files
........
r6294 | trutkin | 2009-12-05 09:11:17 -0500 (Sat, 05 Dec 2009) | 2 lines
cairomm
remove unnecessary vendor libraries as we now rely on the developer to install them
........
r6295 | trutkin | 2009-12-05 09:12:54 -0500 (Sat, 05 Dec 2009) | 2 lines
soundtouch
remove unnecessary vendor libraries as we now rely on the developer to install them
........
r6311 | trutkin | 2009-12-05 23:38:49 -0500 (Sat, 05 Dec 2009) | 2 lines
glibmm2, gtkmm2, libgnomecanvasmm, sigc++2
remove unnecessary vendor libraries as we now rely on the developer to install them
........
r6314 | trutkin | 2009-12-06 09:15:49 -0500 (Sun, 06 Dec 2009) | 4 lines
remove scons referencing from Makefile
- TODO: should move cscope stuff to waf and get rid of the Makefile
........
git-svn-id: svn://localhost/ardour2/branches/3.0@6315 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/fst')
-rw-r--r-- | libs/fst/SConscript | 70 |
1 files changed, 0 insertions, 70 deletions
diff --git a/libs/fst/SConscript b/libs/fst/SConscript deleted file mode 100644 index a543d72a50..0000000000 --- a/libs/fst/SConscript +++ /dev/null @@ -1,70 +0,0 @@ -# -*- python -*- - -import os -import os.path -import sys -import glob - -fst_src = glob.glob('*.c') - -Import('env install_prefix libraries') -fst = env.Clone() -fst.Append (CPPPATH=".") -fst.Merge ([ - libraries['jack'], - libraries['glib2'] - ]) - -# -# See if JACK supports jack_set_thread_creator() -# - -jack_test_source_file = """ -#include <jack/jack.h> -#include <pthread.h> -int -my_pthread_create (pthread_t* thread_id, const pthread_attr_t* attr, void *(*function)(void*), void* arg) -{ - return 0; -} -int main(int argc, char **argv) -{ - jack_set_thread_creator (my_pthread_create); - return 0; -} -""" -def CheckJackSetThreadCreator(context): - context.Message('Checking for jack_set_thread_creator()...') - result = context.TryLink(jack_test_source_file, '.c') - context.Result(result) - return result - - -conf = Configure(fst, custom_tests = { - 'CheckJackSetThreadCreator' : CheckJackSetThreadCreator, -}) - -if conf.CheckJackSetThreadCreator(): - fst.Append(CCFLAGS="-DHAVE_JACK_SET_THREAD_CREATOR") - -fst = conf.Finish () - -if fst['VST']: - fst.Replace(CC = ("winegcc")) - a = fst.Object ('fst', 'fst.c') - b = fst.Object ('fstinfofile', 'fstinfofile.c') - c = fst.Object ('vstwin', 'vstwin.c') - d = fst.Object ('vsti', 'vsti.c') - e = fst.Object ('thread', 'thread.c') - Default([a,b,c,d,e]) - -vestige_headers = glob.glob ('vestige/*.h') - -env.Alias('tarball', env.Distribute (env['DISTTREE'], - fst_src + vestige_headers + - ['SConscript', - 'fst.h', - 'jackvst.h', - ] - )) - |