diff --git a/source/Makefile.mk b/source/Makefile.mk index c8d1430a6..a100e3197 100644 --- a/source/Makefile.mk +++ b/source/Makefile.mk @@ -304,15 +304,6 @@ else SILENT = @ endif -# --------------------------------------------------------------------------------------------------------------------- -# Set combined object CLI arg - -ifeq ($(MACOS),true) -COMBINE = -r -keep_private_externs -else -COMBINE = -r -endif - # --------------------------------------------------------------------------------------------------------------------- # Set shared library CLI arg diff --git a/source/plugin/Makefile b/source/plugin/Makefile index c5a6aec41..3b816ec78 100644 --- a/source/plugin/Makefile +++ b/source/plugin/Makefile @@ -258,7 +258,7 @@ else wine: $(BINDIR)/CarlaVstShellBridged.dll.so $(BINDIR)/CarlaVstFxShellBridged.dll.so endif -static: $(BINDIR)/libcarla_host-plugin.a +static: $(OBJDIR)/carla-host-plugin.cpp.o # --------------------------------------------------------------------------------------------------------------------- @@ -301,19 +301,6 @@ $(BINDIR)/libcarla_host-plugin$(LIB_EXT): $(OBJDIR)/carla-host-plugin.cpp.o $(LI # --------------------------------------------------------------------------------------------------------------------- -$(BINDIR)/libcarla_host-plugin.a: $(OBJDIR)/libcarla_host-plugin.o - -@mkdir -p $(BINDIR) - @echo "Creating libcarla_host-plugin.a" - $(SILENT)rm -f $@ - $(SILENT)$(AR) crs $@ $^ - -$(OBJDIR)/libcarla_host-plugin.o: $(OBJDIR)/carla-host-plugin.cpp.o $(LIBS) $(LIBS_juce) - -@mkdir -p $(BINDIR) - @echo "Linking libcarla-host-plugin.o" - $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) $(LIBS_START) $(LIBS) $(LIBS_juce) $(LIBS_END) $(COMBINE) -o $@ - -# --------------------------------------------------------------------------------------------------------------------- - $(BINDIR)/carla-native-plugin$(APP_EXT): $(OBJDIR)/carla-native-plugin.cpp.o $(LIBS) $(LIBS_juce) -@mkdir -p $(BINDIR) @echo "Linking carla-native-plugin$(APP_EXT)"