Browse Source

OSX script updates

tags/1.9.5
falkTX 10 years ago
parent
commit
1eedcfdb25
2 changed files with 17 additions and 12 deletions
  1. +13
    -12
      data/macos/build.sh
  2. +4
    -0
      source/carla_app.py

+ 13
- 12
data/macos/build.sh View File

@@ -48,9 +48,9 @@ unset CXXFLAGS
unset LDLAGS
unset PKG_CONFIG_PATH

rm -rf ./build ./build-lv2
rm -f bin/carla-bridge-lv2-cocoa # TODO
rm -f bin/carla-bridge-lv2-qt5
rm -rf ./build
rm -rf ./build-lv2
rm -f bin/carla-bridge-lv2-qt5 bin/carla.lv2/carla-bridge-lv2-qt5

mkdir build

@@ -75,6 +75,7 @@ cp bin/styles/* build/Carla.app/Contents/MacOS/styles/
find build/ -type f -name "*.py" -delete
rm build/Carla.app/Contents/MacOS/resources/carla-plugin
rm build/Carla.app/Contents/MacOS/resources/*-ui
rm -rf build/Carla.app/Contents/MacOS/resources/__pycache__

cd build/Carla.app/Contents/MacOS/resources/
ln -sf ../*.so* ../Qt* ../imageformats ../platforms .
@@ -93,14 +94,14 @@ cp build/notes-ui.app/Contents/MacOS/notes-ui build/Carla.app/Contents/M
rm -rf build/carla-plugin.app build/bigmeter-ui.app build/notes-ui.app

mkdir build-lv2
mkdir build-lv2/carla-native.lv2
mkdir build-lv2/carla-native.lv2/resources
mkdir build-lv2/carla-native.lv2/styles
cp bin/carla-native.lv2/*.* build-lv2/carla-native.lv2/
cp bin/carla-bridge-* build-lv2/carla-native.lv2/
cp bin/carla-discovery-* build-lv2/carla-native.lv2/
cp -LR build/Carla.app/Contents/MacOS/resources/* build-lv2/carla-native.lv2/resources/
cp build/Carla.app/Contents/MacOS/styles/* build-lv2/carla-native.lv2/styles/
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/

##############################################################################################

+ 4
- 0
source/carla_app.py View File

@@ -91,6 +91,10 @@ class CarlaApplication(object):
self.createApp(appName)
return

# Needed for MacOS LV2 plugin
if MACOS and os.path.exists(CWD):
QApplication.addLibraryPath(CWD)

# base settings
settings = QSettings("falkTX", appName)
useProTheme = settings.value(CARLA_KEY_MAIN_USE_PRO_THEME, CARLA_DEFAULT_MAIN_USE_PRO_THEME, type=bool)


Loading…
Cancel
Save