ardour/livetrax
13
0
Fork 0
Code

Unify build-system customization (Ardour/Mixbus)

Browse Source
This commit is contained in:
Robin Gareus 2019-04-09 13:17:15 +02:00
parent 25eb8ca593
commit e0e5ee0b44
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
5 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gtk2_ardour/wscript
View File

@ -832,6 +832,9 @@ def build(bld):
else:
menus_argv = [ '-E', '-P' ]
if bld.is_defined('MIXBUS'):
menus_argv += [ '-DMIXBUS' ]
if bld.is_defined('PTFORMAT'):
menus_argv += [ '-DPTFORMAT' ]
@ -843,7 +846,7 @@ def build(bld):
obj.command_is_external = True
obj.no_inputs = True
obj.argv = menus_argv
obj.dep_vars = ['PTFORMAT', 'GTKOSX', 'WINDOWS']
obj.dep_vars = ['PTFORMAT', 'MIXBUS', 'WINDOWS']
obj.stdin = program + '.menus.in'
obj.stdout = program + '.menus'
bld.install_files (bld.env['CONFDIR'], program + '.menus')

7
tools/linux_packaging/build
View File

@ -187,6 +187,7 @@ Backends=$APPLIB/backends
Themes=$Shared/themes
Templates=$Shared/templates
PluginMetadata=$Shared/plugin_metadata
MixerSettings=$Shared/mixer_settings
ExportFormats=$Shared/export
Locale=$Shared/locale
MidiMaps=$Shared/midi_maps
@ -398,6 +399,12 @@ for x in $BUILD_ROOT/../osc/*.preset ; do
cp "$x" $OSC
done
# Mixbus MixerSettings (if any)
for x in $BUILD_ROOT/../mixer_settings/*.lua ; do
mkdir -p $MixerSettings # create on demand
cp "$x" $MixerSettings
done
#Session templates
cp -av $BUILD_ROOT/../templates $Templates

7
tools/osx_packaging/osx_build
View File

@ -140,6 +140,7 @@ Panners=$Frameworks/panners
Backends=$Frameworks/backends
MidiMaps=$Shared/midi_maps
PluginMetadata=$Shared/plugin_metadata
MixerSettings=$Shared/mixer_settings
ExportFormats=$Shared/export
Templates=$Shared/templates
PatchFiles=$Shared/patchfiles
@ -385,6 +386,12 @@ for x in $BUILD_ROOT/../osc/*.preset ; do
cp "$x" $OSC
done
# Mixbus MixerSettings (if any)
for x in $BUILD_ROOT/../mixer_settings/*.lua ; do
mkdir -p $MixerSettings # create on demand
cp "$x" $MixerSettings
done
# VAMP plugins that we use
cp $BUILD_ROOT/libs/vamp-plugins/libardourvampplugins.dylib $Frameworks

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

@ -88,7 +88,7 @@ fi
export SRCCACHE
if [ "$(id -u)" = "0" ]; then
apt-get -y install nsis curl
apt-get -y install nsis curl wget
fi

8
wscript
View File

@ -671,11 +671,12 @@ int main() { return 0; }''',
'-DCANVAS_COMPATIBILITY', '-DCANVAS_DEBUG'))
# use sparingly, prefer runtime profile
if Options.options.program_name.lower() == "mixbus":
if Options.options.program_name.lower().startswith('mixbus'):
compiler_flags.append ('-DMIXBUS')
conf.define('MIXBUS', 1)
if Options.options.program_name.lower() == "mixbus32c":
compiler_flags.append ('-DMIXBUS')
conf.define('MIXBUS32C', 1)
compiler_flags.append ('-DMIXBUS32C')
compiler_flags.append ('-DPROGRAM_NAME="' + Options.options.program_name + '"')
@ -1091,6 +1092,9 @@ int main () { int x = SFC_RF64_AUTO_DOWNGRADE; return 0; }
conf.check_cc(function_name='htonl', header_name='winsock2.h', lib='ws2_32')
conf.env.append_value('LIB', 'ws2_32')
conf.env.append_value('LIB', 'winmm')
if Options.options.program_name.lower().startswith('mixbus'):
conf.env.append_value('LIB', 'ole32')
conf.env.append_value('LIB', 'uuid')
# 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',