From 96ea407d1a308373fe3f375485fe4af2065419c0 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 15 Jul 2013 13:21:22 -0400 Subject: [PATCH] Revert "Build system changes to support mingw build target" This reverts commit 94145732f3bd406ec75652117c02c8aaab6777ca. --- gtk2_ardour/wscript | 8 ++------ libs/ardour/wscript | 9 ++++----- libs/pbd/wscript | 6 ++---- libs/surfaces/wscript | 2 +- libs/taglib/wscript | 1 - wscript | 39 +++++---------------------------------- 6 files changed, 14 insertions(+), 51 deletions(-) diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index 429b8c2dbd..bb4e2035ec 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -266,9 +266,8 @@ def configure(conf): 'gtk2_ardour', conf.env['MAJOR'], conf.env['MINOR'], 0) autowaf.configure(conf) - if Options.options.dist_target == 'auto': - if re.search ("linux", sys.platform) != None: - autowaf.check_pkg(conf, 'alsa', uselib_store='ALSA') + if re.search ("linux", sys.platform) != None: + autowaf.check_pkg(conf, 'alsa', uselib_store='ALSA') # TODO: Insert a sanity check for on OS X to ensure CoreAudio is present @@ -419,9 +418,6 @@ def build(bld): 'libardour_cp', 'libgtkmm2ext', 'libtaglib' ] - if bld.env['build_target'] == 'mingw': - if bld.env['DEBUG'] == False: - obj.linkflags = ['-mwindows'] if sys.platform == 'darwin': obj.use += ' libappleutility' obj.defines = [ diff --git a/libs/ardour/wscript b/libs/ardour/wscript index 0ea3eee036..3afd4ce552 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -238,6 +238,8 @@ def configure(conf): path_prefix + 'version.cc', 'libardour3', conf.env['MAJOR'], conf.env['MINOR'], 0) autowaf.configure(conf) + autowaf.check_pkg(conf, 'aubio', uselib_store='AUBIO', + atleast_version='0.3.2') autowaf.check_pkg(conf, 'jack', uselib_store='JACK', atleast_version='0.118.2') if Options.options.dist_target == 'auto': @@ -247,11 +249,8 @@ def configure(conf): autowaf.check_pkg(conf, 'portaudio-2.0', uselib_store='PORTAUDIO', atleast_version='19') autowaf.check_pkg(conf, 'libxml-2.0', uselib_store='XML') - if Options.options.dist_target != 'mingw': - autowaf.check_pkg(conf, 'lrdf', uselib_store='LRDF', - atleast_version='0.4.0') - autowaf.check_pkg(conf, 'aubio', uselib_store='AUBIO', - atleast_version='0.3.2') + autowaf.check_pkg(conf, 'lrdf', uselib_store='LRDF', + atleast_version='0.4.0') autowaf.check_pkg(conf, 'samplerate', uselib_store='SAMPLERATE', atleast_version='0.1.0') autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP', diff --git a/libs/pbd/wscript b/libs/pbd/wscript index 800b7d3be2..2f93887e62 100644 --- a/libs/pbd/wscript +++ b/libs/pbd/wscript @@ -38,6 +38,7 @@ libpbd_sources = [ 'controllable.cc', 'controllable_descriptor.cc', 'clear_dir.cc', + 'crossthread.cc', 'cpus.cc', 'debug.cc', 'enumwriter.cc', @@ -121,9 +122,6 @@ def build(bld): if bld.is_defined('DEBUG_RT_ALLOC'): obj.source += 'debug_rt_alloc.c' - if bld.env['build_target'] != 'mingw': - obj.source += 'crossthread.cc' - obj.export_includes = ['.'] obj.includes = ['.'] obj.name = 'libpbd' @@ -158,7 +156,7 @@ def build(bld): testobj.uselib = 'CPPUNIT XML SNDFILE' testobj.use = 'libpbd' testobj.name = 'libpbd-tests' - if sys.platform != 'darwin' and bld.env['build_target'] != 'mingw': + if sys.platform != 'darwin': testobj.linkflags = ['-lrt'] diff --git a/libs/surfaces/wscript b/libs/surfaces/wscript index 1b2948c50a..e0e91af725 100644 --- a/libs/surfaces/wscript +++ b/libs/surfaces/wscript @@ -43,7 +43,7 @@ def configure(conf): #if Options.options.tranzport and conf.is_defined('HAVE_USB'): # conf.define('BUILD_TRANZPORT', 1) - if conf.check_cc (header_name='poll.h', define_name='BUILD_MACKIE', mandatory=False): + if conf.check_cc (header_name='poll.h', define_name='BUILD_MACKIE'): sub_config_and_use(conf, 'mackie') if autowaf.check_pkg (conf, 'liblo', mandatory=False, uselib_store="LO", atleast_version="0.24"): diff --git a/libs/taglib/wscript b/libs/taglib/wscript index 8e6fbbbe48..a6994d6391 100644 --- a/libs/taglib/wscript +++ b/libs/taglib/wscript @@ -65,7 +65,6 @@ def build(bld): '''.split() obj.export_includes = ['.', 'taglib', 'taglib/toolkit'] obj.includes = include_dirs - obj.defines = ['MAKE_TAGLIB_LIB'] obj.name = 'libtaglib' obj.target = 'taglib' obj.vnum = LIBTAGLIB_LIB_VERSION diff --git a/wscript b/wscript index a2f470ef03..a6106c0aef 100644 --- a/wscript +++ b/wscript @@ -32,6 +32,7 @@ children = [ 'libs/timecode', 'libs/ardour', 'libs/gtkmm2ext', + 'libs/clearlooks-newer', 'libs/audiographer', 'gtk2_ardour', 'export', @@ -113,7 +114,7 @@ def set_compiler_flags (conf,opt): debug_flags = [ '-pg' ] if opt.backtrace: - if platform != 'darwin' and not is_clang and opt.dist_target != 'mingw': + if platform != 'darwin' and not is_clang: debug_flags = [ '-rdynamic' ] # Autodetect @@ -389,7 +390,7 @@ def options(opt): opt.add_option('--depstack-root', type='string', default='~', dest='depstack_root', help='Directory/folder where dependency stack trees (gtk, a3) can be found (defaults to ~)') opt.add_option('--dist-target', type='string', default='auto', dest='dist_target', - help='Specify the target for cross-compiling [auto,none,x86,i386,i686,x86_64,powerpc,tiger,leopard,mingw]') + help='Specify the target for cross-compiling [auto,none,x86,i386,i686,x86_64,powerpc,tiger,leopard]') opt.add_option('--fpu-optimization', action='store_true', default=True, dest='fpu_optimization', help='Build runtime checked assembler code (default)') opt.add_option('--no-fpu-optimization', action='store_false', dest='fpu_optimization') @@ -409,7 +410,7 @@ def options(opt): help='Compile with support for LV2 (if Lilv+Suil is available)') opt.add_option('--no-lv2', action='store_false', dest='lv2', help='Do not compile with support for LV2') - opt.add_option('--lxvst', action='store_true', default=False, dest='lxvst', + opt.add_option('--lxvst', action='store_true', default=lxvst_default, 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)') @@ -605,21 +606,7 @@ def configure(conf): autowaf.check_pkg(conf, 'libcurl', uselib_store='CURL', atleast_version='7.0.0') autowaf.check_pkg(conf, 'liblo', uselib_store='LO', atleast_version='0.26') - if Options.options.dist_target == 'mingw': - Options.options.fpu_optimization = False - conf.env.append_value('LIB', 'pthreadGC2') - # needed for at least libsmf - conf.check_cc(function_name='htonl', header_name='winsock2.h', lib='ws2_32') - conf.env.append_value('LIB', 'ws2_32') - # needed for mingw64 packages, not harmful on normal mingw build - conf.env.append_value('LIB', 'intl') - conf.check_cc(function_name='regcomp', header_name='regex.h', - lib='regex', uselib_store="REGEX", define_name='HAVE_REGEX_H') - # TODO put this only where it is needed - conf.env.append_value('LIB', 'regex') - - if Options.options.dist_target != 'mingw': - conf.check_cc(function_name='dlopen', header_name='dlfcn.h', lib='dl', uselib_store='DL') + conf.check_cc(function_name='dlopen', header_name='dlfcn.h', lib='dl', uselib_store='DL') # Tell everyone that this is a waf build @@ -672,14 +659,6 @@ def configure(conf): set_compiler_flags (conf, Options.options) - if sys.platform == 'darwin': - sub_config_and_use(conf, 'libs/appleutility') - elif Options.options.dist_target != 'mingw': - sub_config_and_use(conf, 'tools/sanity_check') - - if Options.options.dist_target != 'mingw': - sub_config_and_use(conf, 'libs/clearlooks-newer') - for i in children: sub_config_and_use(conf, i) @@ -763,14 +742,6 @@ def build(bld): autowaf.set_recursive() - if sys.platform == 'darwin': - bld.recurse('libs/appleutility') - elif bld.env['build_target'] != 'mingw': - bld.recurse('tools/sanity_check') - - if bld.env['build_target'] != 'mingw': - bld.recurse('libs/clearlooks-newer') - for i in children: bld.recurse(i)