Browse Source

Fix finding binaries in plugin mode

tags/1.9.4
falkTX 10 years ago
parent
commit
9f931e2260
2 changed files with 7 additions and 2 deletions
  1. +6
    -1
      source/carla_shared.py
  2. +1
    -1
      source/plugin/carla-native-lv2-export.cpp

+ 6
- 1
source/carla_shared.py View File

@@ -530,7 +530,12 @@ def initHost(initName, libPrefix = None, failError = True):
gCarla.pathBinaries = os.path.join(libPrefix, "lib", "carla") gCarla.pathBinaries = os.path.join(libPrefix, "lib", "carla")


elif CWDl.endswith("resources"): elif CWDl.endswith("resources"):
gCarla.pathBinaries = os.path.abspath(os.path.join(CWD, ".."))
if CWDl.endswith("native-plugins%sresources" % os.sep):
gCarla.pathBinaries = os.path.abspath(os.path.join(CWD, "..", "..", "..", "..", "bin"))
elif "carla-native.lv2" in sys.argv[0]:
gCarla.pathBinaries = os.path.abspath(os.path.join(CWD, "..", "..", "..", "lib", "lv2", "carla-native.lv2"))
else:
gCarla.pathBinaries = os.path.abspath(os.path.join(CWD, ".."))


elif CWDl.endswith("source"): elif CWDl.endswith("source"):
gCarla.pathBinaries = os.path.abspath(os.path.join(CWD, "..", "bin")) gCarla.pathBinaries = os.path.abspath(os.path.join(CWD, "..", "bin"))


+ 1
- 1
source/plugin/carla-native-lv2-export.cpp View File

@@ -130,7 +130,7 @@ static void writeManifestFile(PluginListManager& plm)
// UI // UI


text += "<http://kxstudio.sf.net/carla/ui>\n"; text += "<http://kxstudio.sf.net/carla/ui>\n";
text += " a <aaf" LV2_EXTERNAL_UI__Widget "zzz> ;\n";
text += " a <" LV2_EXTERNAL_UI__Widget "> ;\n";
text += " ui:binary <carla-native" PLUGIN_EXT "> ;\n"; text += " ui:binary <carla-native" PLUGIN_EXT "> ;\n";
text += " lv2:extensionData ui:idleInterface ,\n"; text += " lv2:extensionData ui:idleInterface ,\n";
text += " ui:showInterface ,\n"; text += " ui:showInterface ,\n";


Loading…
Cancel
Save