From e307cba9bae76a65fcc32ee77cf84e914bae46f3 Mon Sep 17 00:00:00 2001 From: falkTX Date: Thu, 30 Nov 2017 21:47:56 +0000 Subject: [PATCH] Fix MacOS 32bit bridges build --- source/bridges-plugin/Makefile | 54 +++++++++++++++++++++++++++------- 1 file changed, 44 insertions(+), 10 deletions(-) diff --git a/source/bridges-plugin/Makefile b/source/bridges-plugin/Makefile index df5d11373..7c3af552b 100644 --- a/source/bridges-plugin/Makefile +++ b/source/bridges-plugin/Makefile @@ -251,11 +251,33 @@ $(OBJDIR)/CarlaEng%.cpp.o: $(CWD)/backend/engine/CarlaEng%.cpp # ---------------------------------------------------------------------------------------------------------------------- # posix32 +ifeq ($(MACOS),true) +$(OBJDIR)/CarlaPluginVST2.cpp.posix32.o: $(CWD)/backend/plugin/CarlaPluginVST2.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling CarlaPluginVST2.cpp (posix32 bridge)" + @$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -ObjC++ -c -o $@ + +$(OBJDIR)/CarlaBridgePlugin.cpp.posix32.o: CarlaBridgePlugin.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling $< (posix32 bridge)" + @$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -ObjC++ -c -o $@ + +$(OBJDIR)/CarlaStandalone.cpp.posix32.o: $(CWD)/backend/CarlaStandalone.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling CarlaStandalone.cpp (posix32 bridge)" + @$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -ObjC++ -c -o $@ +else $(OBJDIR)/CarlaBridgePlugin.cpp.posix32.o: CarlaBridgePlugin.cpp -@mkdir -p $(OBJDIR) @echo "Compiling $< (posix32 bridge)" @$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@ +$(OBJDIR)/CarlaStandalone.cpp.posix32.o: $(CWD)/backend/CarlaStandalone.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling CarlaStandalone.cpp (posix32 bridge)" + @$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@ +endif + $(OBJDIR)/CarlaEng%.cpp.posix32.o: $(CWD)/backend/engine/CarlaEng%.cpp -@mkdir -p $(OBJDIR) @echo "Compiling CarlaEng$*.cpp (posix32 bridge)" @@ -266,19 +288,36 @@ $(OBJDIR)/CarlaPlug%.cpp.posix32.o: $(CWD)/backend/plugin/CarlaPlug%.cpp @echo "Compiling CarlaPlug$*.cpp (posix32 bridge)" @$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@ -$(OBJDIR)/CarlaStandalone.cpp.posix32.o: $(CWD)/backend/CarlaStandalone.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling CarlaStandalone.cpp (posix32 bridge)" - @$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@ - # ---------------------------------------------------------------------------------------------------------------------- # posix64 +ifeq ($(MACOS),true) +$(OBJDIR)/CarlaPluginVST2.cpp.posix64.o: $(CWD)/backend/plugin/CarlaPluginVST2.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling CarlaPluginVST2.cpp (posix64 bridge)" + @$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -ObjC++ -c -o $@ + +$(OBJDIR)/CarlaBridgePlugin.cpp.posix64.o: CarlaBridgePlugin.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling $< (posix64 bridge)" + @$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -ObjC++ -c -o $@ + +$(OBJDIR)/CarlaStandalone.cpp.posix64.o: $(CWD)/backend/CarlaStandalone.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling CarlaStandalone.cpp (posix64 bridge)" + @$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -ObjC++ -c -o $@ +else $(OBJDIR)/CarlaBridgePlugin.cpp.posix64.o: CarlaBridgePlugin.cpp -@mkdir -p $(OBJDIR) @echo "Compiling $< (posix64 bridge)" @$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@ +$(OBJDIR)/CarlaStandalone.cpp.posix64.o: $(CWD)/backend/CarlaStandalone.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling CarlaStandalone.cpp (posix64 bridge)" + @$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@ +endif + $(OBJDIR)/CarlaEng%.cpp.posix64.o: $(CWD)/backend/engine/CarlaEng%.cpp -@mkdir -p $(OBJDIR) @echo "Compiling CarlaEng$*.cpp (posix64 bridge)" @@ -289,11 +328,6 @@ $(OBJDIR)/CarlaPlug%.cpp.posix64.o: $(CWD)/backend/plugin/CarlaPlug%.cpp @echo "Compiling CarlaPlug$*.cpp (posix64 bridge)" @$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@ -$(OBJDIR)/CarlaStandalone.cpp.posix64.o: $(CWD)/backend/CarlaStandalone.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling CarlaStandalone.cpp (posix64 bridge)" - @$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@ - # ---------------------------------------------------------------------------------------------------------------------- # win32