Browse Source

Make carla-plugin work for everyone

tags/1.9.4
falkTX 10 years ago
parent
commit
afcec640ca
2 changed files with 14 additions and 6 deletions
  1. +8
    -5
      Makefile
  2. +6
    -1
      source/backend/engine/CarlaEngineNative.cpp

+ 8
- 5
Makefile View File

@@ -237,6 +237,7 @@ install:
install -m 755 \
source/carla \
source/carla-patchbay \
source/carla-plugin \
source/carla-rack \
$(DESTDIR)$(PREFIX)/share/carla/

@@ -246,10 +247,11 @@ install:
install -m 644 source/includes/CarlaDefines.h $(DESTDIR)$(PREFIX)/include/carla/includes/

# Install resources
install -m 644 source/modules/carla_native/resources/*-ui $(DESTDIR)$(PREFIX)/lib/carla/resources/
install -m 644 source/modules/carla_native/resources/*.py $(DESTDIR)$(PREFIX)/lib/carla/resources/
install -m 644 source/modules/carla_native/resources/nekofilter/*.png $(DESTDIR)$(PREFIX)/lib/carla/resources/nekofilter/
install -m 644 source/modules/carla_native/resources/zynaddsubfx/*.png $(DESTDIR)$(PREFIX)/lib/carla/resources/zynaddsubfx/
install -m 755 source/modules/daz-plugins/resources/carla-plugin $(DESTDIR)$(PREFIX)/lib/carla/resources/
install -m 755 source/modules/daz-plugins/resources/*-ui $(DESTDIR)$(PREFIX)/lib/carla/resources/
install -m 644 source/modules/daz-plugins/resources/*.py $(DESTDIR)$(PREFIX)/lib/carla/resources/
install -m 644 source/modules/daz-plugins/resources/nekofilter/*.png $(DESTDIR)$(PREFIX)/lib/carla/resources/nekofilter/
install -m 644 source/modules/daz-plugins/resources/zynaddsubfx/*.png $(DESTDIR)$(PREFIX)/lib/carla/resources/zynaddsubfx/

# Install theme
$(MAKE) STYLES_DIR=$(DESTDIR)$(PREFIX)/lib/carla/styles install-main -C source/modules/theme
@@ -267,7 +269,8 @@ install:

# Set plugin resources
cd $(DESTDIR)$(PREFIX)/lib/lv2/carla-native.lv2/ && \
$(LINK) $(PREFIX)/lib/carla/resources/
$(RM) -r resources && \
$(LINK) $(PREFIX)/lib/carla/resources/ .

# --------------------------------------------------------------



+ 6
- 1
source/backend/engine/CarlaEngineNative.cpp View File

@@ -1169,7 +1169,12 @@ protected:
{
if (show)
{
fUiServer.setData("/home/falktx/FOSS/GIT-mine/Carla/source/carla-plugin", pData->sampleRate, pHost->uiName);
CarlaString path(pHost->resourceDir);
path += "/carla-plugin";

carla_stdout("Trying to start carla-plugin using \"%s\"", path.getBuffer());

fUiServer.setData(path.getBuffer(), pData->sampleRate, pHost->uiName);
fUiServer.start();

for (uint i=0; i < pData->curPluginCount; ++i)


Loading…
Cancel
Save