Unify build-system customization (Ardour/Mixbus)

5 files changed, 25 insertions, 4 deletions

diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index 9b33a01e1a..7064b85004 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -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')
diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build
index d2750c54e5..923a6ea9ea 100755
--- a/tools/linux_packaging/build
+++ b/tools/linux_packaging/build
@@ -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
 
diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build
index 402cad208c..08f47e5cd6 100755
--- a/tools/osx_packaging/osx_build
+++ b/tools/osx_packaging/osx_build
@@ -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
 
diff --git a/tools/x-win/package.sh b/tools/x-win/package.sh
index f5ac7cae43..6e3b6d7df2 100755
--- a/tools/x-win/package.sh
+++ b/tools/x-win/package.sh
@@ -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
 
 
diff --git a/wscript b/wscript
index c5200a92a0..40ce25b290 100644
--- a/wscript
+++ b/wscript
@@ -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',