Carla build tweaks

data/macos/build.sh

@@ -53,8 +53,7 @@ unset PKG_CONFIG_PATH
 
 rm -rf ./build/Carla
 rm -rf ./build/exe.*
-rm -rf ./build-lv2
-rm -f bin/carla-bridge-lv2-qt5 bin/carla.lv2/carla-bridge-lv2-qt5
+rm -rf ./build/*.lv2
 
 cp ./source/carla               ./source/Carla.pyw
 cp ./bin/resources/carla-plugin ./source/carla-plugin.pyw
@@ -74,6 +73,9 @@ cp     bin/carla-discovery-* build/Carla.app/Contents/MacOS/
 cp -LR bin/resources/*       build/Carla.app/Contents/MacOS/resources/
 cp     bin/styles/*          build/Carla.app/Contents/MacOS/styles/
 
+rm -f build/Carla.app/Contents/MacOS/carla-bridge-lv2-modgui
+rm -f build/Carla.app/Contents/MacOS/carla-bridge-lv2-qt5
+
 find build/ -type f -name "*.py" -delete
 rm build/Carla.app/Contents/MacOS/resources/carla-plugin
 rm build/Carla.app/Contents/MacOS/resources/*-ui
@@ -90,20 +92,22 @@ install_name_tool -change "/opt/carla/lib/QtWidgets.framework/Versions/5/QtWidge
 cd ../../../../..
 
 cp build/carla-plugin.app/Contents/MacOS/carla-plugin build/Carla.app/Contents/MacOS/resources/
-cp build/carla-plugin.app/Contents/MacOS/fcntl.so     build/Carla.app/Contents/MacOS/resources/ || true
+cp build/carla-plugin.app/Contents/MacOS/fcntl.so     build/Carla.app/Contents/MacOS/resources/ 2>/dev/null || true
 cp build/bigmeter-ui.app/Contents/MacOS/bigmeter-ui   build/Carla.app/Contents/MacOS/resources/
 cp build/notes-ui.app/Contents/MacOS/notes-ui         build/Carla.app/Contents/MacOS/resources/
 rm -rf build/carla-plugin.app build/bigmeter-ui.app build/notes-ui.app
 
-mkdir build-lv2
-mkdir build-lv2/carla.lv2
-mkdir build-lv2/carla.lv2/resources
-mkdir build-lv2/carla.lv2/styles
-
-cp bin/carla.lv2/*.*        build-lv2/carla.lv2/
-cp bin/carla-bridge-*       build-lv2/carla.lv2/
-cp bin/carla-discovery-*    build-lv2/carla.lv2/
-cp -LR build/Carla.app/Contents/MacOS/resources/* build-lv2/carla.lv2/resources/
-cp     build/Carla.app/Contents/MacOS/styles/*    build-lv2/carla.lv2/styles/
+mkdir build/carla.lv2
+mkdir build/carla.lv2/resources
+mkdir build/carla.lv2/styles
+
+cp bin/carla.lv2/*.*        build/carla.lv2/
+cp bin/carla-bridge-*       build/carla.lv2/
+cp bin/carla-discovery-*    build/carla.lv2/
+cp bin/libcarla_utils.dylib build/carla.lv2/
+rm -f build/carla.lv2/carla-bridge-lv2-modgui
+rm -f build/carla.lv2/carla-bridge-lv2-qt5
+cp -LR build/Carla.app/Contents/MacOS/resources/* build/carla.lv2/resources/
+cp     build/Carla.app/Contents/MacOS/styles/*    build/carla.lv2/styles/
 
 ##############################################################################################