From 6e0c5e6a341babda78341d508840928960909690 Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Sun, 19 May 2024 01:40:02 +0200
Subject: [PATCH] Unify build scripts w/derivative projects

---
 tools/linux_packaging/build   | 2 +-
 tools/linux_packaging/package | 3 ---
 tools/osx_packaging/osx_build | 6 +-----
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build
index c40fd8fba8..5c31814071 100755
--- a/tools/linux_packaging/build
+++ b/tools/linux_packaging/build
@@ -395,7 +395,7 @@ for x in $BUILD_ROOT/../share/osc/*.preset ; do
 done
 
 # Mixbus MixerSettings (if any)
-for x in $BUILD_ROOT/../mixer_settings/*.lua ; do
+for x in $BUILD_ROOT/../share/mixer_settings/*.lua ; do
     mkdir -p $MixerSettings  # create on demand
     cp "$x" $MixerSettings
 done
diff --git a/tools/linux_packaging/package b/tools/linux_packaging/package
index 9ed9ebea1a..3ed82e5638 100755
--- a/tools/linux_packaging/package
+++ b/tools/linux_packaging/package
@@ -34,9 +34,6 @@ while [ $# -gt 0 ] ; do
 	--mixbus)
 		APPNAME=Mixbus ;
 		shift ;;
-	--mixbus32c)
-		APPNAME=Mixbus32C ;
-		shift ;;
 	--livetrax)
 		APPNAME=LiveTrax ;
 		shift ;;
diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build
index c55b804df2..e12f6a361d 100755
--- a/tools/osx_packaging/osx_build
+++ b/tools/osx_packaging/osx_build
@@ -14,7 +14,6 @@ fi
 mkdir -p "$CACHEDIR"
 
 MIXBUS=
-MIXBUS32C=
 WITH_HARVID=1
 WITH_XJADEO=1
 WITH_HARRISON_LV2=
@@ -44,7 +43,6 @@ while [ $# -gt 0 ] ; do
 		WITH_COMMERCIAL_X42_LV2=1
 		WITH_GRATIS_X42_LV2=1
 		WITH_GMSYNTH=1
-		STRIP= ;
 		PRODUCT_PKG_DIR=Mixbus;
 		APPNAME=Mixbus ;
 		BUNDLENAME=Mixbus${major_version} ;
@@ -231,9 +229,7 @@ MAIN_EXECUTABLE=$EXECUTABLE
 
 echo "Copying ardour executable ...."
 cp $BUILD_ROOT/gtk2_ardour/ardour-$release_version $APPROOT/MacOS/$MAIN_EXECUTABLE
-if test x$MIXBUS32C != x ; then
-	cp  Mixbus32C.icns $Resources/appIcon.icns
-elif test x$MIXBUS != x ; then
+if test x$MIXBUS != x ; then
 	cp  Mixbus.icns $Resources/appIcon.icns
 elif test x$LIVETRAX != x ; then
 	cp  LiveTrax.icns $Resources/appIcon.icns