Browse Source

Give up trying to merge all into 1 static lib, too much breakage

Signed-off-by: falkTX <falktx@falktx.com>
pull/1775/head
falkTX 1 year ago
parent
commit
04d3e126b4
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 1 additions and 23 deletions
  1. +0
    -9
      source/Makefile.mk
  2. +1
    -14
      source/plugin/Makefile

+ 0
- 9
source/Makefile.mk View File

@@ -304,15 +304,6 @@ else
SILENT = @ SILENT = @
endif endif


# ---------------------------------------------------------------------------------------------------------------------
# Set combined object CLI arg

ifeq ($(MACOS),true)
COMBINE = -r -keep_private_externs
else
COMBINE = -r
endif

# --------------------------------------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------------------------------------
# Set shared library CLI arg # Set shared library CLI arg




+ 1
- 14
source/plugin/Makefile View File

@@ -258,7 +258,7 @@ else
wine: $(BINDIR)/CarlaVstShellBridged.dll.so $(BINDIR)/CarlaVstFxShellBridged.dll.so wine: $(BINDIR)/CarlaVstShellBridged.dll.so $(BINDIR)/CarlaVstFxShellBridged.dll.so
endif 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) $(BINDIR)/carla-native-plugin$(APP_EXT): $(OBJDIR)/carla-native-plugin.cpp.o $(LIBS) $(LIBS_juce)
-@mkdir -p $(BINDIR) -@mkdir -p $(BINDIR)
@echo "Linking carla-native-plugin$(APP_EXT)" @echo "Linking carla-native-plugin$(APP_EXT)"


Loading…
Cancel
Save