From 73ef8082132494157cb34b86f0065bc83c1581e3 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Wed, 24 May 2023 04:33:08 +0200
Subject: [PATCH] Cleanup, fix build

Signed-off-by: falkTX <falktx@falktx.com>
---
 source/backend/utils/Makefile  |  1 +
 source/bridges-plugin/Makefile | 68 +++++++++-------------------------
 2 files changed, 18 insertions(+), 51 deletions(-)

diff --git a/source/backend/utils/Makefile b/source/backend/utils/Makefile
index 7b0515ef9..3f31b22f5 100644
--- a/source/backend/utils/Makefile
+++ b/source/backend/utils/Makefile
@@ -102,6 +102,7 @@ ifeq ($(MACOS),true)
 ifeq ($(USING_JUCE),true)
 $(OBJDIR)/CachedPlugins.cpp.o: BUILD_CXX_FLAGS += -std=gnu++14
 endif
+$(OBJDIR)/CarlaUtils.cpp.o: BUILD_CXX_FLAGS += -ObjC++
 $(OBJDIR)/Windows.cpp.o: BUILD_CXX_FLAGS += -ObjC++
 endif
 
diff --git a/source/bridges-plugin/Makefile b/source/bridges-plugin/Makefile
index 140ff62d3..13e374867 100644
--- a/source/bridges-plugin/Makefile
+++ b/source/bridges-plugin/Makefile
@@ -324,67 +324,21 @@ $(BINDIR)/$(MODULENAME)-win64.exe: $(OBJS_win64) $(LIBS_win64)
 # ---------------------------------------------------------------------------------------------------------------------
 # native
 
-$(OBJDIR)/CarlaPluginJSFX.cpp.o: $(CWD)/backend/plugin/CarlaPluginJSFX.cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling CarlaPluginJSFX.cpp (bridge)"
-	@$(CXX) $< $(BUILD_CXX_FLAGS) $(NATIVE_BUILD_FLAGS) $(YSFX_FLAGS) -c -o $@
-
-ifeq ($(MACOS),true)
-$(OBJDIR)/CarlaPluginVST2.cpp.o: $(CWD)/backend/plugin/CarlaPluginVST2.cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling CarlaPluginVST2.cpp (bridge)"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) $(NATIVE_BUILD_FLAGS) -ObjC++ -c -o $@
-
-$(OBJDIR)/CarlaPluginVST3.cpp.o: $(CWD)/backend/plugin/CarlaPluginVST3.cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling CarlaPluginVST3.cpp (bridge)"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) $(NATIVE_BUILD_FLAGS) -ObjC++ -c -o $@
-
-$(OBJDIR)/CarlaPluginCLAP.cpp.o: $(CWD)/backend/plugin/CarlaPluginCLAP.cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling CarlaPluginCLAP.cpp (bridge)"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) $(NATIVE_BUILD_FLAGS) -ObjC++ -c -o $@
-
-$(OBJDIR)/CarlaStandalone.cpp.o: $(CWD)/backend/CarlaStandalone.cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling CarlaStandalone.cpp (bridge)"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) $(NATIVE_BUILD_FLAGS) -ObjC++ -c -o $@
-
-$(OBJDIR)/CarlaBridgePlugin.cpp.o: CarlaBridgePlugin.cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling $<"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) $(NATIVE_BUILD_FLAGS) -ObjC++ -c -o $@
-else
-$(OBJDIR)/CarlaStandalone.cpp.o: $(CWD)/backend/CarlaStandalone.cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling CarlaStandalone.cpp (bridge)"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) $(NATIVE_BUILD_FLAGS) -c -o $@
-
 $(OBJDIR)/CarlaBridgePlugin.cpp.o: CarlaBridgePlugin.cpp
 	-@mkdir -p $(OBJDIR)
 	@echo "Compiling $<"
 	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) $(NATIVE_BUILD_FLAGS) -c -o $@
-endif
-
-ifeq ($(USING_JUCE),true)
-ifeq ($(MACOS),true)
-$(OBJDIR)/CarlaPluginJuce.cpp.o: $(CWD)/backend/plugin/CarlaPluginJuce.cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling CarlaPluginJuce.cpp (bridge)"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) $(NATIVE_BUILD_FLAGS) -ObjC++ -std=gnu++14 -c -o $@
-else
-$(OBJDIR)/CarlaPluginJuce.cpp.o: $(CWD)/backend/plugin/CarlaPluginJuce.cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling CarlaPluginJuce.cpp (bridge)"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) $(NATIVE_BUILD_FLAGS) -std=gnu++14 -c -o $@
-endif
-endif
 
 $(OBJDIR)/CarlaBridgeSingleLV2.cpp.o: CarlaBridgeSingleLV2.cpp
 	-@mkdir -p $(OBJDIR)
 	@echo "Compiling $<"
 	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) $(NATIVE_BUILD_FLAGS) -c -o $@
 
+$(OBJDIR)/CarlaStandalone.cpp.o: $(CWD)/backend/CarlaStandalone.cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling CarlaStandalone.cpp (bridge)"
+	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) $(NATIVE_BUILD_FLAGS) -c -o $@
+
 $(OBJDIR)/CarlaPlug%.cpp.o: $(CWD)/backend/plugin/CarlaPlug%.cpp
 	-@mkdir -p $(OBJDIR)
 	@echo "Compiling CarlaPlug$*.cpp (bridge)"
@@ -395,6 +349,18 @@ $(OBJDIR)/CarlaEng%.cpp.o: $(CWD)/backend/engine/CarlaEng%.cpp
 	@echo "Compiling CarlaEng$*.cpp (bridge)"
 	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) $(NATIVE_BUILD_FLAGS) -c -o $@
 
+$(OBJDIR)/CarlaPluginJSFX.cpp.o BUILD_CXX_FLAGS += $(YSFX_FLAGS)
+$(OBJDIR)/CarlaPluginJuce.cpp.o: BUILD_CXX_FLAGS += -std=gnu++14
+
+ifeq ($(MACOS),true)
+$(OBJDIR)/CarlaPluginCLAP.cpp.o: BUILD_CXX_FLAGS += -ObjC++
+$(OBJDIR)/CarlaPluginJuce.cpp.o: BUILD_CXX_FLAGS += -ObjC++
+$(OBJDIR)/CarlaPluginVST2.cpp.o: BUILD_CXX_FLAGS += -ObjC++
+$(OBJDIR)/CarlaPluginVST3.cpp.o: BUILD_CXX_FLAGS += -ObjC++
+$(OBJDIR)/CarlaStandalone.cpp.o: BUILD_CXX_FLAGS += -ObjC++
+$(OBJDIR)/CarlaBridgePlugin.cpp.o: BUILD_CXX_FLAGS += -ObjC++
+endif
+
 # ---------------------------------------------------------------------------------------------------------------------
 # arm32