Browse Source

Add AnimatedCircuits, for ABI on plugins (okay since static builds)

tags/22.02
falkTX 3 years ago
parent
commit
27c10e10e0
6 changed files with 40 additions and 4 deletions
  1. +3
    -0
      .gitmodules
  2. +1
    -1
      dpf
  3. +1
    -0
      plugins/AnimatedCircuits
  4. +10
    -0
      plugins/Makefile
  5. +23
    -3
      plugins/plugins.cpp
  6. +2
    -0
      src/Makefile

+ 3
- 0
.gitmodules View File

@@ -19,3 +19,6 @@
[submodule "plugins/AudibleInstruments"]
path = plugins/AudibleInstruments
url = https://github.com/VCVRack/AudibleInstruments.git
[submodule "plugins/AnimatedCircuits"]
path = plugins/AnimatedCircuits
url = https://github.com/AnimatedCircuits/RackModules.git

+ 1
- 1
dpf

@@ -1 +1 @@
Subproject commit 2f1b5127cc2da84e3c3f155808efb34d650b3489
Subproject commit 2ebf89eef32bc81210c75aa1c572cb32c5e052bc

+ 1
- 0
plugins/AnimatedCircuits

@@ -0,0 +1 @@
Subproject commit 7c64770febc78a56d8db10fb87caf3a07990f7a4

+ 10
- 0
plugins/Makefile View File

@@ -19,6 +19,11 @@ include ../dpf/Makefile.base.mk

PLUGIN_FILES = plugins.cpp

# --------------------------------------------------------------
# AnimatedCircuits

PLUGIN_FILES += $(wildcard AnimatedCircuits/src/Folding/*.cpp)

# --------------------------------------------------------------
# AudibleInstruments

@@ -220,6 +225,11 @@ $(BUILD_DIR)/plugins.cpp.o: plugins.cpp
@echo "Compiling $<"
$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@

$(BUILD_DIR)/AnimatedCircuits/%.cpp.o: AnimatedCircuits/%.cpp
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@echo "Compiling $<"
$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -DpluginInstance=pluginInstance__AnimatedCircuits -c -o $@

$(BUILD_DIR)/AudibleInstruments/%.cc.o: AudibleInstruments/%.cc
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@echo "Compiling $<"


+ 23
- 3
plugins/plugins.cpp View File

@@ -19,10 +19,12 @@

#include "DistrhoUtils.hpp"

#include "AnimatedCircuits/src/plugin.hpp"
#include "AudibleInstruments/src/plugin.hpp"
#include "Befaco/src/plugin.hpp"
#include "Fundamental/src/plugin.hpp"

Plugin* pluginInstance__AnimatedCircuits;
Plugin* pluginInstance__AudibleInstruments;
Plugin* pluginInstance__Befaco;
Plugin* pluginInstance__Fundamental;
@@ -56,6 +58,11 @@ struct StaticPluginLoader {
d_stderr2("JSON parsing error at %s %d:%d %s", manifestFilename.c_str(), error.line, error.column, error.text);
return;
}

// force ABI, we use static plugins so this doesnt matter as long as it builds
json_t* const version = json_string((APP_VERSION_MAJOR + ".0").c_str());
json_object_set(rootJ, "version", version);
json_decref(version);
}

~StaticPluginLoader()
@@ -77,9 +84,21 @@ struct StaticPluginLoader {
}
};

static void initStatic__AnimatedCircuits()
{
Plugin* p = new Plugin;
pluginInstance__AnimatedCircuits = p;

const StaticPluginLoader spl(p, "AnimatedCircuits");
if (spl.ok())
{
p->addModel(model_AC_Folding);
}
}

static void initStatic__AudibleInstruments()
{
Plugin* p = new Plugin;
Plugin* p = new Plugin;
pluginInstance__AudibleInstruments = p;

const StaticPluginLoader spl(p, "AudibleInstruments");
@@ -110,7 +129,7 @@ static void initStatic__AudibleInstruments()

static void initStatic__Befaco()
{
Plugin* p = new Plugin;
Plugin* p = new Plugin;
pluginInstance__Befaco = p;

const StaticPluginLoader spl(p, "Befaco");
@@ -128,7 +147,7 @@ static void initStatic__Befaco()

static void initStatic__Fundamental()
{
Plugin* p = new Plugin;
Plugin* p = new Plugin;
pluginInstance__Fundamental = p;

const StaticPluginLoader spl(p, "Fundamental");
@@ -166,6 +185,7 @@ static void initStatic__Fundamental()

void initStaticPlugins()
{
initStatic__AnimatedCircuits();
initStatic__AudibleInstruments();
initStatic__Befaco();
initStatic__Fundamental();


+ 2
- 0
src/Makefile View File

@@ -64,6 +64,8 @@ EXTRA_LIBS += Rack/dep/lib/libarchive.a
endif
EXTRA_LIBS += Rack/dep/lib/libzstd.a

EXTRA_DEPENDENCIES = $(EXTRA_LIBS)

# --------------------------------------------------------------
# Do some magic



Loading…
Cancel
Save