X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=session_utils%2Fwscript;h=5fe944542601861bdcafb17b47ccb2e26e8bc445;hb=ebc8e352bfb743b8239b1738208254ba904386f8;hp=a001fb9cd73cffeee12882a55e7b385d71c34d05;hpb=47c08a36eb117a94c53aff2e4499d11afb8e6a91;p=ardour.git

diff --git a/session_utils/wscript b/session_utils/wscript
index a001fb9cd7..5fe9445426 100644
--- a/session_utils/wscript
+++ b/session_utils/wscript
@@ -48,13 +48,14 @@ def build_ardour_util(bld, util):
                      ]
     obj.defines = [
         'VERSIONSTRING="' + str(bld.env['VERSION']) + '"',
+        'UTILNAME="'   + str(pgmprefix + '-' + util) + '"',
         'DATA_DIR="'   + os.path.normpath(bld.env['DATADIR']) + '"',
         'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"',
         'LOCALEDIR="'  + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"',
         'PACKAGE="'    + "ARDOURUTILS" + '"',
         ]
     obj.install_path = bld.env['LIBDIR'] + '/utils'
-    obj.uselib       = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD OGG CURL DL'
+    obj.uselib       = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD OGG CURL DL XML'
     obj.uselib       += ' FFTW3F'
     obj.uselib       += ' AUDIOUNITS OSX LO '
     obj.uselib       += ' TAGLIB '
@@ -65,8 +66,7 @@ def build_ardour_util(bld, util):
     obj.includes += ['../libs']
 
     if bld.env['build_target'] == 'mingw':
-        if bld.env['DEBUG'] == False:
-            obj.linkflags = ['-mwindows']
+        obj.install_path = bld.env['BINDIR']
 
     if bld.is_defined('NEED_INTL'):
         obj.linkflags = ' -lintl'
@@ -81,12 +81,6 @@ def build(bld):
     if bld.is_defined('WINDOWS_VST_SUPPORT') and bld.env['build_target'] != 'mingw':
         return
 
-    # don't build/install windows version just yet.
-    # tools/x-win/package.sh uses 'waf install'. The symlinks
-    # and shell wrapper script won't work on windows.
-    if bld.env['build_target'] == 'mingw':
-        return
-
     pgmprefix = bld.env['PROGRAM_NAME'].lower() + str(bld.env['MAJOR'])
 
     utils = bld.path.ant_glob('*.cc', excl=['example.cc', 'common.cc'])
@@ -94,7 +88,11 @@ def build(bld):
     for util in utils:
         fn = str(util)[:-3]
         build_ardour_util(bld, fn)
-        bld.symlink_as(bld.env['BINDIR'] + '/' + pgmprefix + "-" + fn, bld.env['LIBDIR'] + '/utils/ardour-util.sh')
+        if bld.env['build_target'] != 'mingw':
+            bld.symlink_as(bld.env['BINDIR'] + '/' + pgmprefix + "-" + fn, bld.env['LIBDIR'] + '/utils/ardour-util.sh')
+
+    if bld.env['build_target'] == 'mingw':
+        return
 
     obj              = bld(features = 'subst')
     obj.source       = 'ardour-util.sh.in'