Misc fixes

source/Makefile.mk

@@ -392,6 +392,10 @@ NATIVE_PLUGINS_LIBS  += $(shell pkg-config --libs ntk_images ntk)
 endif
 endif
 
+ifeq ($(EXPERIMENTAL_PLUGINS),true)
+NATIVE_PLUGINS_LIBS  += $(shell pkg-config --libs freetype2 fftw3f x11) -lclthreads -lclxclient
+endif
+
 # --------------------------------------------------------------
 # Set app extension
 

source/native-plugins/Makefile

@@ -223,7 +223,7 @@ $(OBJDIR)/distrho-pingpongpan.cpp.o: distrho-pingpongpan.cpp
 $(OBJDIR)/distrho-prom.cpp.o: distrho-prom.cpp
 	-@mkdir -p $(OBJDIR)
 	@echo "Compiling $<"
-	@$(CXX) $< $(BUILD_CXX_FLAGS) -DDISTRHO_NAMESPACE=DISTRHO_ProM -Idistrho-prom -I$(CWD)/modules/dgl -Wno-effc++ -c -o $@
+	@$(CXX) $< $(BUILD_CXX_FLAGS) $(PROJECTM_FLAGS) -DDISTRHO_NAMESPACE=DISTRHO_ProM -Idistrho-prom -I$(CWD)/modules/dgl -Wno-effc++ -c -o $@
 
 # ----------------------------------------------------------------------------------------------------------------------------
 
@@ -249,6 +249,13 @@ $(OBJDIR)/zynaddsubfx-ui.cpp.o: zynaddsubfx-ui.cpp $(ZYN_UI_FILES_H) $(ZYN_UI_FI
 
 # ----------------------------------------------------------------------------------------------------------------------------
 
+$(OBJDIR)/zita-jaaa.cpp.o: zita-jaaa.cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $<"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) -DVERSION=\"0.8.4\" $(shell pkg-config --cflags freetype2 fftw3f x11) -c -o $@
+
+# ----------------------------------------------------------------------------------------------------------------------------
+
 $(OBJDIR)/%.cpp.o: %.cpp
 	-@mkdir -p $(OBJDIR)
 	@echo "Compiling $<"

source/plugin/carla-base.cpp

@@ -71,6 +71,7 @@ struct PluginListManager {
                 std::strcmp(desc->label, "mverb"        ) == 0 ||
                 std::strcmp(desc->label, "nekobi"       ) == 0 ||
                 std::strcmp(desc->label, "pingpongpan"  ) == 0 ||
+                std::strcmp(desc->label, "prom"         ) == 0 ||
                 std::strcmp(desc->label, "vexsynth"     ) == 0)
             {
                 continue;

source/utils/CarlaMutex.hpp

@@ -223,6 +223,11 @@ public:
             fMutex.unlock();
     }
 
+    bool wasLocked() const noexcept
+    {
+        return fLocked;
+    }
+
 private:
     const Mutex& fMutex;
     const bool   fLocked;