Merge branch 'master' into saveas

[ardour.git] / wscript

diff --git a/wscript b/wscript
index 5e9b30b6c6a3f7d03fbe165f8ac5de463e6b9c10..bb3157434df6fbf8d634967af2ec8324a15aff10 100644 (file)
--- a/wscript
+++ b/wscript
@@ -124,10 +124,11 @@ compiler_flags_dictionaries['clang'] = clang_dict;
 
 clang_darwin_dict = compiler_flags_dictionaries['clang'].copy();
 clang_darwin_dict['cxx-strict'] = [ '-ansi', '-Wnon-virtual-dtor', '-Woverloaded-virtual', ]
+clang_darwin_dict['full-optimization'] = [ '-O3', '-ffast-math', '-fstrength-reduce' ]
 compiler_flags_dictionaries['clang-darwin'] = clang_darwin_dict;
 
 def fetch_git_revision ():
-    cmd = "git describe HEAD"
+    cmd = "git describe HEAD | sed 's/^[A-Za-z]*+//'"
     output = subprocess.Popen(cmd, shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].splitlines()
     rev = output[0].decode ('utf-8')
     return rev
@@ -196,6 +197,7 @@ children = [
         'libs/fst',
         'libs/vfork',
         'libs/ardouralsautil',
+        'cfgtool',
 ]
 
 i18n_children = [
@@ -573,7 +575,7 @@ def options(opt):
                     help='Architecture-specific compiler FLAGS')
     opt.add_option('--with-backends', type='string', action='store', default='jack', dest='with_backends',
                     help='Specify which backend modules are to be included(jack,alsa,wavesaudio,dummy,coreaudio)')
-    opt.add_option('--backtrace', action='store_true', default=True, dest='backtrace',
+    opt.add_option('--backtrace', action='store_true', default=False, dest='backtrace',
                     help='Compile with -rdynamic -- allow obtaining backtraces from within Ardour')
     opt.add_option('--no-carbon', action='store_true', default=False, dest='nocarbon',
                     help='Compile without support for AU Plugins with only CARBON UI (needed for 64bit)')
@@ -739,9 +741,9 @@ def configure(conf):
         autowaf.display_msg(conf, 'Will build against private Ardour dependency stack', 'no')
         
     if Options.options.freebie:
-        conf.env.append_value ('CFLAGS', '-DNO_PLUGIN_STATE')
-        conf.env.append_value ('CXXFLAGS', '-DNO_PLUGIN_STATE')
-        conf.define ('NO_PLUGIN_STATE', 1)
+        conf.env.append_value ('CFLAGS', '-DSILENCE_AFTER')
+        conf.env.append_value ('CXXFLAGS', '-DSILENCE_AFTER')
+        conf.define ('FREEBIE', 1)
 
     if Options.options.trx_build:
         conf.define ('TRX_BUILD', 1)
@@ -878,6 +880,7 @@ def configure(conf):
         # see http://gareus.org/wiki/ardour_windows_gdk_and_cairo
         conf.env.append_value('CFLAGS', '-DUSE_CAIRO_IMAGE_SURFACE')
         conf.env.append_value('CXXFLAGS', '-DUSE_CAIRO_IMAGE_SURFACE')
+        conf.define ('WINDOWS', 1)
 
     if Options.options.dist_target == 'msvc':
         conf.env.append_value('CFLAGS', '-DPLATFORM_WINDOWS')
@@ -889,6 +892,7 @@ def configure(conf):
         conf.env.append_value('CFLAGS', '-DUSE_CAIRO_IMAGE_SURFACE')
         conf.env.append_value('CXXFLAGS', '-DUSE_CAIRO_IMAGE_SURFACE')
         # MORE STUFF PROBABLY NEEDED HERE
+        conf.define ('WINDOWS', 1)
         
     # Tell everyone that this is a waf build
 
@@ -1025,7 +1029,7 @@ 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('No plugin state',       conf.is_defined('NO_PLUGIN_STATE'))
+    write_config_text('Free/Demo copy',        conf.is_defined('FREEBIE'))
     write_config_text('Build target',          conf.env['build_target'])
     write_config_text('CoreAudio',             conf.is_defined('HAVE_COREAUDIO'))
     write_config_text('CoreAudio/Midi Backend',conf.env['BUILD_CORECRAPPITA'])