X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=1626f845569583e1dcc2f6e049f30ff697460570;hb=e73b4e6f559edcb13e1baa403d167aec8d3aff5d;hp=9ffeebd75ec4c0bb9128943faeb87d679c44e582;hpb=c7216e03f1fadfee66f5b378fcbe2be345831666;p=ardour.git diff --git a/wscript b/wscript index 9ffeebd75e..1626f84556 100644 --- a/wscript +++ b/wscript @@ -71,6 +71,8 @@ compiler_flags_dictionaries= { 'ultra-strict' : ['-Wredundant-decls', '-Wstrict-prototypes', '-Wmissing-prototypes'], # Flag to turn on C99 compliance by itself 'c99': '-std=c99', + # Flag to enable AT&T assembler syntax + 'attasm': '-masm=att', }, 'msvc' : { 'debuggable' : ['/DDEBUG', '/Od', '/Zi', '/MDd', '/Gd', '/EHsc'], @@ -128,7 +130,7 @@ clang_darwin_dict['full-optimization'] = [ '-O3', '-ffast-math', '-fstrength-red 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 @@ -370,17 +372,15 @@ int main() { return 0; }''', c_flags.append("-Qunused-arguments") cxx_flags.append("-Qunused-arguments") - if ((re.search ("i[0-9]86", cpu) != None) or (re.search ("x86_64", cpu) != None)) and conf.env['build_target'] != 'none': - + if (re.search ("(i[0-9]86|x86_64|AMD64)", cpu) != None) and conf.env['build_target'] != 'none': # # ARCH_X86 means anything in the x86 family from i386 to x86_64 # the compile-time presence of the macro _LP64 is used to # distingush 32 and 64 bit assembler # - - if (re.search ("(i[0-9]86|x86_64)", cpu) != None): - compiler_flags.append ("-DARCH_X86") + + compiler_flags.append ("-DARCH_X86") if platform == 'linux' : @@ -405,9 +405,19 @@ int main() { return 0; }''', elif cpu == "i686": compiler_flags.append ("-march=i686") - if ((conf.env['build_target'] == 'i686') or (conf.env['build_target'] == 'x86_64')) and build_host_supports_sse: + if not is_clang and ((conf.env['build_target'] == 'i686') or (conf.env['build_target'] == 'x86_64')) and build_host_supports_sse: compiler_flags.extend ([ flags_dict['sse'], flags_dict['fpmath-sse'], flags_dict['xmmintrinsics'] ]) - + + if (conf.env['build_target'] == 'mingw'): + if (re.search ("(x86_64|AMD64)", cpu) != None): + # on Windows sse is supported by 64 bit platforms only + build_host_supports_sse = True + + # mingw GCC compiler to uses at&t (Unix specific) assembler dialect by default + # compiler_flags.append (["--mmnemonic=att", "msyntax=att") + + compiler_flags.extend ([ flags_dict['sse'], flags_dict['fpmath-sse'], flags_dict['xmmintrinsics'], flags_dict['attasm'] ]) + # end of processor-specific section # optimization section @@ -416,7 +426,13 @@ int main() { return 0; }''', compiler_flags.append("-DBUILD_VECLIB_OPTIMIZATIONS"); conf.env.append_value('LINKFLAGS_OSX', ['-framework', 'Accelerate']) elif conf.env['build_target'] == 'i686' or conf.env['build_target'] == 'x86_64': - compiler_flags.append ("-DBUILD_SSE_OPTIMIZATIONS") + compiler_flags.append ("-DBUILD_SSE_OPTIMIZATIONS") + elif conf.env['build_target'] == 'mingw': + # usability of the 64 bit windows assembler depends on the compiler target, + # not the build host, which in turn can only be inferred from the name + # of the compiler. + if re.search ('/^x86_64/', str(conf.env['CC'])): + compiler_flags.append ("-DBUILD_SSE_OPTIMIZATIONS") if not build_host_supports_sse: print("\nWarning: you are building Ardour with SSE support even though your system does not support these instructions. (This may not be an error, especially if you are a package maintainer)") @@ -575,7 +591,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)') @@ -599,8 +615,6 @@ def options(opt): help='Compile for use with gprofile') opt.add_option('--libjack', type='string', default="auto", dest='libjack_link', help='libjack link mode [auto|link|weak]') - opt.add_option('--no-jack-metadata', action='store_false', default=True, dest='libjack_meta', - help='disable support for jack metadata') opt.add_option('--internal-shared-libs', action='store_true', default=True, dest='internal_shared_libs', help='Build internal libs as shared libraries') opt.add_option('--internal-static-libs', action='store_false', dest='internal_shared_libs', @@ -741,9 +755,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) @@ -859,7 +873,7 @@ def configure(conf): autowaf.check_pkg(conf, 'rubberband', uselib_store='RUBBERBAND', mandatory=True) if Options.options.dist_target == 'mingw': - Options.options.fpu_optimization = False + Options.options.fpu_optimization = True conf.env.append_value('CFLAGS', '-DPLATFORM_WINDOWS') conf.env.append_value('CFLAGS', '-DCOMPILER_MINGW') conf.env.append_value('CXXFLAGS', '-DPLATFORM_WINDOWS') @@ -880,6 +894,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') @@ -891,6 +906,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 @@ -1027,7 +1043,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']) @@ -1041,7 +1057,7 @@ const char* const ardour_config_info = "\\n\\ write_config_text('Freedesktop files', opts.freedesktop) write_config_text('JACK Backend', conf.env['BUILD_JACKBACKEND']) write_config_text('Libjack linking', conf.env['libjack_link']) - write_config_text('Libjack metadata', not conf.is_defined('NO_JACK_METADATA')) + write_config_text('Libjack metadata', conf.is_defined ('HAVE_JACK_METADATA')) write_config_text('LV2 UI embedding', conf.is_defined('HAVE_SUIL')) write_config_text('LV2 support', conf.is_defined('LV2_SUPPORT')) write_config_text('LXVST support', conf.is_defined('LXVST_SUPPORT'))