diff --git a/Makefile b/Makefile index 3f785f0..21cb1c8 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,8 @@ foobar: foo_input_$(PLUGIN_NAME).dll clap: $(PLUGIN_NAME).clap +clapdebug: $(PLUGIN_NAME)_d.clap + seq2wav/src: git submodule update --init --recursive @@ -82,6 +84,9 @@ endif $(PLUGIN_NAME).clap: $(PLUGIN_NAME)$(EXE) seq2wav/$(BUILDPATH)/libseq2wav.a plugins/Makefile config.mak plugins/s2wplugin.cpp $(MAKE) -C plugins ../$@ +$(PLUGIN_NAME)_d.clap: $(PLUGIN_NAME)_d$(EXE) seq2wav/$(BUILDPATH)/libseq2wav_d.a plugins/Makefile config.mak plugins/s2wplugin.cpp + $(MAKE) -C plugins ../$@ + guiclean: FORCE -[ -f gui/Makefile ] && $(MAKE) -C gui distclean -[ -f gui/Makefile.debug ] && $(MAKE) -C gui -f Makefile.debug distclean diff --git a/plugins/Makefile b/plugins/Makefile index 20768cf..734f53a 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -21,4 +21,7 @@ OBJS_D = $(filter-out ../$(BUILDPATH)/gui/% ../$(BUILDPATH)/gui_d/% ../$(BUILDPA ../$(PLUGIN_NAME).clap: $(OBJS_R) ../seq2wav/$(BUILDPATH)/libseq2wav.a $(wildcard ../seq2wav/src/plugins/*.h) s2wplugin.cpp ../seq2wav/src/plugin/clapplugin.cpp Makefile $(CXX) -shared -o $@ $(CXXFLAGS_R) -DBUILD_CLAP -Iclap/include s2wplugin.cpp ../seq2wav/src/plugin/clapplugin.cpp $(OBJS_R) $(LDFLAGS_R) +../$(PLUGIN_NAME)_d.clap: $(OBJS_D) ../seq2wav/$(BUILDPATH)/libseq2wav_d.a $(wildcard ../seq2wav/src/plugins/*.h) s2wplugin.cpp ../seq2wav/src/plugin/clapplugin.cpp Makefile + $(CXX) -shared -o $@ $(CXXFLAGS_D) -DBUILD_CLAP -Iclap/include s2wplugin.cpp ../seq2wav/src/plugin/clapplugin.cpp $(OBJS_D) $(LDFLAGS_D) + FORCE: diff --git a/seq2wav b/seq2wav index dd01139..cef44be 160000 --- a/seq2wav +++ b/seq2wav @@ -1 +1 @@ -Subproject commit dd011390926e3db23df81da3d57f61c369e631a1 +Subproject commit cef44be4a2b7a03021863615674eaf2f7afa1252 diff --git a/src/actions/synth.cpp b/src/actions/synth.cpp index 4993f9d..9daa093 100644 --- a/src/actions/synth.cpp +++ b/src/actions/synth.cpp @@ -60,7 +60,7 @@ DSEContext* prepareSynthContext(S2WContext* ctx, std::istream& inputFile, const } catch (...) { // If the paired file doesn't exist or can't be parsed, it'll throw } - std::unique_ptr dseFile(new DSEFile(ctx, readFile(inputFile), 0)); + std::unique_ptr dseFile(new DSEFile(ctx, readFile(inputFile, inputPath), 0)); std::unique_ptr context(new DSEContext(ctx, sampleRate, std::move(dseFile), std::move(pairFile), bankFile)); if (ctx->isDawPlugin) {