diff --git a/source/carla_shared.py b/source/carla_shared.py index f892f3049..c8551755b 100644 --- a/source/carla_shared.py +++ b/source/carla_shared.py @@ -530,7 +530,12 @@ def initHost(initName, libPrefix = None, failError = True): gCarla.pathBinaries = os.path.join(libPrefix, "lib", "carla") 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"): gCarla.pathBinaries = os.path.abspath(os.path.join(CWD, "..", "bin")) diff --git a/source/plugin/carla-native-lv2-export.cpp b/source/plugin/carla-native-lv2-export.cpp index 994a92c41..f14f4f924 100644 --- a/source/plugin/carla-native-lv2-export.cpp +++ b/source/plugin/carla-native-lv2-export.cpp @@ -130,7 +130,7 @@ static void writeManifestFile(PluginListManager& plm) // UI text += "\n"; - text += " a ;\n"; + text += " a <" LV2_EXTERNAL_UI__Widget "> ;\n"; text += " ui:binary ;\n"; text += " lv2:extensionData ui:idleInterface ,\n"; text += " ui:showInterface ,\n";