diff options
author | Robin Gareus <robin@gareus.org> | 2016-10-14 18:33:16 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2016-10-14 18:36:54 +0200 |
commit | a1a1112998ffe2dd24136da7878e3001c6111d72 (patch) | |
tree | 729598f9cf125c1fdad6a814adf11d9d34e561a9 /session_utils | |
parent | 102547089b9d527723a5732d9f950fedaf65dcf2 (diff) |
include session-utils with windows bundles
Diffstat (limited to 'session_utils')
-rw-r--r-- | session_utils/wscript | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/session_utils/wscript b/session_utils/wscript index 62186345fd..5fe9445426 100644 --- a/session_utils/wscript +++ b/session_utils/wscript @@ -66,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' @@ -82,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']) @@ -95,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' |