summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2013-12-22 13:39:57 -0500
committerPaul Davis <paul@linuxaudiosystems.com>2013-12-22 13:39:57 -0500
commitd98c5f7aee5be267ebac3315e3f7a5a14154c60c (patch)
tree70a3ea77d316cb3b950df5135fe6d5327abf2ffd
parent9f17579d713aedcdbe3bb3ff560d232569ce2b90 (diff)
better, probably working fix for windows-vst-on-linux build3.5.143
-rw-r--r--gtk2_ardour/wscript42
1 files changed, 24 insertions, 18 deletions
diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index d0a7627a99..9883fa49e2 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -370,14 +370,17 @@ def build(bld):
if bld.is_defined('WINDOWS_VST_SUPPORT'):
# If we require VST support we build a stub main() and the FST library
# here using winegcc, and link it to the GTK front-end library
- obj = bld(features = 'cxx c cxxprogram wine')
- obj.source = '''
- ../libs/fst/fst.c
- ../libs/fst/fstinfofile.c
- ../libs/fst/vsti.c
- ../libs/fst/vstwin.c
- ../vst/winmain.c
- '''
+ obj = bld (features = 'cxx c cxxprogram wine')
+ obj.source = (
+ '../libs/fst/fst.c',
+ '../libs/fst/fstinfofile.c',
+ '../libs/fst/vsti.c',
+ '../libs/fst/vstwin.c',
+ '../vst/winmain.c',
+ )
+ #
+ # XXX do we really need to explicitly link to all of these for the wine executable?
+ #
obj.use = [ 'libpbd',
'libmidipp',
'libardour',
@@ -402,18 +405,21 @@ def build(bld):
obj.target = 'gtk2_ardour'
else:
# just the normal executable version of the GTK GUI
- obj = bld(features = 'cxx c cxxprogram')
+ obj = bld (features = 'cxx c cxxprogram')
obj.source = gtk2_ardour_sources
obj.target = 'ardour-' + bld.env['VERSION']
obj.includes = ['.']
- obj.use = [ 'libpbd',
- 'libardour',
- 'libardour_cp',
- 'libtimecode',
- 'libmidipp',
- 'libgtk2_ardour',
- 'libgtkmm2ext',
- ]
+
+ # at this point, "obj" refers to either the normal native executable
+ # OR the shared library built for use with wine on linux.
+
+ obj.use = [ 'libpbd',
+ 'libardour',
+ 'libardour_cp',
+ 'libtimecode',
+ 'libmidipp',
+ 'libgtkmm2ext',
+ ]
# continue with setup of obj, which could be a shared library
# or an executable.
@@ -425,7 +431,7 @@ def build(bld):
if bld.is_defined('USE_EXTERNAL_LIBS'):
obj.uselib += ' TAGLIB'
else:
- obj.use.append('libtaglib')
+ obj.use += ('libtaglib')
if sys.platform == 'darwin':
obj.use += ' libappleutility'
obj.defines = [