new solo safe/lock button image from oofus (a tad ugly, dare might i say)

[ardour.git] / wscript

diff --git a/wscript b/wscript
index e400b6e198edf5f1b58ed570d52e462e7dab6216..0844e9b0801bea87e2e4d98714da527bd1ce193f 100644 (file)
--- a/wscript
+++ b/wscript
@@ -31,15 +31,12 @@ children = [
         'libs/gtkmm2ext',
         'libs/clearlooks-newer',
         'libs/audiographer',
-        'libs/gnomecanvas',
         'gtk2_ardour',
         'templates',
         'export',
+        'midi_maps'
 ]
 
-#if config[config_arch] != 'apple':
-#  children += [ 'tools/sanity_check' ]
-
 i18n_children = [
         'gtk2_ardour',
         'libs/ardour',
@@ -237,6 +234,7 @@ def set_compiler_flags (conf,opt):
     # check this even if we aren't using FPU optimization
     if not conf.is_defined('HAVE_POSIX_MEMALIGN'):
         optimization_flags.append("-DNO_POSIX_MEMALIGN")
+        debug_flags.append("-DNO_POSIX_MEMALIGN")
 
     # end optimization section
 
@@ -376,8 +374,8 @@ def options(opt):
     opt.add_option('--gprofile', action='store_true', default=False, dest='gprofile',
                     help='Compile for use with gprofile')
     opt.add_option('--lv2', action='store_true', default=False, dest='lv2',
-                    help='Compile with support for LV2 (if SLV2 or Lilv+Suil is available)')
-    opt.add_option('--lxvst', action='store_true', default=False, dest='lxvst',
+                    help='Compile with support for LV2 (if Lilv+Suil is available)')
+    opt.add_option('--lxvst', action='store_true', default=True, dest='lxvst',
                     help='Compile with support for linuxVST plugins')
     opt.add_option('--nls', action='store_true', default=True, dest='nls',
                     help='Enable i18n (native language support) (default)')
@@ -442,9 +440,12 @@ def configure(conf):
 
     if sys.platform == 'darwin':
 
-        conf.define ('AUDIOUNITS', 1)
+        # this is required, potentially, for anything we link and then relocate into a bundle
+        conf.env.append_value('LINKFLAGS', [ '-Xlinker', '-headerpad', '-Xlinker', '2048'])
+
+        conf.define ('HAVE_COREAUDIO', 1)
+        conf.define ('AUDIOUNIT_SUPPORT', 1)
         conf.define ('AU_STATE_SUPPORT', 1)
-        conf.define ('COREAUDIO', 1)
         conf.define ('GTKOSX', 1)
         conf.define ('TOP_MENUBAR',1)
         conf.define ('GTKOSX',1)
@@ -485,11 +486,8 @@ def configure(conf):
         conf.env.append_value('LINKFLAGS_OSX', ['-undefined', 'suppress' ])
         conf.env.append_value('LINKFLAGS_OSX', '-flat_namespace')
 
-        conf.env.append_value('LINKFLAGS_GTKOSX', [ '-Xlinker', '-headerpad'])
-        conf.env.append_value('LINKFLAGS_GTKOSX', ['-Xlinker', '2048'])
-        conf.env.append_value('CPPPATH_GTKOSX', "/System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/Headers/")
-
-        conf.env.append_value('CXXFLAGS_AUDIOUNITS', "-DHAVE_AUDIOUNITS")
+        conf.env.append_value('CXXFLAGS_AUDIOUNITS', "-DAUDIOUNIT_SUPPORT")
+        conf.env.append_value('CXXFLAGS_AUDIOUNITS', "-DAU_STATE_SUPPORT")
         conf.env.append_value('LINKFLAGS_AUDIOUNITS', ['-framework', 'Audiotoolbox', '-framework', 'AudioUnit'])
 
     if Options.options.boost_include != '':
@@ -514,6 +512,7 @@ def configure(conf):
     autowaf.check_pkg(conf, 'gthread-2.0', uselib_store='GTHREAD', atleast_version='2.2')
     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')
 
     for i in children:
         sub_config_and_use(conf, i)
@@ -588,6 +587,8 @@ const char* const ardour_config_info = "\\n\\
 
     write_config_text('Architecture flags',    opts.arch)
     write_config_text('Aubio',                 conf.is_defined('HAVE_AUBIO'))
+    write_config_text('AudioUnits',            conf.is_defined('AUDIOUNIT_SUPPORT'))
+    write_config_text('AU state support',      conf.is_defined('AU_STATE_SUPPORT'))
     write_config_text('Build target',          conf.env['build_target'])
     write_config_text('CoreAudio',             conf.is_defined('HAVE_COREAUDIO'))
     write_config_text('FLAC',                  conf.is_defined('HAVE_FLAC'))
@@ -603,7 +604,7 @@ const char* const ardour_config_info = "\\n\\
     write_config_text('Program name',          opts.program_name)
     write_config_text('Rubberband',            conf.is_defined('HAVE_RUBBERBAND'))
     write_config_text('Samplerate',            conf.is_defined('HAVE_SAMPLERATE'))
-    write_config_text('Soundtouch',            conf.is_defined('HAVE_SOUNDTOUCH'))
+#    write_config_text('Soundtouch',            conf.is_defined('HAVE_SOUNDTOUCH'))
     write_config_text('Translation',           opts.nls)
     write_config_text('Tranzport',             opts.tranzport)
     write_config_text('Unit tests',            conf.is_defined('BUILD_TESTS'))
@@ -658,7 +659,7 @@ def build(bld):
     obj.source       = 'ardour.rc.in'
     obj.target       = 'ardour_system.rc'
     obj.dict         = rc_subst_dict
-    obj.install_path = '${SYSCONF}/ardour3'
+    obj.install_path = '${SYSCONFDIR}/ardour3'
 
 def i18n(bld):
     bld.recurse (i18n_children)