ardour/livetrax
13
0
Fork 0
Code

move LXVST GUI stuff into gtk2_ardour, and fix X11 uselib stuff in wscripts

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@10565 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2011-11-13 14:53:49 +00:00
parent f60c9d52dc
commit 8e2858e555
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
libs/ardour/vstfxwin.cc → gtk2_ardour/vstfxwin.cc
View File

6
gtk2_ardour/wscript
View File

@ -267,7 +267,7 @@ def configure(conf):
autowaf.check_pkg(conf, 'libgnomecanvasmm-2.6', autowaf.check_pkg(conf, 'libgnomecanvasmm-2.6',
uselib_store='GNOMECANVASMM', atleast_version='2.16') uselib_store='GNOMECANVASMM', atleast_version='2.16')
autowaf.check_pkg(conf, 'ogg', uselib_store='OGG', atleast_version='1.1.2') 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) conf.write_config_header('gtk2ardour-config.h', remove=False)
@ -396,10 +396,10 @@ def build(bld):
obj.uselib += ' X11 ' obj.uselib += ' X11 '
if bld.is_defined('LXVST_SUPPORT'): if bld.is_defined('LXVST_SUPPORT'):
obj.source += [ 'lxvst_pluginui.cc' ] obj.source += [ 'vstfxwin.cc', 'lxvst_pluginui.cc' ]
obj.defines += [ 'LXVST_SUPPORT' ] obj.defines += [ 'LXVST_SUPPORT' ]
obj.uselib += ' X11 ' obj.uselib += ' X11 '
if bld.is_defined('PHONE_HOME'): if bld.is_defined('PHONE_HOME'):
obj.defines += [ 'PHONE_HOME' ] obj.defines += [ 'PHONE_HOME' ]

5
libs/ardour/wscript
View File

@ -269,8 +269,6 @@ def configure(conf):
atleast_version='1.2.1') atleast_version='1.2.1')
autowaf.check_pkg(conf, 'libcurl', uselib_store='CURL', autowaf.check_pkg(conf, 'libcurl', uselib_store='CURL',
atleast_version='7.0.0') 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 # 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' ] obj.defines += [ 'VST_SUPPORT' ]
if bld.is_defined('LXVST_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.defines += [ 'LXVST_SUPPORT' ]
obj.uselib += ['X11']
if bld.is_defined('HAVE_COREAUDIO'): if bld.is_defined('HAVE_COREAUDIO'):
obj.source += [ 'coreaudiosource.cc', 'caimportable.cc' ] obj.source += [ 'coreaudiosource.cc', 'caimportable.cc' ]

1
wscript
View File

@ -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, '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, '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, '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: for i in children:
sub_config_and_use(conf, i) sub_config_and_use(conf, i)