diff --git a/.gitmodules b/.gitmodules index fa9bd38..8460a09 100644 --- a/.gitmodules +++ b/.gitmodules @@ -261,6 +261,3 @@ path = plugins/admiral url = https://github.com/wapiflapi/admiral.git -[submodule "plugins/OptikEcho"] - path = plugins/OptikEcho - url = https://github.com/gregh3285/OptikEcho.git diff --git a/plugins/Makefile b/plugins/Makefile index 351f99d..58bd300 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -954,10 +954,6 @@ PLUGIN_FILES += $(filter-out myth-modules/src/plugin.cpp,$(wildcard myth-modules # Nonlinear Circuits PLUGIN_FILES += $(filter-out nonlinearcircuits/src/NLC.cpp,$(wildcard nonlinearcircuits/src/*.cpp)) -# -------------------------------------------------------------- -# OptikEcho - -PLUGIN_FILES += $(filter-out OptikEcho/src/plugin.cpp,$(wildcard OptikEcho/src/*.cpp)) # -------------------------------------------------------------- # Orbits @@ -2659,13 +2655,6 @@ $(BUILD_DIR)/nonlinearcircuits/%.cpp.o: nonlinearcircuits/%.cpp $(foreach m,$(NONLINEARCIRCUITS_CUSTOM),$(call custom_module_names,$(m),nonlinearcircuits)) \ -DpluginInstance=pluginInstance__nonlinearcircuits -$(BUILD_DIR)/OptikEcho/%.cpp.o: OptikEcho/%.cpp - -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" - @echo "Compiling $<" - $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ - $(foreach m,$(OPTIKTCHO_CUSTOM),$(call custom_module_names,$(m),OptikEcho)) \ - -DpluginInstance=pluginInstance__OptikEcho - $(BUILD_DIR)/Orbits/%.cpp.o: Orbits/%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" diff --git a/plugins/OptikEcho b/plugins/OptikEcho deleted file mode 160000 index 9735178..0000000 --- a/plugins/OptikEcho +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9735178461b950e09159fb0696f817612047c86a diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index b30329c..a702023 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -785,12 +785,6 @@ extern Model* modelBlankPanel; // Nonlinear Circuits #include "nonlinearcircuits/src/NLC.hpp" -// OptikEcho -/* Does not define the file in plugin.hpp -// #include "OptikEcho/src/plugin.hpp" -*/ -extern Model* modelInterferometer; - // Orbits #include "Orbits/src/plugin.hpp" @@ -985,7 +979,6 @@ Plugin* pluginInstance__MSM; Plugin* pluginInstance__MUS_X; Plugin* pluginInstance__myth_modules; Plugin* pluginInstance__nonlinearcircuits; -Plugin* pluginInstance__OptikEcho; Plugin* pluginInstance__Orbits; Plugin* pluginInstance__ParableInstruments; Plugin* pluginInstance__PathSet; @@ -2991,18 +2984,6 @@ static void initStatic__nonlinearcircuits() } } -static void initStatic__OptikEcho() -{ - Plugin* const p = new Plugin; - pluginInstance__OptikEcho = p; - - const StaticPluginLoader spl(p, "OptikEcho"); - if (spl.ok()) - { - p->addModel(modelInterferometer); - } -} - static void initStatic__Orbits() { Plugin* const p = new Plugin; @@ -3614,7 +3595,6 @@ void initStaticPlugins() initStatic__MUS_X(); initStatic__myth_modules(); initStatic__nonlinearcircuits(); - initStatic__OptikEcho(); initStatic__Orbits(); initStatic__ParableInstruments(); initStatic__PathSet();