diff options
| -rwxr-xr-x | gtk2_ardour/vstfxwin.cc (renamed from libs/ardour/vstfxwin.cc) | 0 | ||||
| -rw-r--r-- | gtk2_ardour/wscript | 6 | ||||
| -rw-r--r-- | libs/ardour/wscript | 5 | ||||
| -rw-r--r-- | wscript | 1 |
4 files changed, 5 insertions, 7 deletions
diff --git a/libs/ardour/vstfxwin.cc b/gtk2_ardour/vstfxwin.cc index a1a7d73909..a1a7d73909 100755 --- a/libs/ardour/vstfxwin.cc +++ b/gtk2_ardour/vstfxwin.cc diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index 3ca85c0e4d..78c810df7b 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -267,7 +267,7 @@ def configure(conf): autowaf.check_pkg(conf, 'libgnomecanvasmm-2.6', uselib_store='GNOMECANVASMM', atleast_version='2.16') autowaf.check_pkg(conf, 'ogg', uselib_store='OGG', atleast_version='1.1.2') - autowaf.check_pkg(conf, 'x11', uselib_store='X11', atleast_version='1.4', mandatory=False) + autowaf.check_pkg(conf, 'x11', uselib_store='X11', atleast_version='1.3', mandatory=False) conf.write_config_header('gtk2ardour-config.h', remove=False) @@ -396,10 +396,10 @@ def build(bld): obj.uselib += ' X11 ' if bld.is_defined('LXVST_SUPPORT'): - obj.source += [ 'lxvst_pluginui.cc' ] + obj.source += [ 'vstfxwin.cc', 'lxvst_pluginui.cc' ] obj.defines += [ 'LXVST_SUPPORT' ] obj.uselib += ' X11 ' - + if bld.is_defined('PHONE_HOME'): obj.defines += [ 'PHONE_HOME' ] diff --git a/libs/ardour/wscript b/libs/ardour/wscript index 56b6cfccc9..c127a2c248 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -269,8 +269,6 @@ def configure(conf): atleast_version='1.2.1') autowaf.check_pkg(conf, 'libcurl', uselib_store='CURL', atleast_version='7.0.0') - autowaf.check_pkg(conf, 'x11', uselib_store='X11', - atleast_version='1.4', mandatory=False) # we don't try to detect this, since its part of our source tree @@ -389,9 +387,8 @@ def build(bld): obj.defines += [ 'VST_SUPPORT' ] if bld.is_defined('LXVST_SUPPORT'): - obj.source += [ 'lxvst_plugin.cc', 'session_lxvst.cc', 'vstfx.cc', 'vstfxwin.cc', 'vstfxinfofile.cc' ] + obj.source += [ 'lxvst_plugin.cc', 'session_lxvst.cc', 'vstfx.cc', 'vstfxinfofile.cc' ] obj.defines += [ 'LXVST_SUPPORT' ] - obj.uselib += ['X11'] if bld.is_defined('HAVE_COREAUDIO'): obj.source += [ 'coreaudiosource.cc', 'caimportable.cc' ] @@ -519,6 +519,7 @@ def configure(conf): autowaf.check_pkg(conf, 'glibmm-2.4', uselib_store='GLIBMM', atleast_version='2.14.0') autowaf.check_pkg(conf, 'sndfile', uselib_store='SNDFILE', atleast_version='1.0.18') autowaf.check_pkg(conf, 'giomm-2.4', uselib_store='GIOMM', atleast_version='2.2') + autowaf.check_pkg(conf, 'x11', uselib_store='X11', atleast_version='1.3', mandatory=False) for i in children: sub_config_and_use(conf, i) |