diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-11-13 05:14:48 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-11-13 05:14:48 +0000 |
| commit | b85b4d9e54caef0585d308ef3bffee21d0e5ae56 (patch) | |
| tree | a1ebeec149a57be4589ad6cabcd26c597703407c /gtk2_ardour/wscript | |
| parent | 520bc1bed49720333eb1a2be3ea0f813ccaac182 (diff) | |
make ardour3 build and link on OS X (tiger, at least)
git-svn-id: svn://localhost/ardour2/branches/3.0@8018 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/wscript')
| -rw-r--r-- | gtk2_ardour/wscript | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index 52a28f286f..c54287e666 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -277,9 +277,10 @@ def build(bld): obj.target = 'ardour-3.0' obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') obj.uselib = 'UUID FLAC GLIBMM GTHREAD GTK GNOMECANVAS OGG ALSA CURL DL' - obj.uselib += ' GTKMM GNOMECANVASMM OSX GTKOSX COREAUDIO' + obj.uselib += ' GTKMM GNOMECANVASMM ' + obj.uselib += ' AUDIOUNITS OSX GTKOSX ' obj.uselib_local = '''libpbd libmidipp libtaglib libardour libardour_cp - libgtkmm2ext libtaglib''' + libgtkmm2ext libappleutility libtaglib''' obj.cflags = ['-DPACKAGE="gtk2_ardour"'] obj.cxxflags = ['-DPACKAGE="gtk2_ardour"'] obj.cxxflags += ['-DVERSIONSTRING="' + bld.env['VERSION'] + '"'] @@ -289,6 +290,7 @@ def build(bld): obj.cxxflags += ['-DLOCALEDIR="' + os.path.join( os.path.normpath(bld.env['DATADIR']), 'locale') + '"'] obj.cxxflags += ['-DPROGRAM_NAME="' + bld.env['PROGRAM_NAME'] + '"'] + obj.cxxflags += ['-I../libs'] if bld.env['HAVE_SLV2']: obj.source += [ 'lv2_plugin_ui.cc' ] @@ -304,14 +306,10 @@ def build(bld): if bld.env['PHONE_HOME']: obj.cxxflags += [ '-DPHONE_HOME' ] - if bld.env['GTKOSX']: + if bld.env['COREAUDIO']: TaskGen.task_gen.mappings['.mm'] = TaskGen.task_gen.mappings['.cc'] - obj.source += [ 'cocoacarbon.mm' ] - - if bld.env['AUDIOUNITS']: - obj.source += [ 'au_pluginui.mm' ] - obj.uselib_local += ' libappleutility ' - + obj.source += [ 'cocoacarbon.mm', 'au_pluginui.mm' ] + obj.uselib_local += ' libappleutility ' else: obj.source += [ 'x11.cc' ] @@ -346,13 +344,13 @@ def build(bld): obj = bld.new_task_gen('subst') obj.source = 'ardev_common.sh.in' obj.target = 'ardev_common_waf.sh' - obj.chmod = 0o755 + obj.chmod = 0755 obj.dict = wrapper_subst_dict obj = bld.new_task_gen('subst') obj.source = 'ardour.sh.in' obj.target = 'ardour3' - obj.chmod = 0o755 + obj.chmod = 0755 obj.dict = wrapper_subst_dict obj.install_path = bld.env['BINDIR'] |