do not pass a non-zero offset to plugins AFTER the first call to connect_and_run...

[ardour.git] / libs / fst / SConscript

diff --git a/libs/fst/SConscript b/libs/fst/SConscript
index cfba56c1276c42206fd2e6c9daaa6e41f79a922e..9dc84c5148cfe4274d2cf781628dc05226aea2c3 100644 (file)
--- a/libs/fst/SConscript
+++ b/libs/fst/SConscript
@@ -8,14 +8,13 @@ import glob
 fst_src = glob.glob('*.c')
 
 Import('env install_prefix libraries')
-fst = env.Clone(CC="winegcc")
+fst = env.Clone()
 fst.Append (CPPPATH=".")
 fst.Merge ([
-        libraries['glib2'],
-        libraries['jack']
+        libraries['jack'],
+        libraries['glib2']
         ])
 
-
 #
 # See if JACK supports jack_set_thread_creator()
 #
@@ -51,12 +50,12 @@ if conf.CheckJackSetThreadCreator():
 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])
     
 env.Alias('tarball', env.Distribute (env['DISTTREE'],