ardour/livetrax
13
0
Fork 0
Code

include session-utils with windows bundles

Browse Source
This commit is contained in:
Robin Gareus 2016-10-14 18:33:16 +02:00
parent 102547089b
commit a1a1112998
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
session_utils/wscript
View File

@ -66,8 +66,7 @@ def build_ardour_util(bld, util):
obj.includes += ['../libs'] obj.includes += ['../libs']
if bld.env['build_target'] == 'mingw': if bld.env['build_target'] == 'mingw':
if bld.env['DEBUG'] == False: obj.install_path = bld.env['BINDIR']
obj.linkflags = ['-mwindows']
if bld.is_defined('NEED_INTL'): if bld.is_defined('NEED_INTL'):
obj.linkflags = ' -lintl' obj.linkflags = ' -lintl'
@ -82,12 +81,6 @@ def build(bld):
if bld.is_defined('WINDOWS_VST_SUPPORT') and bld.env['build_target'] != 'mingw': if bld.is_defined('WINDOWS_VST_SUPPORT') and bld.env['build_target'] != 'mingw':
return 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']) pgmprefix = bld.env['PROGRAM_NAME'].lower() + str(bld.env['MAJOR'])
utils = bld.path.ant_glob('*.cc', excl=['example.cc', 'common.cc']) utils = bld.path.ant_glob('*.cc', excl=['example.cc', 'common.cc'])
@ -95,7 +88,11 @@ def build(bld):
for util in utils: for util in utils:
fn = str(util)[:-3] fn = str(util)[:-3]
build_ardour_util(bld, fn) 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 = bld(features = 'subst')
obj.source = 'ardour-util.sh.in' obj.source = 'ardour-util.sh.in'

1
tools/x-win/package.sh
View File

@ -139,6 +139,7 @@ cp build/libs/pbd/pbd-*.dll $DESTDIR/bin/
cp build/libs/ptformat/ptformat-*.dll $DESTDIR/bin/ cp build/libs/ptformat/ptformat-*.dll $DESTDIR/bin/
cp build/libs/audiographer/audiographer-*.dll $DESTDIR/bin/ cp build/libs/audiographer/audiographer-*.dll $DESTDIR/bin/
cp build/libs/fst/ardour-vst-scanner.exe $DESTDIR/bin/ || true cp build/libs/fst/ardour-vst-scanner.exe $DESTDIR/bin/ || true
cp build/session_utils/*-*.exe $DESTDIR/bin/ || true
cp `ls -t build/gtk2_ardour/ardour-*.exe | head -n1` $DESTDIR/bin/${PRODUCT_EXE} cp `ls -t build/gtk2_ardour/ardour-*.exe | head -n1` $DESTDIR/bin/${PRODUCT_EXE}
mkdir -p $DESTDIR/lib/gtk-2.0/engines mkdir -p $DESTDIR/lib/gtk-2.0/engines