Revert "Build system changes to support mingw build target"

This reverts commit 94145732f3bd406ec75652117c02c8aaab6777ca.

1 files changed, 5 insertions, 34 deletions

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)