From b707da2ec9d55f7f3fbc6da3a1383abccd408a44 Mon Sep 17 00:00:00 2001 From: Steven Atkinson Date: Tue, 13 Jan 2026 15:08:47 -0800 Subject: [PATCH 01/18] Update core to current 0.4.0 work in progress --- .../project.pbxproj | 46 +++++++++++++++++++ NeuralAmpModelerCore | 2 +- 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/project.pbxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/project.pbxproj index 9ee8d2eb8..4631b33c2 100644 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/project.pbxproj +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/project.pbxproj @@ -137,6 +137,26 @@ 4F2FB19C2A0047430027AB66 /* convnet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB14B2A0047420027AB66 /* convnet.cpp */; }; 4F2FB19D2A0047430027AB66 /* convnet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB14B2A0047420027AB66 /* convnet.cpp */; }; 4F2FB19E2A0047430027AB66 /* convnet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB14B2A0047420027AB66 /* convnet.cpp */; }; + 4F2FB1CE2A0047430027AB66 /* conv1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB1562A0047420027AB67 /* conv1d.cpp */; }; + 4F2FB1CF2A0047430027AB66 /* conv1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB1562A0047420027AB67 /* conv1d.cpp */; }; + 4F2FB1D02A0047430027AB66 /* conv1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB1562A0047420027AB67 /* conv1d.cpp */; }; + 4F2FB1D12A0047430027AB66 /* conv1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB1562A0047420027AB67 /* conv1d.cpp */; }; + 4F2FB1D22A0047430027AB66 /* conv1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB1562A0047420027AB67 /* conv1d.cpp */; }; + 4F2FB1D32A0047430027AB66 /* conv1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB1562A0047420027AB67 /* conv1d.cpp */; }; + 4F2FB1D42A0047430027AB66 /* conv1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB1562A0047420027AB67 /* conv1d.cpp */; }; + 4F2FB1D52A0047430027AB66 /* conv1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB1562A0047420027AB67 /* conv1d.cpp */; }; + 4F2FB1D62A0047430027AB66 /* conv1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB1562A0047420027AB67 /* conv1d.cpp */; }; + 4F2FB1D72A0047430027AB66 /* conv1d.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F2FB1572A0047420027AB67 /* conv1d.h */; }; + 4F2FB1D82A0047430027AB66 /* ring_buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB1582A0047420027AB67 /* ring_buffer.cpp */; }; + 4F2FB1D92A0047430027AB66 /* ring_buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB1582A0047420027AB67 /* ring_buffer.cpp */; }; + 4F2FB1DA2A0047430027AB66 /* ring_buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB1582A0047420027AB67 /* ring_buffer.cpp */; }; + 4F2FB1DB2A0047430027AB66 /* ring_buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB1582A0047420027AB67 /* ring_buffer.cpp */; }; + 4F2FB1DC2A0047430027AB66 /* ring_buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB1582A0047420027AB67 /* ring_buffer.cpp */; }; + 4F2FB1DD2A0047430027AB66 /* ring_buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB1582A0047420027AB67 /* ring_buffer.cpp */; }; + 4F2FB1DE2A0047430027AB66 /* ring_buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB1582A0047420027AB67 /* ring_buffer.cpp */; }; + 4F2FB1DF2A0047430027AB66 /* ring_buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB1582A0047420027AB67 /* ring_buffer.cpp */; }; + 4F2FB1E02A0047430027AB66 /* ring_buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB1582A0047420027AB67 /* ring_buffer.cpp */; }; + 4F2FB1E12A0047430027AB66 /* ring_buffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F2FB1592A0047420027AB67 /* ring_buffer.h */; }; 4F2FB19F2A0047430027AB66 /* convnet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB14B2A0047420027AB66 /* convnet.cpp */; }; 4F2FB1A02A0047430027AB66 /* convnet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB14B2A0047420027AB66 /* convnet.cpp */; }; 4F2FB1A12A0047430027AB66 /* convnet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB14B2A0047420027AB66 /* convnet.cpp */; }; @@ -668,6 +688,10 @@ 4F2FB1492A0047420027AB66 /* convnet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = convnet.h; sourceTree = ""; }; 4F2FB14A2A0047420027AB66 /* lstm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lstm.h; sourceTree = ""; }; 4F2FB14B2A0047420027AB66 /* convnet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = convnet.cpp; sourceTree = ""; }; + 4F2FB1562A0047420027AB67 /* conv1d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = conv1d.cpp; sourceTree = ""; }; + 4F2FB1572A0047420027AB67 /* conv1d.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = conv1d.h; sourceTree = ""; }; + 4F2FB1582A0047420027AB67 /* ring_buffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ring_buffer.cpp; sourceTree = ""; }; + 4F2FB1592A0047420027AB67 /* ring_buffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ring_buffer.h; sourceTree = ""; }; 4F2FB14C2A0047420027AB66 /* wavenet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wavenet.h; sourceTree = ""; }; 4F2FB14D2A0047420027AB66 /* lstm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lstm.cpp; sourceTree = ""; }; 4F2FB14E2A0047420027AB66 /* util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = util.h; sourceTree = ""; }; @@ -1294,7 +1318,11 @@ 4F2FB1502A0047420027AB66 /* activations.h */, 4F2FB14B2A0047420027AB66 /* convnet.cpp */, 4F2FB1492A0047420027AB66 /* convnet.h */, + 4F2FB1562A0047420027AB67 /* conv1d.cpp */, + 4F2FB1572A0047420027AB67 /* conv1d.h */, 4F2FB1482A0047420027AB66 /* dsp.cpp */, + 4F2FB1582A0047420027AB67 /* ring_buffer.cpp */, + 4F2FB1592A0047420027AB67 /* ring_buffer.h */, 4F2FB14F2A0047420027AB66 /* dsp.h */, 4F2FB1532A0047420027AB66 /* get_dsp.cpp */, AAB7BBB62CC4B8C6000B8B6E /* get_dsp.h */, @@ -2635,6 +2663,8 @@ 4F7C4958255DDFC400DF7588 /* IControls.cpp in Sources */, 4F2FB1562A0047420027AB66 /* RecursiveLinearFilter.cpp in Sources */, 4F2FB1BC2A0047430027AB66 /* wavenet.cpp in Sources */, + 4F2FB1CE2A0047430027AB66 /* conv1d.cpp in Sources */, + 4F2FB1D82A0047430027AB66 /* ring_buffer.cpp in Sources */, 4F2FB1922A0047430027AB66 /* dsp.cpp in Sources */, 4F8D9707209EF5AC006E2A11 /* NeuralAmpModeler.cpp in Sources */, 4F7C495A255DDFC400DF7588 /* ITextEntryControl.cpp in Sources */, @@ -2658,6 +2688,8 @@ 4F2FB1A22A0047430027AB66 /* convnet.cpp in Sources */, 4F2FB1842A0047430027AB66 /* wav.cpp in Sources */, 4F2FB1C12A0047430027AB66 /* wavenet.cpp in Sources */, + 4F2FB1CF2A0047430027AB66 /* conv1d.cpp in Sources */, + 4F2FB1D92A0047430027AB66 /* ring_buffer.cpp in Sources */, 4F2FB1662A0047430027AB66 /* dsp.cpp in Sources */, 4F2FB1AC2A0047430027AB66 /* lstm.cpp in Sources */, 4F2FB1B82A0047430027AB66 /* activations.cpp in Sources */, @@ -2693,6 +2725,8 @@ 4F2FB18A2A0047430027AB66 /* util.cpp in Sources */, 4F993F7423055C96000313AF /* IPlugProcessor.cpp in Sources */, 4F2FB1BE2A0047430027AB66 /* wavenet.cpp in Sources */, + 4F2FB1D02A0047430027AB66 /* conv1d.cpp in Sources */, + 4F2FB1DA2A0047430027AB66 /* ring_buffer.cpp in Sources */, 4F8C10E320BA2796006320CD /* IGraphicsEditorDelegate.cpp in Sources */, 4F6FD2B422675B6300FC59E6 /* IGraphicsCoreText.mm in Sources */, 4FDAC0ED207D76C600299363 /* IPlugTimer.cpp in Sources */, @@ -2731,6 +2765,8 @@ 4F3EE1CF231438D000004786 /* swell-menu.mm in Sources */, 4F2FB1992A0047430027AB66 /* dsp.cpp in Sources */, 4F2FB1C32A0047430027AB66 /* wavenet.cpp in Sources */, + 4F2FB1D12A0047430027AB66 /* conv1d.cpp in Sources */, + 4F2FB1DB2A0047430027AB66 /* ring_buffer.cpp in Sources */, 4F3EE1D0231438D000004786 /* IGraphicsMac_view.mm in Sources */, 4F7C496E255DDFCB00DF7588 /* IPopupMenuControl.cpp in Sources */, 4F3EE1D1231438D000004786 /* swell-appstub.mm in Sources */, @@ -2795,6 +2831,8 @@ AA341E252B9E5A530069C260 /* ToneStack.cpp in Sources */, 4F78BE2522E7406D00AD537E /* IPlugPluginBase.cpp in Sources */, 4F2FB1C22A0047430027AB66 /* wavenet.cpp in Sources */, + 4F2FB1D22A0047430027AB66 /* conv1d.cpp in Sources */, + 4F2FB1DC2A0047430027AB66 /* ring_buffer.cpp in Sources */, 4F2FB1A32A0047430027AB66 /* convnet.cpp in Sources */, 4F78BE2622E7406D00AD537E /* IPlugAPIBase.cpp in Sources */, 4F2FB1AD2A0047430027AB66 /* lstm.cpp in Sources */, @@ -2827,6 +2865,8 @@ 4F2FB1802A0047430027AB66 /* wav.cpp in Sources */, 4F2FB1622A0047430027AB66 /* dsp.cpp in Sources */, 4F2FB1BD2A0047430027AB66 /* wavenet.cpp in Sources */, + 4F2FB1D32A0047430027AB66 /* conv1d.cpp in Sources */, + 4F2FB1DD2A0047430027AB66 /* ring_buffer.cpp in Sources */, 4F815919205D50EB00393585 /* memorystream.cpp in Sources */, 4F9828C1140A9EB700F3FCC1 /* IPlugParameter.cpp in Sources */, 4F81591A205D50EB00393585 /* pluginview.cpp in Sources */, @@ -2905,6 +2945,8 @@ AA341E212B9E5A530069C260 /* ToneStack.cpp in Sources */, 4FB600231567CB0A0020189A /* IPlugParameter.cpp in Sources */, 4F2FB1BF2A0047430027AB66 /* wavenet.cpp in Sources */, + 4F2FB1D42A0047430027AB66 /* conv1d.cpp in Sources */, + 4F2FB1DE2A0047430027AB66 /* ring_buffer.cpp in Sources */, 4F2FB1A02A0047430027AB66 /* convnet.cpp in Sources */, 4FB600261567CB0A0020189A /* AAX_Exports.cpp in Sources */, 4F2FB1AA2A0047430027AB66 /* lstm.cpp in Sources */, @@ -2959,6 +3001,8 @@ 4FD16D3E13B63595001D0217 /* swell-menu.mm in Sources */, 4F2FB1912A0047430027AB66 /* dsp.cpp in Sources */, 4F2FB1BB2A0047430027AB66 /* wavenet.cpp in Sources */, + 4F2FB1D52A0047430027AB66 /* conv1d.cpp in Sources */, + 4F2FB1DF2A0047430027AB66 /* ring_buffer.cpp in Sources */, 4FB1F59120E4B011004157C8 /* IGraphicsMac_view.mm in Sources */, 4F7C4956255DDFC300DF7588 /* IPopupMenuControl.cpp in Sources */, 4F5C5F6B21BED08700E024A7 /* swell-appstub.mm in Sources */, @@ -3032,6 +3076,8 @@ 4F2FB1652A0047430027AB66 /* dsp.cpp in Sources */, 4F2FB1AB2A0047430027AB66 /* lstm.cpp in Sources */, 4F2FB1C02A0047430027AB66 /* wavenet.cpp in Sources */, + 4F2FB1D62A0047430027AB66 /* conv1d.cpp in Sources */, + 4F2FB1E02A0047430027AB66 /* ring_buffer.cpp in Sources */, 4FFBB91F20863B0E00DDD0E7 /* vstparameters.cpp in Sources */, 4FFBB92120863B0E00DDD0E7 /* vstcomponentbase.cpp in Sources */, 4FFBB92220863B0E00DDD0E7 /* IPlugVST3_Processor.cpp in Sources */, diff --git a/NeuralAmpModelerCore b/NeuralAmpModelerCore index 846968710..045adea09 160000 --- a/NeuralAmpModelerCore +++ b/NeuralAmpModelerCore @@ -1 +1 @@ -Subproject commit 846968710a670d662b15e449edba852d747d748e +Subproject commit 045adea09efe378b4c288779ba4f22f6ffd8bc20 From 9b45a986f923f5d6790ddb88a5b626cc5b4badc1 Mon Sep 17 00:00:00 2001 From: Steven Atkinson Date: Wed, 14 Jan 2026 09:39:18 -0800 Subject: [PATCH 02/18] Update NeuralAmpModelerCore --- NeuralAmpModelerCore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NeuralAmpModelerCore b/NeuralAmpModelerCore index 045adea09..03a4f737c 160000 --- a/NeuralAmpModelerCore +++ b/NeuralAmpModelerCore @@ -1 +1 @@ -Subproject commit 045adea09efe378b4c288779ba4f22f6ffd8bc20 +Subproject commit 03a4f737c727381a7cab36c47518dc1a32965da6 From a2a9ec22e82d6289a7f6c9ed1386791d372d0f74 Mon Sep 17 00:00:00 2001 From: Steven Atkinson Date: Wed, 14 Jan 2026 17:55:16 -0800 Subject: [PATCH 03/18] Update NeuralAmpModelerCore --- NeuralAmpModelerCore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NeuralAmpModelerCore b/NeuralAmpModelerCore index 03a4f737c..e3e51542d 160000 --- a/NeuralAmpModelerCore +++ b/NeuralAmpModelerCore @@ -1 +1 @@ -Subproject commit 03a4f737c727381a7cab36c47518dc1a32965da6 +Subproject commit e3e51542da7a92529224d24d7c879907e1524ecd From f5deb5778161bd39645fb679d2d235cb9283b582 Mon Sep 17 00:00:00 2001 From: Steven Atkinson Date: Fri, 16 Jan 2026 16:46:44 -0800 Subject: [PATCH 04/18] Update NeuralAmpModelerCore --- NeuralAmpModelerCore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NeuralAmpModelerCore b/NeuralAmpModelerCore index e3e51542d..8031a0659 160000 --- a/NeuralAmpModelerCore +++ b/NeuralAmpModelerCore @@ -1 +1 @@ -Subproject commit e3e51542da7a92529224d24d7c879907e1524ecd +Subproject commit 8031a06596c1db8bdfb61c4f5e2f9b0e2b09d2ef From 68f9aee584d16add20cade341ba3981bbf819dc3 Mon Sep 17 00:00:00 2001 From: Steven Atkinson Date: Mon, 19 Jan 2026 15:49:57 -0800 Subject: [PATCH 05/18] Update NeuralAmpModelerCore to mimo, head 1x1 --- NeuralAmpModeler/NeuralAmpModeler.cpp | 13 ++++++++++++- NeuralAmpModeler/NeuralAmpModeler.h | 8 ++++---- NeuralAmpModelerCore | 2 +- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/NeuralAmpModeler/NeuralAmpModeler.cpp b/NeuralAmpModeler/NeuralAmpModeler.cpp index 7774c4ba0..003528c9c 100644 --- a/NeuralAmpModeler/NeuralAmpModeler.cpp +++ b/NeuralAmpModeler/NeuralAmpModeler.cpp @@ -322,7 +322,7 @@ void NeuralAmpModeler::ProcessBlock(iplug::sample** inputs, iplug::sample** outp if (mModel != nullptr) { - mModel->process(triggerOutput[0], mOutputPointers[0], nFrames); + mModel->process(triggerOutput, mOutputPointers, nFrames); } else { @@ -693,6 +693,17 @@ std::string NeuralAmpModeler::_StageModel(const WDL_String& modelPath) { auto dspPath = std::filesystem::u8path(modelPath.Get()); std::unique_ptr model = nam::get_dsp(dspPath); + + // Check that the model has 1 input and 1 output channel + if (model->NumInputChannels() != 1) + { + throw std::runtime_error("Model must have 1 input channel, but has " + std::to_string(model->NumInputChannels())); + } + if (model->NumOutputChannels() != 1) + { + throw std::runtime_error("Model must have 1 output channel, but has " + std::to_string(model->NumOutputChannels())); + } + std::unique_ptr temp = std::make_unique(std::move(model), GetSampleRate()); temp->Reset(GetSampleRate(), GetBlockSize()); mStagedModel = std::move(temp); diff --git a/NeuralAmpModeler/NeuralAmpModeler.h b/NeuralAmpModeler/NeuralAmpModeler.h index f22298cdf..446bbf42c 100644 --- a/NeuralAmpModeler/NeuralAmpModeler.h +++ b/NeuralAmpModeler/NeuralAmpModeler.h @@ -95,13 +95,13 @@ class ResamplingNAM : public nam::DSP public: // Resampling wrapper around the NAM models ResamplingNAM(std::unique_ptr encapsulated, const double expected_sample_rate) - : nam::DSP(expected_sample_rate) + : nam::DSP(encapsulated->NumInputChannels(), encapsulated->NumOutputChannels(), expected_sample_rate) , mEncapsulated(std::move(encapsulated)) , mResampler(GetNAMSampleRate(mEncapsulated)) { // Assign the encapsulated object's processing function to this object's member so that the resampler can use it: auto ProcessBlockFunc = [&](NAM_SAMPLE** input, NAM_SAMPLE** output, int numFrames) { - mEncapsulated->process(input[0], output[0], numFrames); + mEncapsulated->process(input, output, numFrames); }; mBlockProcessFunc = ProcessBlockFunc; @@ -133,7 +133,7 @@ class ResamplingNAM : public nam::DSP void prewarm() override { mEncapsulated->prewarm(); }; - void process(NAM_SAMPLE* input, NAM_SAMPLE* output, const int num_frames) override + void process(NAM_SAMPLE** input, NAM_SAMPLE** output, const int num_frames) override { if (num_frames > mMaxExternalBlockSize) // We can afford to be careful @@ -145,7 +145,7 @@ class ResamplingNAM : public nam::DSP } else { - mResampler.ProcessBlock(&input, &output, num_frames, mBlockProcessFunc); + mResampler.ProcessBlock(input, output, num_frames, mBlockProcessFunc); } }; diff --git a/NeuralAmpModelerCore b/NeuralAmpModelerCore index 8031a0659..d1ffcb308 160000 --- a/NeuralAmpModelerCore +++ b/NeuralAmpModelerCore @@ -1 +1 @@ -Subproject commit 8031a06596c1db8bdfb61c4f5e2f9b0e2b09d2ef +Subproject commit d1ffcb308852007ea621f92cf360d13de3e377e3 From f9fc2897882bd503f849f5067070f943080d49b5 Mon Sep 17 00:00:00 2001 From: Steven Atkinson Date: Wed, 21 Jan 2026 01:55:13 -0800 Subject: [PATCH 06/18] Temp last-touches branch --- NeuralAmpModelerCore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NeuralAmpModelerCore b/NeuralAmpModelerCore index d1ffcb308..f85901c74 160000 --- a/NeuralAmpModelerCore +++ b/NeuralAmpModelerCore @@ -1 +1 @@ -Subproject commit d1ffcb308852007ea621f92cf360d13de3e377e3 +Subproject commit f85901c744a8a246b1a51778f67caa5fc808ab4e From 6660fc2b1d8da6efe8650828a7c3f04e4b4bea8e Mon Sep 17 00:00:00 2001 From: Steven Atkinson Date: Wed, 21 Jan 2026 19:05:53 -0800 Subject: [PATCH 07/18] NeuralAmpModelerCore v0.4.0.rc1 --- NeuralAmpModelerCore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NeuralAmpModelerCore b/NeuralAmpModelerCore index f85901c74..be317cfb4 160000 --- a/NeuralAmpModelerCore +++ b/NeuralAmpModelerCore @@ -1 +1 @@ -Subproject commit f85901c744a8a246b1a51778f67caa5fc808ab4e +Subproject commit be317cfb4a763c3a280aaa0ffe54e9a33fe07267 From c743e5dd4d83063bfd85624322cdd39cf65bec68 Mon Sep 17 00:00:00 2001 From: Steven Atkinson Date: Wed, 21 Jan 2026 19:07:10 -0800 Subject: [PATCH 08/18] Formatting --- NeuralAmpModeler/NeuralAmpModeler.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/NeuralAmpModeler/NeuralAmpModeler.cpp b/NeuralAmpModeler/NeuralAmpModeler.cpp index 003528c9c..bb3916fc7 100644 --- a/NeuralAmpModeler/NeuralAmpModeler.cpp +++ b/NeuralAmpModeler/NeuralAmpModeler.cpp @@ -693,7 +693,7 @@ std::string NeuralAmpModeler::_StageModel(const WDL_String& modelPath) { auto dspPath = std::filesystem::u8path(modelPath.Get()); std::unique_ptr model = nam::get_dsp(dspPath); - + // Check that the model has 1 input and 1 output channel if (model->NumInputChannels() != 1) { @@ -701,9 +701,10 @@ std::string NeuralAmpModeler::_StageModel(const WDL_String& modelPath) } if (model->NumOutputChannels() != 1) { - throw std::runtime_error("Model must have 1 output channel, but has " + std::to_string(model->NumOutputChannels())); + throw std::runtime_error("Model must have 1 output channel, but has " + + std::to_string(model->NumOutputChannels())); } - + std::unique_ptr temp = std::make_unique(std::move(model), GetSampleRate()); temp->Reset(GetSampleRate(), GetBlockSize()); mStagedModel = std::move(temp); From b7be1129dbf48ccc5fa97cd5cd70a504fb06beec Mon Sep 17 00:00:00 2001 From: Steven Atkinson Date: Wed, 21 Jan 2026 22:53:12 -0800 Subject: [PATCH 09/18] Update NeuralAmpModelerCore integration: add missing files and upgrade to C++20 - Update C++ standard to C++20 in common-win.props and common-mac.xcconfig (required by NeuralAmpModelerCore dependency) - Add missing NAM source/header files to Visual Studio projects: - conv1d.cpp/h, ring_buffer.cpp/h - film.h, gating_activations.h, registry.h (header-only) - Updated: vst3, app, aax projects - Add missing files to macOS Xcode project: - film.h, gating_activations.h, registry.h (header-only) - Add missing files to iOS Xcode project: - conv1d.cpp/h, ring_buffer.cpp/h - film.h, gating_activations.h, registry.h (header-only) All new files from NeuralAmpModelerCore are now properly included in build configurations. --- .../projects/NeuralAmpModeler-aax.vcxproj | 9 +++++- .../projects/NeuralAmpModeler-app.vcxproj | 9 +++++- .../project.pbxproj | 28 +++++++++++++++++++ .../project.pbxproj | 12 ++++++++ .../projects/NeuralAmpModeler-vst3.vcxproj | 9 +++++- common-mac.xcconfig | 2 +- common-win.props | 2 +- 7 files changed, 66 insertions(+), 5 deletions(-) diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-aax.vcxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-aax.vcxproj index ccd34be0f..f0e48d1ff 100644 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-aax.vcxproj +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-aax.vcxproj @@ -1,4 +1,4 @@ - + @@ -416,6 +416,7 @@ + $(IntDir)%(RelativeDir) @@ -427,6 +428,7 @@ + @@ -528,10 +530,15 @@ + + + + + diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-app.vcxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-app.vcxproj index d81a7e050..b881807d6 100644 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-app.vcxproj +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-app.vcxproj @@ -1,4 +1,4 @@ - + @@ -335,10 +335,15 @@ + + + + + @@ -392,6 +397,7 @@ + $(IntDir)%(RelativeDir) @@ -403,6 +409,7 @@ + diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-iOS.xcodeproj/project.pbxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-iOS.xcodeproj/project.pbxproj index 04bdb95e5..db784687d 100644 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-iOS.xcodeproj/project.pbxproj +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-iOS.xcodeproj/project.pbxproj @@ -52,6 +52,13 @@ 4FBDC96329FFF143004FF203 /* activations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FBDC94A29FFF143004FF203 /* activations.cpp */; }; 4FBDC96429FFF143004FF203 /* wavenet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FBDC94B29FFF143004FF203 /* wavenet.cpp */; }; 4FBDC96529FFF143004FF203 /* get_dsp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FBDC94C29FFF143004FF203 /* get_dsp.cpp */; }; + 4FBDC97729FFF143004FF203 /* conv1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FBDC97029FFF143004FF203 /* conv1d.cpp */; }; + 4FBDC97829FFF143004FF203 /* conv1d.h in Headers */ = {isa = PBXBuildFile; fileRef = 4FBDC97129FFF143004FF203 /* conv1d.h */; }; + 4FBDC97929FFF143004FF203 /* ring_buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FBDC97229FFF143004FF203 /* ring_buffer.cpp */; }; + 4FBDC97A29FFF143004FF203 /* ring_buffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 4FBDC97329FFF143004FF203 /* ring_buffer.h */; }; + 4FBDC97B29FFF143004FF203 /* film.h in Headers */ = {isa = PBXBuildFile; fileRef = 4FBDC97429FFF143004FF203 /* film.h */; }; + 4FBDC97C29FFF143004FF203 /* gating_activations.h in Headers */ = {isa = PBXBuildFile; fileRef = 4FBDC97529FFF143004FF203 /* gating_activations.h */; }; + 4FBDC97D29FFF143004FF203 /* registry.h in Headers */ = {isa = PBXBuildFile; fileRef = 4FBDC97629FFF143004FF203 /* registry.h */; }; 4FC69835293BA47F0076EC33 /* NeuralAmpModelerAU.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4FC6982F293BA47F0076EC33 /* NeuralAmpModelerAU.framework */; }; 4FC69836293BA47F0076EC33 /* NeuralAmpModelerAU.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4FC6982F293BA47F0076EC33 /* NeuralAmpModelerAU.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 4FC6983A293BA4F10076EC33 /* NeuralAmpModelerAU.h in Headers */ = {isa = PBXBuildFile; fileRef = 4FA61F7B22E89A5900A92C58 /* NeuralAmpModelerAU.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -282,6 +289,13 @@ 4FBDC94429FFF143004FF203 /* convnet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = convnet.cpp; sourceTree = ""; }; 4FBDC94529FFF143004FF203 /* wavenet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wavenet.h; sourceTree = ""; }; 4FBDC94629FFF143004FF203 /* lstm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lstm.cpp; sourceTree = ""; }; + 4FBDC97029FFF143004FF203 /* conv1d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = conv1d.cpp; sourceTree = ""; }; + 4FBDC97129FFF143004FF203 /* conv1d.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = conv1d.h; sourceTree = ""; }; + 4FBDC97229FFF143004FF203 /* ring_buffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ring_buffer.cpp; sourceTree = ""; }; + 4FBDC97329FFF143004FF203 /* ring_buffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ring_buffer.h; sourceTree = ""; }; + 4FBDC97429FFF143004FF203 /* film.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = film.h; sourceTree = ""; }; + 4FBDC97529FFF143004FF203 /* gating_activations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gating_activations.h; sourceTree = ""; }; + 4FBDC97629FFF143004FF203 /* registry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = registry.h; sourceTree = ""; }; 4FBDC94729FFF143004FF203 /* util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = util.h; sourceTree = ""; }; 4FBDC94829FFF143004FF203 /* dsp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dsp.h; sourceTree = ""; }; 4FBDC94929FFF143004FF203 /* activations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = activations.h; sourceTree = ""; }; @@ -672,6 +686,13 @@ 4FBDC94029FFF143004FF203 /* version.h */, 4FBDC94B29FFF143004FF203 /* wavenet.cpp */, 4FBDC94529FFF143004FF203 /* wavenet.h */, + 4FBDC97029FFF143004FF203 /* conv1d.cpp */, + 4FBDC97129FFF143004FF203 /* conv1d.h */, + 4FBDC97229FFF143004FF203 /* ring_buffer.cpp */, + 4FBDC97329FFF143004FF203 /* ring_buffer.h */, + 4FBDC97429FFF143004FF203 /* film.h */, + 4FBDC97529FFF143004FF203 /* gating_activations.h */, + 4FBDC97629FFF143004FF203 /* registry.h */, ); name = NAM; path = ../../NeuralAmpModelerCore/NAM; @@ -833,6 +854,11 @@ 4FC6983A293BA4F10076EC33 /* NeuralAmpModelerAU.h in Headers */, 4FBDC95629FFF143004FF203 /* dsp.h in Headers */, 4FBDC95E29FFF143004FF203 /* wavenet.h in Headers */, + 4FBDC97829FFF143004FF203 /* conv1d.h in Headers */, + 4FBDC97A29FFF143004FF203 /* ring_buffer.h in Headers */, + 4FBDC97B29FFF143004FF203 /* film.h in Headers */, + 4FBDC97C29FFF143004FF203 /* gating_activations.h in Headers */, + 4FBDC97D29FFF143004FF203 /* registry.h in Headers */, 4FC6983B293BA5020076EC33 /* IPlugAUAudioUnit.h in Headers */, AA7C860B2B43A42F00B5FB3A /* ResamplingContainer.h in Headers */, AA341E2B2B9E5A650069C260 /* ToneStack.h in Headers */, @@ -1059,6 +1085,8 @@ 4FBDC95829FFF143004FF203 /* util.cpp in Sources */, 4FC69849293BA5F90076EC33 /* ITextEntryControl.cpp in Sources */, 4FBDC96429FFF143004FF203 /* wavenet.cpp in Sources */, + 4FBDC97729FFF143004FF203 /* conv1d.cpp in Sources */, + 4FBDC97929FFF143004FF203 /* ring_buffer.cpp in Sources */, 4FC6984C293BA6010076EC33 /* IGraphicsCoreText.mm in Sources */, 4FC6984F293BA6420076EC33 /* IControl.cpp in Sources */, 4FC69848293BA5F90076EC33 /* IControls.cpp in Sources */, diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/project.pbxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/project.pbxproj index 4631b33c2..357a71ca4 100644 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/project.pbxproj +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/project.pbxproj @@ -164,6 +164,9 @@ 4F2FB1A32A0047430027AB66 /* convnet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB14B2A0047420027AB66 /* convnet.cpp */; }; 4F2FB1A42A0047430027AB66 /* convnet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB14B2A0047420027AB66 /* convnet.cpp */; }; 4F2FB1A52A0047430027AB66 /* wavenet.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F2FB14C2A0047420027AB66 /* wavenet.h */; }; + 4F2FB1E22A0047430027AB68 /* film.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F2FB15A2A0047420027AB68 /* film.h */; }; + 4F2FB1E32A0047430027AB68 /* gating_activations.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F2FB15B2A0047420027AB68 /* gating_activations.h */; }; + 4F2FB1E42A0047430027AB68 /* registry.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F2FB15C2A0047420027AB68 /* registry.h */; }; 4F2FB1A62A0047430027AB66 /* lstm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB14D2A0047420027AB66 /* lstm.cpp */; }; 4F2FB1A72A0047430027AB66 /* lstm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB14D2A0047420027AB66 /* lstm.cpp */; }; 4F2FB1A82A0047430027AB66 /* lstm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB14D2A0047420027AB66 /* lstm.cpp */; }; @@ -693,6 +696,9 @@ 4F2FB1582A0047420027AB67 /* ring_buffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ring_buffer.cpp; sourceTree = ""; }; 4F2FB1592A0047420027AB67 /* ring_buffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ring_buffer.h; sourceTree = ""; }; 4F2FB14C2A0047420027AB66 /* wavenet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wavenet.h; sourceTree = ""; }; + 4F2FB15A2A0047420027AB68 /* film.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = film.h; sourceTree = ""; }; + 4F2FB15B2A0047420027AB68 /* gating_activations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gating_activations.h; sourceTree = ""; }; + 4F2FB15C2A0047420027AB68 /* registry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = registry.h; sourceTree = ""; }; 4F2FB14D2A0047420027AB66 /* lstm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lstm.cpp; sourceTree = ""; }; 4F2FB14E2A0047420027AB66 /* util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = util.h; sourceTree = ""; }; 4F2FB14F2A0047420027AB66 /* dsp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dsp.h; sourceTree = ""; }; @@ -1333,6 +1339,9 @@ 4F2FB1472A0047420027AB66 /* version.h */, 4F2FB1522A0047420027AB66 /* wavenet.cpp */, 4F2FB14C2A0047420027AB66 /* wavenet.h */, + 4F2FB15A2A0047420027AB68 /* film.h */, + 4F2FB15B2A0047420027AB68 /* gating_activations.h */, + 4F2FB15C2A0047420027AB68 /* registry.h */, ); name = NAM; path = ../../NeuralAmpModelerCore/NAM; @@ -2046,6 +2055,9 @@ 4F2FB15F2A0047420027AB66 /* NoiseGate.h in Headers */, 4F2FB17D2A0047430027AB66 /* dsp.h in Headers */, 4F2FB1A52A0047430027AB66 /* wavenet.h in Headers */, + 4F2FB1E22A0047430027AB68 /* film.h in Headers */, + 4F2FB1E32A0047430027AB68 /* gating_activations.h in Headers */, + 4F2FB1E42A0047430027AB68 /* registry.h in Headers */, 4F78BE1222E73DD900AD537E /* NeuralAmpModelerAU.h in Headers */, 4F2FB1542A0047420027AB66 /* Resample.h in Headers */, 4F2FB15E2A0047420027AB66 /* wav.h in Headers */, diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj index 4763a404e..64577fa07 100644 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj @@ -1,4 +1,4 @@ - + @@ -344,10 +344,15 @@ + + + + + @@ -420,6 +425,7 @@ + $(IntDir)%(RelativeDir) @@ -431,6 +437,7 @@ + diff --git a/common-mac.xcconfig b/common-mac.xcconfig index fb1b2be53..efb6c582e 100644 --- a/common-mac.xcconfig +++ b/common-mac.xcconfig @@ -9,7 +9,7 @@ COMPILER = com.apple.compilers.llvm.clang.1_0 // which osx sdk to compile against - defaults to latest SDK available BASE_SDK_MAC = macosx // latest SDK -CLANG_CXX_LANGUAGE_STANDARD = c++17 +CLANG_CXX_LANGUAGE_STANDARD = c++20 CLANG_CXX_LIBRARY = libc++ CLANG_WARN_DOCUMENTATION_COMMENTS = NO diff --git a/common-win.props b/common-win.props index 3f4930f78..d4478742a 100644 --- a/common-win.props +++ b/common-win.props @@ -78,7 +78,7 @@ $(ALL_DEFS);%(PreprocessorDefinitions) 4996;4250;4018;4267;4068; $(WDL_PATH);$(IPLUG_PATH);$(SolutionDir);%(AdditionalIncludeDirectories) - stdcpp17 + stdcpp20 true From 64773a775de456eb875525d584746bdd5e54ce15 Mon Sep 17 00:00:00 2001 From: Steven Atkinson Date: Wed, 28 Jan 2026 17:13:23 -0800 Subject: [PATCH 10/18] Update core to d53946a --- NeuralAmpModelerCore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NeuralAmpModelerCore b/NeuralAmpModelerCore index be317cfb4..d53946acd 160000 --- a/NeuralAmpModelerCore +++ b/NeuralAmpModelerCore @@ -1 +1 @@ -Subproject commit be317cfb4a763c3a280aaa0ffe54e9a33fe07267 +Subproject commit d53946acd4e8f6de73751cd23b9ac3a53cc38191 From db200d5dd30e4d57921b2c5a6fc6e778d69782e8 Mon Sep 17 00:00:00 2001 From: Steven Atkinson Date: Thu, 12 Feb 2026 15:25:21 -0800 Subject: [PATCH 11/18] Update NeuralAmpModelerCore to v0.4.0.rc3 --- NeuralAmpModelerCore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NeuralAmpModelerCore b/NeuralAmpModelerCore index d53946acd..761fa9687 160000 --- a/NeuralAmpModelerCore +++ b/NeuralAmpModelerCore @@ -1 +1 @@ -Subproject commit d53946acd4e8f6de73751cd23b9ac3a53cc38191 +Subproject commit 761fa968766bcf67d3035320c195969d9ba41fa1 From 58a633f61440bf562fe553b1793003185b947964 Mon Sep 17 00:00:00 2001 From: Steven Atkinson Date: Wed, 25 Mar 2026 11:58:27 -0700 Subject: [PATCH 12/18] Update core, fix Windows VST3 build --- NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj | 1 + NeuralAmpModelerCore | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj index 64577fa07..fd0cfd1ec 100644 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj @@ -440,6 +440,7 @@ + diff --git a/NeuralAmpModelerCore b/NeuralAmpModelerCore index 761fa9687..29763dce4 160000 --- a/NeuralAmpModelerCore +++ b/NeuralAmpModelerCore @@ -1 +1 @@ -Subproject commit 761fa968766bcf67d3035320c195969d9ba41fa1 +Subproject commit 29763dce4d8247ab70787b5b3b28e86b752d1472 From 9e1388762b533e2b1abd69ca46596ae6ddb73107 Mon Sep 17 00:00:00 2001 From: Steven Atkinson Date: Fri, 27 Mar 2026 21:01:37 -0700 Subject: [PATCH 13/18] Fix macOS VST3 build --- .../project.pbxproj | 20 +++++++++++++++++++ NeuralAmpModelerCore | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/project.pbxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/project.pbxproj index 357a71ca4..f4d906417 100644 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/project.pbxproj +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/project.pbxproj @@ -197,6 +197,15 @@ 4F2FB1C12A0047430027AB66 /* wavenet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB1522A0047420027AB66 /* wavenet.cpp */; }; 4F2FB1C22A0047430027AB66 /* wavenet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB1522A0047420027AB66 /* wavenet.cpp */; }; 4F2FB1C32A0047430027AB66 /* wavenet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB1522A0047420027AB66 /* wavenet.cpp */; }; + B1D2F7012D0000020027AB66 /* slimmable_wavenet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1D2F7002D0000010027AB66 /* slimmable_wavenet.cpp */; }; + B1D2F7022D0000020027AB66 /* slimmable_wavenet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1D2F7002D0000010027AB66 /* slimmable_wavenet.cpp */; }; + B1D2F7032D0000020027AB66 /* slimmable_wavenet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1D2F7002D0000010027AB66 /* slimmable_wavenet.cpp */; }; + B1D2F7042D0000020027AB66 /* slimmable_wavenet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1D2F7002D0000010027AB66 /* slimmable_wavenet.cpp */; }; + B1D2F7052D0000020027AB66 /* slimmable_wavenet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1D2F7002D0000010027AB66 /* slimmable_wavenet.cpp */; }; + B1D2F7062D0000020027AB66 /* slimmable_wavenet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1D2F7002D0000010027AB66 /* slimmable_wavenet.cpp */; }; + B1D2F7072D0000020027AB66 /* slimmable_wavenet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1D2F7002D0000010027AB66 /* slimmable_wavenet.cpp */; }; + B1D2F7082D0000020027AB66 /* slimmable_wavenet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1D2F7002D0000010027AB66 /* slimmable_wavenet.cpp */; }; + B1D2F7092D0000020027AB66 /* slimmable_wavenet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1D2F7002D0000010027AB66 /* slimmable_wavenet.cpp */; }; 4F2FB1C42A0047430027AB66 /* get_dsp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB1532A0047420027AB66 /* get_dsp.cpp */; }; 4F2FB1C52A0047430027AB66 /* get_dsp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB1532A0047420027AB66 /* get_dsp.cpp */; }; 4F2FB1C62A0047430027AB66 /* get_dsp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB1532A0047420027AB66 /* get_dsp.cpp */; }; @@ -705,6 +714,7 @@ 4F2FB1502A0047420027AB66 /* activations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = activations.h; sourceTree = ""; }; 4F2FB1512A0047420027AB66 /* activations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = activations.cpp; sourceTree = ""; }; 4F2FB1522A0047420027AB66 /* wavenet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wavenet.cpp; sourceTree = ""; }; + B1D2F7002D0000010027AB66 /* slimmable_wavenet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slimmable_wavenet.cpp; sourceTree = ""; }; 4F2FB1532A0047420027AB66 /* get_dsp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = get_dsp.cpp; sourceTree = ""; }; 4F35DEAB207E5C5A00867D8F /* IPlugPluginBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; name = IPlugPluginBase.cpp; path = ../../iPlug2/IPlug/IPlugPluginBase.cpp; sourceTree = ""; tabWidth = 2; }; 4F35DEAC207E5C5A00867D8F /* IPlugPluginBase.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; name = IPlugPluginBase.h; path = ../../iPlug2/IPlug/IPlugPluginBase.h; sourceTree = ""; tabWidth = 2; }; @@ -1338,6 +1348,7 @@ 4F2FB14E2A0047420027AB66 /* util.h */, 4F2FB1472A0047420027AB66 /* version.h */, 4F2FB1522A0047420027AB66 /* wavenet.cpp */, + B1D2F7002D0000010027AB66 /* slimmable_wavenet.cpp */, 4F2FB14C2A0047420027AB66 /* wavenet.h */, 4F2FB15A2A0047420027AB68 /* film.h */, 4F2FB15B2A0047420027AB68 /* gating_activations.h */, @@ -2675,6 +2686,7 @@ 4F7C4958255DDFC400DF7588 /* IControls.cpp in Sources */, 4F2FB1562A0047420027AB66 /* RecursiveLinearFilter.cpp in Sources */, 4F2FB1BC2A0047430027AB66 /* wavenet.cpp in Sources */, + B1D2F7022D0000020027AB66 /* slimmable_wavenet.cpp in Sources */, 4F2FB1CE2A0047430027AB66 /* conv1d.cpp in Sources */, 4F2FB1D82A0047430027AB66 /* ring_buffer.cpp in Sources */, 4F2FB1922A0047430027AB66 /* dsp.cpp in Sources */, @@ -2700,6 +2712,7 @@ 4F2FB1A22A0047430027AB66 /* convnet.cpp in Sources */, 4F2FB1842A0047430027AB66 /* wav.cpp in Sources */, 4F2FB1C12A0047430027AB66 /* wavenet.cpp in Sources */, + B1D2F7072D0000020027AB66 /* slimmable_wavenet.cpp in Sources */, 4F2FB1CF2A0047430027AB66 /* conv1d.cpp in Sources */, 4F2FB1D92A0047430027AB66 /* ring_buffer.cpp in Sources */, 4F2FB1662A0047430027AB66 /* dsp.cpp in Sources */, @@ -2737,6 +2750,7 @@ 4F2FB18A2A0047430027AB66 /* util.cpp in Sources */, 4F993F7423055C96000313AF /* IPlugProcessor.cpp in Sources */, 4F2FB1BE2A0047430027AB66 /* wavenet.cpp in Sources */, + B1D2F7042D0000020027AB66 /* slimmable_wavenet.cpp in Sources */, 4F2FB1D02A0047430027AB66 /* conv1d.cpp in Sources */, 4F2FB1DA2A0047430027AB66 /* ring_buffer.cpp in Sources */, 4F8C10E320BA2796006320CD /* IGraphicsEditorDelegate.cpp in Sources */, @@ -2777,6 +2791,7 @@ 4F3EE1CF231438D000004786 /* swell-menu.mm in Sources */, 4F2FB1992A0047430027AB66 /* dsp.cpp in Sources */, 4F2FB1C32A0047430027AB66 /* wavenet.cpp in Sources */, + B1D2F7092D0000020027AB66 /* slimmable_wavenet.cpp in Sources */, 4F2FB1D12A0047430027AB66 /* conv1d.cpp in Sources */, 4F2FB1DB2A0047430027AB66 /* ring_buffer.cpp in Sources */, 4F3EE1D0231438D000004786 /* IGraphicsMac_view.mm in Sources */, @@ -2843,6 +2858,7 @@ AA341E252B9E5A530069C260 /* ToneStack.cpp in Sources */, 4F78BE2522E7406D00AD537E /* IPlugPluginBase.cpp in Sources */, 4F2FB1C22A0047430027AB66 /* wavenet.cpp in Sources */, + B1D2F7082D0000020027AB66 /* slimmable_wavenet.cpp in Sources */, 4F2FB1D22A0047430027AB66 /* conv1d.cpp in Sources */, 4F2FB1DC2A0047430027AB66 /* ring_buffer.cpp in Sources */, 4F2FB1A32A0047430027AB66 /* convnet.cpp in Sources */, @@ -2877,6 +2893,7 @@ 4F2FB1802A0047430027AB66 /* wav.cpp in Sources */, 4F2FB1622A0047430027AB66 /* dsp.cpp in Sources */, 4F2FB1BD2A0047430027AB66 /* wavenet.cpp in Sources */, + B1D2F7032D0000020027AB66 /* slimmable_wavenet.cpp in Sources */, 4F2FB1D32A0047430027AB66 /* conv1d.cpp in Sources */, 4F2FB1DD2A0047430027AB66 /* ring_buffer.cpp in Sources */, 4F815919205D50EB00393585 /* memorystream.cpp in Sources */, @@ -2957,6 +2974,7 @@ AA341E212B9E5A530069C260 /* ToneStack.cpp in Sources */, 4FB600231567CB0A0020189A /* IPlugParameter.cpp in Sources */, 4F2FB1BF2A0047430027AB66 /* wavenet.cpp in Sources */, + B1D2F7052D0000020027AB66 /* slimmable_wavenet.cpp in Sources */, 4F2FB1D42A0047430027AB66 /* conv1d.cpp in Sources */, 4F2FB1DE2A0047430027AB66 /* ring_buffer.cpp in Sources */, 4F2FB1A02A0047430027AB66 /* convnet.cpp in Sources */, @@ -3013,6 +3031,7 @@ 4FD16D3E13B63595001D0217 /* swell-menu.mm in Sources */, 4F2FB1912A0047430027AB66 /* dsp.cpp in Sources */, 4F2FB1BB2A0047430027AB66 /* wavenet.cpp in Sources */, + B1D2F7012D0000020027AB66 /* slimmable_wavenet.cpp in Sources */, 4F2FB1D52A0047430027AB66 /* conv1d.cpp in Sources */, 4F2FB1DF2A0047430027AB66 /* ring_buffer.cpp in Sources */, 4FB1F59120E4B011004157C8 /* IGraphicsMac_view.mm in Sources */, @@ -3088,6 +3107,7 @@ 4F2FB1652A0047430027AB66 /* dsp.cpp in Sources */, 4F2FB1AB2A0047430027AB66 /* lstm.cpp in Sources */, 4F2FB1C02A0047430027AB66 /* wavenet.cpp in Sources */, + B1D2F7062D0000020027AB66 /* slimmable_wavenet.cpp in Sources */, 4F2FB1D62A0047430027AB66 /* conv1d.cpp in Sources */, 4F2FB1E02A0047430027AB66 /* ring_buffer.cpp in Sources */, 4FFBB91F20863B0E00DDD0E7 /* vstparameters.cpp in Sources */, diff --git a/NeuralAmpModelerCore b/NeuralAmpModelerCore index 761fa9687..29763dce4 160000 --- a/NeuralAmpModelerCore +++ b/NeuralAmpModelerCore @@ -1 +1 @@ -Subproject commit 761fa968766bcf67d3035320c195969d9ba41fa1 +Subproject commit 29763dce4d8247ab70787b5b3b28e86b752d1472 From dd641cf991220745c95699c89fd634c0ef5f1024 Mon Sep 17 00:00:00 2001 From: Steven Atkinson Date: Mon, 20 Apr 2026 12:36:16 -0700 Subject: [PATCH 14/18] Remove VST2 build targets and update NeuralAmpModelerCore submodule Drop VST2 Visual Studio projects, macOS scheme and plist, and trim VST2-related scripts and shared config. Bump NeuralAmpModelerCore pointer and align Windows/macOS project files. Made-with: Cursor --- .../config/NeuralAmpModeler-win.props | 2 +- .../projects/NeuralAmpModeler-aax.vcxproj | 1127 +++++++++-------- .../projects/NeuralAmpModeler-app.vcxproj | 875 ++++++------- .../project.pbxproj | 24 +- .../project.pbxproj | 250 +--- .../xcschemes/macOS-VST2.xcscheme | 84 -- .../projects/NeuralAmpModeler-vst2.vcxproj | 373 ------ .../NeuralAmpModeler-vst2.vcxproj.filters | 318 ----- .../NeuralAmpModeler-vst2.vcxproj.user | 33 - .../projects/NeuralAmpModeler-vst3.vcxproj | 926 +++++++------- .../NeuralAmpModeler-VST2-Info.plist | 30 - NeuralAmpModeler/scripts/makedist-mac.sh | 22 - NeuralAmpModeler/scripts/makedist-win.bat | 2 +- NeuralAmpModeler/scripts/makeinstaller-mac.sh | 14 - NeuralAmpModeler/scripts/postbuild-win.bat | 46 +- .../scripts/update_version-mac.py | 26 - NeuralAmpModelerCore | 2 +- common-mac.xcconfig | 3 - common-win.props | 40 - 19 files changed, 1525 insertions(+), 2672 deletions(-) delete mode 100644 NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/xcshareddata/xcschemes/macOS-VST2.xcscheme delete mode 100644 NeuralAmpModeler/projects/NeuralAmpModeler-vst2.vcxproj delete mode 100644 NeuralAmpModeler/projects/NeuralAmpModeler-vst2.vcxproj.filters delete mode 100644 NeuralAmpModeler/projects/NeuralAmpModeler-vst2.vcxproj.user delete mode 100644 NeuralAmpModeler/resources/NeuralAmpModeler-VST2-Info.plist diff --git a/NeuralAmpModeler/config/NeuralAmpModeler-win.props b/NeuralAmpModeler/config/NeuralAmpModeler-win.props index 3ce7f9b59..c81ebf92f 100644 --- a/NeuralAmpModeler/config/NeuralAmpModeler-win.props +++ b/NeuralAmpModeler/config/NeuralAmpModeler-win.props @@ -27,7 +27,7 @@ $(PDB_FILE) - CALL "$(SolutionDir)scripts\postbuild-win.bat" "$(TargetExt)" "$(BINARY_NAME)" "$(Platform)" "$(COPY_VST2)" "$(TargetPath)" "$(VST2_32_PATH)" "$(VST2_64_PATH)" "$(VST3_32_PATH)" "$(VST3_64_PATH)" "$(AAX_32_PATH)" "$(AAX_64_PATH)" "$(BUILD_DIR)" "$(VST_ICON)" "$(AAX_ICON)" "$(CREATE_BUNDLE_SCRIPT)" + CALL "$(SolutionDir)scripts\postbuild-win.bat" "$(TargetExt)" "$(BINARY_NAME)" "$(Platform)" "$(TargetPath)" "$(VST3_32_PATH)" "$(VST3_64_PATH)" "$(AAX_32_PATH)" "$(AAX_64_PATH)" "$(BUILD_DIR)" "$(VST_ICON)" "$(AAX_ICON)" "$(CREATE_BUNDLE_SCRIPT)" CALL "$(SolutionDir)scripts\prebuild-win.bat" "$(TargetExt)" "$(BINARY_NAME)" "$(Platform)" "$(TargetPath)" "$(OutDir)" diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-aax.vcxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-aax.vcxproj index f0e48d1ff..ff83f513f 100644 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-aax.vcxproj +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-aax.vcxproj @@ -1,563 +1,566 @@ - - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - Tracer - Win32 - - - Tracer - x64 - - - - {DC4B5920-933D-4C82-B842-F34431D55A93} - NeuralAmpModeler-aax - ManagedCProj - 10.0 - - - - DynamicLibrary - v143 - - - DynamicLibrary - v143 - - - DynamicLibrary - v143 - - - DynamicLibrary - v143 - - - DynamicLibrary - v143 - - - DynamicLibrary - v143 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\ - $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\int\ - false - $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\ - $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\ - $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\int\ - $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\int\ - false - false - $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\ - $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\int\ - false - $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\ - $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\ - $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\int\ - $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\int\ - false - false - - - .aaxplugin - - - .aaxplugin - - - .aaxplugin - - - .aaxplugin - - - .aaxplugin - - - .aaxplugin - - - - - - - - - %(Outputs) - - - Disabled - $(AAX_INC_PATHS);%(AdditionalIncludeDirectories) - $(AAX_DEFS);$(DEBUG_DEFS);$(EXTRA_DEBUG_DEFS);%(PreprocessorDefinitions) - false - Async - EnableFastChecks - MultiThreadedDebug - true - $(IntDir)..\NeuralAmpModeler.pch - Level3 - ProgramDatabase - Default - %(ForcedIncludeFiles) - - - $(AAX_LIBS);%(AdditionalDependencies) - $(OutDir)$(BINARY_NAME).aaxplugin - true - - - Windows - $(IntDir)$(TargetName).lib - - - - - - - - - - - - %(Outputs) - - - MaxSpeed - Speed - $(AAX_INC_PATHS);%(AdditionalIncludeDirectories) - $(AAX_DEFS);$(RELEASE_DEFS);$(EXTRA_RELEASE_DEFS);%(PreprocessorDefinitions) - false - Async - MultiThreaded - StreamingSIMDExtensions2 - true - - - - - Level3 - ProgramDatabase - Default - %(ForcedIncludeFiles) - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - $(AAX_LIBS);%(AdditionalDependencies) - $(OutDir)$(BINARY_NAME).aaxplugin - true - Windows - $(IntDir)$(TargetName).lib - - - - - - - - - - - - %(Outputs) - - - MaxSpeed - Speed - $(AAX_INC_PATHS);%(AdditionalIncludeDirectories) - $(AAX_DEFS);$(TRACER_DEFS);$(EXTRA_TRACER_DEFS);%(PreprocessorDefinitions) - false - Async - MultiThreaded - StreamingSIMDExtensions2 - true - - - - - Level3 - ProgramDatabase - Default - %(ForcedIncludeFiles) - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - $(AAX_LIBS);%(AdditionalDependencies) - $(OutDir)$(BINARY_NAME).aaxplugin - true - Windows - $(IntDir)$(TargetName).lib - - - - - - - - - - - - %(Outputs) - - - X64 - - - Disabled - $(AAX_INC_PATHS);%(AdditionalIncludeDirectories) - $(AAX_DEFS);$(DEBUG_DEFS);$(EXTRA_DEBUG_DEFS);%(PreprocessorDefinitions) - false - Async - EnableFastChecks - MultiThreadedDebug - true - $(IntDir)..\NeuralAmpModeler.pch - Level3 - ProgramDatabase - Default - %(ForcedIncludeFiles) - - - $(AAX_LIBS);%(AdditionalDependencies) - $(OutDir)$(BINARY_NAME).aaxplugin - true - - - Windows - $(IntDir)$(TargetName).lib - MachineX64 - - - - - - - - - - - - %(Outputs) - - - X64 - - - MaxSpeed - $(AAX_INC_PATHS);%(AdditionalIncludeDirectories) - $(AAX_DEFS);$(RELEASE_DEFS);$(EXTRA_RELEASE_DEFS);%(PreprocessorDefinitions) - false - Async - MultiThreaded - true - - - - - Level3 - ProgramDatabase - Default - %(ForcedIncludeFiles) - Speed - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - $(AAX_LIBS);%(AdditionalDependencies) - $(OutDir)$(BINARY_NAME).aaxplugin - true - Windows - $(IntDir)$(TargetName).lib - MachineX64 - - - - - - - - - - - - %(Outputs) - - - X64 - - - MaxSpeed - $(AAX_INC_PATHS);%(AdditionalIncludeDirectories) - $(AAX_DEFS);$(TRACER_DEFS);$(EXTRA_TRACER_DEFS);%(PreprocessorDefinitions) - false - Async - MultiThreaded - true - - - - - Level3 - ProgramDatabase - Default - %(ForcedIncludeFiles) - Speed - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - $(AAX_LIBS);%(AdditionalDependencies) - $(OutDir)$(BINARY_NAME).aaxplugin - true - Windows - $(IntDir)$(TargetName).lib - MachineX64 - - - - - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - $(IntDir)%(RelativeDir) - $(IntDir)%(RelativeDir) - $(IntDir)%(RelativeDir) - $(IntDir)%(RelativeDir) - $(IntDir)%(RelativeDir) - $(IntDir)%(RelativeDir) - - - - - - - - - - - Document - true - true - true - - - Document - true - true - true - true - - - Document - true - true - true - - - Document - true - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + Tracer + Win32 + + + Tracer + x64 + + + + {DC4B5920-933D-4C82-B842-F34431D55A93} + NeuralAmpModeler-aax + ManagedCProj + 10.0 + + + + DynamicLibrary + v143 + + + DynamicLibrary + v143 + + + DynamicLibrary + v143 + + + DynamicLibrary + v143 + + + DynamicLibrary + v143 + + + DynamicLibrary + v143 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\ + $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\int\ + false + $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\ + $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\ + $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\int\ + $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\int\ + false + false + $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\ + $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\int\ + false + $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\ + $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\ + $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\int\ + $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\int\ + false + false + + + .aaxplugin + + + .aaxplugin + + + .aaxplugin + + + .aaxplugin + + + .aaxplugin + + + .aaxplugin + + + + + + + + + %(Outputs) + + + Disabled + $(AAX_INC_PATHS);%(AdditionalIncludeDirectories) + $(AAX_DEFS);$(DEBUG_DEFS);$(EXTRA_DEBUG_DEFS);%(PreprocessorDefinitions) + false + Async + EnableFastChecks + MultiThreadedDebug + true + $(IntDir)..\NeuralAmpModeler.pch + Level3 + ProgramDatabase + Default + %(ForcedIncludeFiles) + + + $(AAX_LIBS);%(AdditionalDependencies) + $(OutDir)$(BINARY_NAME).aaxplugin + true + + + Windows + $(IntDir)$(TargetName).lib + + + + + + + + + + + + %(Outputs) + + + MaxSpeed + Speed + $(AAX_INC_PATHS);%(AdditionalIncludeDirectories) + $(AAX_DEFS);$(RELEASE_DEFS);$(EXTRA_RELEASE_DEFS);%(PreprocessorDefinitions) + false + Async + MultiThreaded + StreamingSIMDExtensions2 + true + + + + + Level3 + ProgramDatabase + Default + %(ForcedIncludeFiles) + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(AAX_LIBS);%(AdditionalDependencies) + $(OutDir)$(BINARY_NAME).aaxplugin + true + Windows + $(IntDir)$(TargetName).lib + + + + + + + + + + + + %(Outputs) + + + MaxSpeed + Speed + $(AAX_INC_PATHS);%(AdditionalIncludeDirectories) + $(AAX_DEFS);$(TRACER_DEFS);$(EXTRA_TRACER_DEFS);%(PreprocessorDefinitions) + false + Async + MultiThreaded + StreamingSIMDExtensions2 + true + + + + + Level3 + ProgramDatabase + Default + %(ForcedIncludeFiles) + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(AAX_LIBS);%(AdditionalDependencies) + $(OutDir)$(BINARY_NAME).aaxplugin + true + Windows + $(IntDir)$(TargetName).lib + + + + + + + + + + + + %(Outputs) + + + X64 + + + Disabled + $(AAX_INC_PATHS);%(AdditionalIncludeDirectories) + $(AAX_DEFS);$(DEBUG_DEFS);$(EXTRA_DEBUG_DEFS);%(PreprocessorDefinitions) + false + Async + EnableFastChecks + MultiThreadedDebug + true + $(IntDir)..\NeuralAmpModeler.pch + Level3 + ProgramDatabase + Default + %(ForcedIncludeFiles) + + + $(AAX_LIBS);%(AdditionalDependencies) + $(OutDir)$(BINARY_NAME).aaxplugin + true + + + Windows + $(IntDir)$(TargetName).lib + MachineX64 + + + + + + + + + + + + %(Outputs) + + + X64 + + + MaxSpeed + $(AAX_INC_PATHS);%(AdditionalIncludeDirectories) + $(AAX_DEFS);$(RELEASE_DEFS);$(EXTRA_RELEASE_DEFS);%(PreprocessorDefinitions) + false + Async + MultiThreaded + true + + + + + Level3 + ProgramDatabase + Default + %(ForcedIncludeFiles) + Speed + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(AAX_LIBS);%(AdditionalDependencies) + $(OutDir)$(BINARY_NAME).aaxplugin + true + Windows + $(IntDir)$(TargetName).lib + MachineX64 + + + + + + + + + + + + %(Outputs) + + + X64 + + + MaxSpeed + $(AAX_INC_PATHS);%(AdditionalIncludeDirectories) + $(AAX_DEFS);$(TRACER_DEFS);$(EXTRA_TRACER_DEFS);%(PreprocessorDefinitions) + false + Async + MultiThreaded + true + + + + + Level3 + ProgramDatabase + Default + %(ForcedIncludeFiles) + Speed + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(AAX_LIBS);%(AdditionalDependencies) + $(OutDir)$(BINARY_NAME).aaxplugin + true + Windows + $(IntDir)$(TargetName).lib + MachineX64 + + + + + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + $(IntDir)%(RelativeDir) + $(IntDir)%(RelativeDir) + $(IntDir)%(RelativeDir) + $(IntDir)%(RelativeDir) + $(IntDir)%(RelativeDir) + $(IntDir)%(RelativeDir) + + + + + + + + + + + + + Document + true + true + true + + + Document + true + true + true + true + + + Document + true + true + true + + + Document + true + true + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-app.vcxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-app.vcxproj index b881807d6..c8852819e 100644 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-app.vcxproj +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-app.vcxproj @@ -1,437 +1,440 @@ - - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - Tracer - Win32 - - - Tracer - x64 - - - - {41785AE4-5B70-4A75-880B-4B418B4E13C6} - NeuralAmpModeler - NeuralAmpModeler-app - 10.0 - - - - Application - true - MultiByte - v143 - - - Application - true - MultiByte - v143 - - - Application - false - true - MultiByte - v143 - - - Application - false - true - MultiByte - v143 - - - Application - false - true - MultiByte - v143 - - - Application - false - true - MultiByte - v143 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\ - - - $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\ - - - $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\int\ - - - - - $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\int\ - - - - $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\ - - - $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\ - - - $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\int\ - - - $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\int\ - - - $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\ - - - $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\ - - - $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\int\ - - - $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\int\ - - - - Level3 - Disabled - $(APP_DEFS);$(DEBUG_DEFS);$(EXTRA_DEBUG_DEFS);%(PreprocessorDefinitions) - $(APP_INC_PATHS);%(AdditionalIncludeDirectories) - MultiThreadedDebug - - - $(APP_LIBS);%(AdditionalDependencies) - Windows - - - - - - - - - Level3 - Disabled - $(APP_DEFS);$(DEBUG_DEFS);$(EXTRA_DEBUG_DEFS);%(PreprocessorDefinitions) - $(APP_INC_PATHS);%(AdditionalIncludeDirectories) - MultiThreadedDebug - - - $(APP_LIBS);%(AdditionalDependencies) - Windows - - - - - - - - - Level3 - MaxSpeed - true - true - $(APP_DEFS);$(RELEASE_DEFS);$(EXTRA_RELEASE_DEFS);%(PreprocessorDefinitions) - $(APP_INC_PATHS);%(AdditionalIncludeDirectories) - true - Speed - - - true - true - $(APP_LIBS);%(AdditionalDependencies) - Windows - - - SA_API - - - - - Level3 - MaxSpeed - true - true - $(APP_DEFS);$(RELEASE_DEFS);$(EXTRA_RELEASE_DEFS);%(PreprocessorDefinitions) - $(APP_INC_PATHS);%(AdditionalIncludeDirectories) - true - Speed - - - true - true - $(APP_LIBS);%(AdditionalDependencies) - Windows - - - SA_API - - - - - Level3 - MaxSpeed - true - true - $(APP_DEFS);$(TRACER_DEFS);$(EXTRA_TRACER_DEFS);%(PreprocessorDefinitions) - $(APP_INC_PATHS);%(AdditionalIncludeDirectories) - true - - - true - true - $(APP_LIBS);%(AdditionalDependencies) - Windows - - - SA_API - - - - - Level3 - MaxSpeed - true - true - $(APP_DEFS);$(TRACER_DEFS);$(EXTRA_TRACER_DEFS);%(PreprocessorDefinitions) - $(APP_INC_PATHS);%(AdditionalIncludeDirectories) - true - - - true - true - $(APP_LIBS);%(AdditionalDependencies) - Windows - - - SA_API - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - $(IntDir)%(RelativeDir) - $(IntDir)%(RelativeDir) - $(IntDir)%(RelativeDir) - $(IntDir)%(RelativeDir) - $(IntDir)%(RelativeDir) - $(IntDir)%(RelativeDir) - - - - - - - - - - - - - - - - - - - Designer - - - - - - - - - + + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + Tracer + Win32 + + + Tracer + x64 + + + + {41785AE4-5B70-4A75-880B-4B418B4E13C6} + NeuralAmpModeler + NeuralAmpModeler-app + 10.0 + + + + Application + true + MultiByte + v143 + + + Application + true + MultiByte + v143 + + + Application + false + true + MultiByte + v143 + + + Application + false + true + MultiByte + v143 + + + Application + false + true + MultiByte + v143 + + + Application + false + true + MultiByte + v143 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\ + + + $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\ + + + $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\int\ + + + + + $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\int\ + + + + $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\ + + + $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\ + + + $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\int\ + + + $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\int\ + + + $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\ + + + $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\ + + + $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\int\ + + + $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\int\ + + + + Level3 + Disabled + $(APP_DEFS);$(DEBUG_DEFS);$(EXTRA_DEBUG_DEFS);%(PreprocessorDefinitions) + $(APP_INC_PATHS);%(AdditionalIncludeDirectories) + MultiThreadedDebug + + + $(APP_LIBS);%(AdditionalDependencies) + Windows + + + + + + + + + Level3 + Disabled + $(APP_DEFS);$(DEBUG_DEFS);$(EXTRA_DEBUG_DEFS);%(PreprocessorDefinitions) + $(APP_INC_PATHS);%(AdditionalIncludeDirectories) + MultiThreadedDebug + + + $(APP_LIBS);%(AdditionalDependencies) + Windows + + + + + + + + + Level3 + MaxSpeed + true + true + $(APP_DEFS);$(RELEASE_DEFS);$(EXTRA_RELEASE_DEFS);%(PreprocessorDefinitions) + $(APP_INC_PATHS);%(AdditionalIncludeDirectories) + true + Speed + + + true + true + $(APP_LIBS);%(AdditionalDependencies) + Windows + + + SA_API + + + + + Level3 + MaxSpeed + true + true + $(APP_DEFS);$(RELEASE_DEFS);$(EXTRA_RELEASE_DEFS);%(PreprocessorDefinitions) + $(APP_INC_PATHS);%(AdditionalIncludeDirectories) + true + Speed + + + true + true + $(APP_LIBS);%(AdditionalDependencies) + Windows + + + SA_API + + + + + Level3 + MaxSpeed + true + true + $(APP_DEFS);$(TRACER_DEFS);$(EXTRA_TRACER_DEFS);%(PreprocessorDefinitions) + $(APP_INC_PATHS);%(AdditionalIncludeDirectories) + true + + + true + true + $(APP_LIBS);%(AdditionalDependencies) + Windows + + + SA_API + + + + + Level3 + MaxSpeed + true + true + $(APP_DEFS);$(TRACER_DEFS);$(EXTRA_TRACER_DEFS);%(PreprocessorDefinitions) + $(APP_INC_PATHS);%(AdditionalIncludeDirectories) + true + + + true + true + $(APP_LIBS);%(AdditionalDependencies) + Windows + + + SA_API + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + $(IntDir)%(RelativeDir) + $(IntDir)%(RelativeDir) + $(IntDir)%(RelativeDir) + $(IntDir)%(RelativeDir) + $(IntDir)%(RelativeDir) + $(IntDir)%(RelativeDir) + + + + + + + + + + + + + + + + + + + + + Designer + + + + + + + + + \ No newline at end of file diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-iOS.xcodeproj/project.pbxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-iOS.xcodeproj/project.pbxproj index db784687d..cf9d95eb7 100644 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-iOS.xcodeproj/project.pbxproj +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-iOS.xcodeproj/project.pbxproj @@ -44,13 +44,15 @@ 4FBDC95B29FFF143004FF203 /* convnet.h in Headers */ = {isa = PBXBuildFile; fileRef = 4FBDC94229FFF143004FF203 /* convnet.h */; }; 4FBDC95C29FFF143004FF203 /* lstm.h in Headers */ = {isa = PBXBuildFile; fileRef = 4FBDC94329FFF143004FF203 /* lstm.h */; }; 4FBDC95D29FFF143004FF203 /* convnet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FBDC94429FFF143004FF203 /* convnet.cpp */; }; - 4FBDC95E29FFF143004FF203 /* wavenet.h in Headers */ = {isa = PBXBuildFile; fileRef = 4FBDC94529FFF143004FF203 /* wavenet.h */; }; + 4FBDC95E29FFF143004FF203 /* model.h in Headers */ = {isa = PBXBuildFile; fileRef = 4FBDC94529FFF143004FF203 /* model.h */; }; 4FBDC95F29FFF143004FF203 /* lstm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FBDC94629FFF143004FF203 /* lstm.cpp */; }; 4FBDC96029FFF143004FF203 /* util.h in Headers */ = {isa = PBXBuildFile; fileRef = 4FBDC94729FFF143004FF203 /* util.h */; }; 4FBDC96129FFF143004FF203 /* dsp.h in Headers */ = {isa = PBXBuildFile; fileRef = 4FBDC94829FFF143004FF203 /* dsp.h */; }; 4FBDC96229FFF143004FF203 /* activations.h in Headers */ = {isa = PBXBuildFile; fileRef = 4FBDC94929FFF143004FF203 /* activations.h */; }; 4FBDC96329FFF143004FF203 /* activations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FBDC94A29FFF143004FF203 /* activations.cpp */; }; - 4FBDC96429FFF143004FF203 /* wavenet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FBDC94B29FFF143004FF203 /* wavenet.cpp */; }; + 4FBDC96429FFF143004FF203 /* model.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FBDC94B29FFF143004FF203 /* model.cpp */; }; + 4FBDC98029FFF143004FF203 /* slimmable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FBDC97E29FFF143004FF203 /* slimmable.cpp */; }; + 4FBDC98129FFF143004FF203 /* container.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FBDC97F29FFF143004FF203 /* container.cpp */; }; 4FBDC96529FFF143004FF203 /* get_dsp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FBDC94C29FFF143004FF203 /* get_dsp.cpp */; }; 4FBDC97729FFF143004FF203 /* conv1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FBDC97029FFF143004FF203 /* conv1d.cpp */; }; 4FBDC97829FFF143004FF203 /* conv1d.h in Headers */ = {isa = PBXBuildFile; fileRef = 4FBDC97129FFF143004FF203 /* conv1d.h */; }; @@ -287,7 +289,7 @@ 4FBDC94229FFF143004FF203 /* convnet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = convnet.h; sourceTree = ""; }; 4FBDC94329FFF143004FF203 /* lstm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lstm.h; sourceTree = ""; }; 4FBDC94429FFF143004FF203 /* convnet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = convnet.cpp; sourceTree = ""; }; - 4FBDC94529FFF143004FF203 /* wavenet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wavenet.h; sourceTree = ""; }; + 4FBDC94529FFF143004FF203 /* model.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wavenet/model.h; sourceTree = ""; }; 4FBDC94629FFF143004FF203 /* lstm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lstm.cpp; sourceTree = ""; }; 4FBDC97029FFF143004FF203 /* conv1d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = conv1d.cpp; sourceTree = ""; }; 4FBDC97129FFF143004FF203 /* conv1d.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = conv1d.h; sourceTree = ""; }; @@ -300,7 +302,9 @@ 4FBDC94829FFF143004FF203 /* dsp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dsp.h; sourceTree = ""; }; 4FBDC94929FFF143004FF203 /* activations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = activations.h; sourceTree = ""; }; 4FBDC94A29FFF143004FF203 /* activations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = activations.cpp; sourceTree = ""; }; - 4FBDC94B29FFF143004FF203 /* wavenet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wavenet.cpp; sourceTree = ""; }; + 4FBDC94B29FFF143004FF203 /* model.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wavenet/model.cpp; sourceTree = ""; }; + 4FBDC97E29FFF143004FF203 /* slimmable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wavenet/slimmable.cpp; sourceTree = ""; }; + 4FBDC97F29FFF143004FF203 /* container.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = container.cpp; sourceTree = ""; }; 4FBDC94C29FFF143004FF203 /* get_dsp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = get_dsp.cpp; sourceTree = ""; }; 4FC46E58231440C8000045E7 /* web */ = {isa = PBXFileReference; lastKnownFileType = folder; name = web; path = ../resources/web; sourceTree = ""; }; 4FC6982F293BA47F0076EC33 /* NeuralAmpModelerAU.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = NeuralAmpModelerAU.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -684,8 +688,10 @@ 4FBDC93F29FFF143004FF203 /* util.cpp */, 4FBDC94729FFF143004FF203 /* util.h */, 4FBDC94029FFF143004FF203 /* version.h */, - 4FBDC94B29FFF143004FF203 /* wavenet.cpp */, - 4FBDC94529FFF143004FF203 /* wavenet.h */, + 4FBDC94B29FFF143004FF203 /* model.cpp */, + 4FBDC97E29FFF143004FF203 /* slimmable.cpp */, + 4FBDC97F29FFF143004FF203 /* container.cpp */, + 4FBDC94529FFF143004FF203 /* model.h */, 4FBDC97029FFF143004FF203 /* conv1d.cpp */, 4FBDC97129FFF143004FF203 /* conv1d.h */, 4FBDC97229FFF143004FF203 /* ring_buffer.cpp */, @@ -853,7 +859,7 @@ 4FBDC94D29FFF143004FF203 /* Resample.h in Headers */, 4FC6983A293BA4F10076EC33 /* NeuralAmpModelerAU.h in Headers */, 4FBDC95629FFF143004FF203 /* dsp.h in Headers */, - 4FBDC95E29FFF143004FF203 /* wavenet.h in Headers */, + 4FBDC95E29FFF143004FF203 /* model.h in Headers */, 4FBDC97829FFF143004FF203 /* conv1d.h in Headers */, 4FBDC97A29FFF143004FF203 /* ring_buffer.h in Headers */, 4FBDC97B29FFF143004FF203 /* film.h in Headers */, @@ -1084,7 +1090,9 @@ 4FBDC94E29FFF143004FF203 /* RecursiveLinearFilter.cpp in Sources */, 4FBDC95829FFF143004FF203 /* util.cpp in Sources */, 4FC69849293BA5F90076EC33 /* ITextEntryControl.cpp in Sources */, - 4FBDC96429FFF143004FF203 /* wavenet.cpp in Sources */, + 4FBDC96429FFF143004FF203 /* model.cpp in Sources */, + 4FBDC98029FFF143004FF203 /* slimmable.cpp in Sources */, + 4FBDC98129FFF143004FF203 /* container.cpp in Sources */, 4FBDC97729FFF143004FF203 /* conv1d.cpp in Sources */, 4FBDC97929FFF143004FF203 /* ring_buffer.cpp in Sources */, 4FC6984C293BA6010076EC33 /* IGraphicsCoreText.mm in Sources */, diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/project.pbxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/project.pbxproj index f4d906417..495fde4c8 100644 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/project.pbxproj +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/project.pbxproj @@ -55,7 +55,6 @@ 4F0848292015129A00F9E881 /* IPlugAAX_Parameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F0848252015129300F9E881 /* IPlugAAX_Parameters.cpp */; }; 4F0D965C23099F6900BFDED0 /* IPlugProcessor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F8F61A8202807B9003F2573 /* IPlugProcessor.cpp */; }; 4F10D3D9203A6719003EF82A /* RtMidi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F10D3D7203A6719003EF82A /* RtMidi.cpp */; settings = {COMPILER_FLAGS = "-Wno-shorten-64-to-32"; }; }; - 4F1A527B205D910000CF2908 /* IPlugVST2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F1A527A205D910000CF2908 /* IPlugVST2.cpp */; }; 4F1A527E205D911A00CF2908 /* IPlugVST3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F1A527C205D911900CF2908 /* IPlugVST3.cpp */; }; 4F1A5282205D913300CF2908 /* IPlugAPP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F1A5280205D913300CF2908 /* IPlugAPP.cpp */; }; 4F1A5285205D914A00CF2908 /* IPlugAAX.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F1A5284205D914A00CF2908 /* IPlugAAX.cpp */; }; @@ -163,7 +162,7 @@ 4F2FB1A22A0047430027AB66 /* convnet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB14B2A0047420027AB66 /* convnet.cpp */; }; 4F2FB1A32A0047430027AB66 /* convnet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB14B2A0047420027AB66 /* convnet.cpp */; }; 4F2FB1A42A0047430027AB66 /* convnet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB14B2A0047420027AB66 /* convnet.cpp */; }; - 4F2FB1A52A0047430027AB66 /* wavenet.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F2FB14C2A0047420027AB66 /* wavenet.h */; }; + 4F2FB1A52A0047430027AB66 /* model.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F2FB14C2A0047420027AB66 /* model.h */; }; 4F2FB1E22A0047430027AB68 /* film.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F2FB15A2A0047420027AB68 /* film.h */; }; 4F2FB1E32A0047430027AB68 /* gating_activations.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F2FB15B2A0047420027AB68 /* gating_activations.h */; }; 4F2FB1E42A0047430027AB68 /* registry.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F2FB15C2A0047420027AB68 /* registry.h */; }; @@ -206,6 +205,15 @@ B1D2F7072D0000020027AB66 /* slimmable_wavenet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1D2F7002D0000010027AB66 /* slimmable_wavenet.cpp */; }; B1D2F7082D0000020027AB66 /* slimmable_wavenet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1D2F7002D0000010027AB66 /* slimmable_wavenet.cpp */; }; B1D2F7092D0000020027AB66 /* slimmable_wavenet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1D2F7002D0000010027AB66 /* slimmable_wavenet.cpp */; }; + AAB7E0112CC4B8C6000B8B6E /* container.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAB7E0102CC4B8C6000B8B6E /* container.cpp */; }; + AAB7E0122CC4B8C6000B8B6E /* container.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAB7E0102CC4B8C6000B8B6E /* container.cpp */; }; + AAB7E0132CC4B8C6000B8B6E /* container.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAB7E0102CC4B8C6000B8B6E /* container.cpp */; }; + AAB7E0142CC4B8C6000B8B6E /* container.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAB7E0102CC4B8C6000B8B6E /* container.cpp */; }; + AAB7E0152CC4B8C6000B8B6E /* container.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAB7E0102CC4B8C6000B8B6E /* container.cpp */; }; + AAB7E0162CC4B8C6000B8B6E /* container.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAB7E0102CC4B8C6000B8B6E /* container.cpp */; }; + AAB7E0172CC4B8C6000B8B6E /* container.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAB7E0102CC4B8C6000B8B6E /* container.cpp */; }; + AAB7E0182CC4B8C6000B8B6E /* container.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAB7E0102CC4B8C6000B8B6E /* container.cpp */; }; + AAB7E0192CC4B8C6000B8B6E /* container.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAB7E0102CC4B8C6000B8B6E /* container.cpp */; }; 4F2FB1C42A0047430027AB66 /* get_dsp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB1532A0047420027AB66 /* get_dsp.cpp */; }; 4F2FB1C52A0047430027AB66 /* get_dsp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB1532A0047420027AB66 /* get_dsp.cpp */; }; 4F2FB1C62A0047430027AB66 /* get_dsp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB1532A0047420027AB66 /* get_dsp.cpp */; }; @@ -564,13 +572,6 @@ remoteGlobalIDString = B87FD1E62351C6F900CF7307; remoteInfo = PLists; }; - B87FD1F12351C76C00CF7307 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 089C1669FE841209C02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = B87FD1E62351C6F900CF7307; - remoteInfo = PLists; - }; B87FD1F32351C76E00CF7307 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 089C1669FE841209C02AAC07 /* Project object */; @@ -664,8 +665,6 @@ 4F10D3D3203A6711003EF82A /* RtAudio.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RtAudio.cpp; path = ../../iPlug2/Dependencies/IPlug/RTAudio/RtAudio.cpp; sourceTree = ""; }; 4F10D3D6203A6719003EF82A /* RtMidi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RtMidi.h; path = ../../iPlug2/Dependencies/IPlug/RTMidi/RtMidi.h; sourceTree = ""; }; 4F10D3D7203A6719003EF82A /* RtMidi.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RtMidi.cpp; path = ../../iPlug2/Dependencies/IPlug/RTMidi/RtMidi.cpp; sourceTree = ""; }; - 4F1A5279205D90FF00CF2908 /* IPlugVST2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IPlugVST2.h; path = ../../iPlug2/IPlug/VST2/IPlugVST2.h; sourceTree = ""; }; - 4F1A527A205D910000CF2908 /* IPlugVST2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = IPlugVST2.cpp; path = ../../iPlug2/IPlug/VST2/IPlugVST2.cpp; sourceTree = ""; }; 4F1A527C205D911900CF2908 /* IPlugVST3.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; name = IPlugVST3.cpp; path = ../../iPlug2/IPlug/VST3/IPlugVST3.cpp; sourceTree = ""; tabWidth = 2; }; 4F1A527D205D911900CF2908 /* IPlugVST3.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; name = IPlugVST3.h; path = ../../iPlug2/IPlug/VST3/IPlugVST3.h; sourceTree = ""; tabWidth = 2; }; 4F1A527F205D913200CF2908 /* IPlugAPP.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; name = IPlugAPP.h; path = ../../iPlug2/IPlug/APP/IPlugAPP.h; sourceTree = ""; tabWidth = 2; }; @@ -678,10 +677,8 @@ 4F1A528A205D916F00CF2908 /* IPlugAU.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; name = IPlugAU.cpp; path = ../../iPlug2/IPlug/AUv2/IPlugAU.cpp; sourceTree = ""; tabWidth = 2; }; 4F1B4AE32014D33600BC64D4 /* NeuralAmpModeler-macOS-MainMenu.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "NeuralAmpModeler-macOS-MainMenu.xib"; path = "../resources/NeuralAmpModeler-macOS-MainMenu.xib"; sourceTree = ""; }; 4F1F1BE9135B1F60003A5BB2 /* wdlendian.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = wdlendian.h; path = ../../iPlug2/WDL/wdlendian.h; sourceTree = SOURCE_ROOT; }; - 4F20EF33132C69FE0030E34C /* NeuralAmpModeler.vst */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = NeuralAmpModeler.vst; sourceTree = BUILT_PRODUCTS_DIR; }; 4F23BA1313B647E50097A67E /* NeuralAmpModeler-AU-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "NeuralAmpModeler-AU-Info.plist"; path = "../resources/NeuralAmpModeler-AU-Info.plist"; sourceTree = ""; }; 4F23BA1413B647E50097A67E /* NeuralAmpModeler-macOS-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "NeuralAmpModeler-macOS-Info.plist"; path = "../resources/NeuralAmpModeler-macOS-Info.plist"; sourceTree = ""; }; - 4F23BA1513B647E50097A67E /* NeuralAmpModeler-VST2-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "NeuralAmpModeler-VST2-Info.plist"; path = "../resources/NeuralAmpModeler-VST2-Info.plist"; sourceTree = ""; }; 4F2EA977203A50E9008E4850 /* IPlugAPP_dialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; name = IPlugAPP_dialog.cpp; path = ../../iPlug2/IPlug/APP/IPlugAPP_dialog.cpp; sourceTree = ""; tabWidth = 2; }; 4F2FB13A2A0047420027AB66 /* Resample.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Resample.h; sourceTree = ""; }; 4F2FB13B2A0047420027AB66 /* RecursiveLinearFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RecursiveLinearFilter.cpp; sourceTree = ""; }; @@ -704,7 +701,7 @@ 4F2FB1572A0047420027AB67 /* conv1d.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = conv1d.h; sourceTree = ""; }; 4F2FB1582A0047420027AB67 /* ring_buffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ring_buffer.cpp; sourceTree = ""; }; 4F2FB1592A0047420027AB67 /* ring_buffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ring_buffer.h; sourceTree = ""; }; - 4F2FB14C2A0047420027AB66 /* wavenet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wavenet.h; sourceTree = ""; }; + 4F2FB14C2A0047420027AB66 /* model.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wavenet/model.h; sourceTree = ""; }; 4F2FB15A2A0047420027AB68 /* film.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = film.h; sourceTree = ""; }; 4F2FB15B2A0047420027AB68 /* gating_activations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gating_activations.h; sourceTree = ""; }; 4F2FB15C2A0047420027AB68 /* registry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = registry.h; sourceTree = ""; }; @@ -713,8 +710,9 @@ 4F2FB14F2A0047420027AB66 /* dsp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dsp.h; sourceTree = ""; }; 4F2FB1502A0047420027AB66 /* activations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = activations.h; sourceTree = ""; }; 4F2FB1512A0047420027AB66 /* activations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = activations.cpp; sourceTree = ""; }; - 4F2FB1522A0047420027AB66 /* wavenet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wavenet.cpp; sourceTree = ""; }; - B1D2F7002D0000010027AB66 /* slimmable_wavenet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slimmable_wavenet.cpp; sourceTree = ""; }; + 4F2FB1522A0047420027AB66 /* model.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wavenet/model.cpp; sourceTree = ""; }; + B1D2F7002D0000010027AB66 /* slimmable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wavenet/slimmable.cpp; sourceTree = ""; }; + AAB7E0102CC4B8C6000B8B6E /* container.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = container.cpp; sourceTree = ""; }; 4F2FB1532A0047420027AB66 /* get_dsp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = get_dsp.cpp; sourceTree = ""; }; 4F35DEAB207E5C5A00867D8F /* IPlugPluginBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; name = IPlugPluginBase.cpp; path = ../../iPlug2/IPlug/IPlugPluginBase.cpp; sourceTree = ""; tabWidth = 2; }; 4F35DEAC207E5C5A00867D8F /* IPlugPluginBase.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; name = IPlugPluginBase.h; path = ../../iPlug2/IPlug/IPlugPluginBase.h; sourceTree = ""; tabWidth = 2; }; @@ -759,8 +757,6 @@ 4F78BE1022E73DD900AD537E /* NeuralAmpModelerAU.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NeuralAmpModelerAU.h; path = ../resources/NeuralAmpModelerAU.h; sourceTree = ""; }; 4F78BE1122E73DD900AD537E /* NeuralAmpModeler-macOS-AUv3Framework-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "NeuralAmpModeler-macOS-AUv3Framework-Info.plist"; path = "../resources/NeuralAmpModeler-macOS-AUv3Framework-Info.plist"; sourceTree = ""; }; 4F78D8BD13B63A4E0032E0F3 /* wdltypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = wdltypes.h; path = ../../iPlug2/WDL/wdltypes.h; sourceTree = SOURCE_ROOT; }; - 4F78D8D213B63B5D0032E0F3 /* aeffect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = aeffect.h; sourceTree = ""; }; - 4F78D8D313B63B5D0032E0F3 /* aeffectx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = aeffectx.h; sourceTree = ""; }; 4F78D8E613B63BA40032E0F3 /* IPlug_include_in_plug_hdr.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; name = IPlug_include_in_plug_hdr.h; path = ../../iPlug2/IPlug/IPlug_include_in_plug_hdr.h; sourceTree = SOURCE_ROOT; tabWidth = 2; }; 4F78D8E813B63BA40032E0F3 /* IPlug_include_in_plug_src.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; name = IPlug_include_in_plug_src.h; path = ../../iPlug2/IPlug/IPlug_include_in_plug_src.h; sourceTree = SOURCE_ROOT; tabWidth = 2; }; 4F78D8EC13B63BA40032E0F3 /* IPlugAPIBase.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; name = IPlugAPIBase.h; path = ../../iPlug2/IPlug/IPlugAPIBase.h; sourceTree = SOURCE_ROOT; tabWidth = 2; }; @@ -1079,13 +1075,6 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 4F20EF2C132C69FE0030E34C /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; 4F39075D2013EBA300DDA490 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -1199,7 +1188,6 @@ 4F23BA1413B647E50097A67E /* NeuralAmpModeler-macOS-Info.plist */, 4F3907872013ED2F00DDA490 /* NeuralAmpModeler-macOS-AUv3-Info.plist */, 4F78BE1122E73DD900AD537E /* NeuralAmpModeler-macOS-AUv3Framework-Info.plist */, - 4F23BA1513B647E50097A67E /* NeuralAmpModeler-VST2-Info.plist */, 4F3E693A1409747300C4D749 /* NeuralAmpModeler-VST3-Info.plist */, 4F23BA1313B647E50097A67E /* NeuralAmpModeler-AU-Info.plist */, 4F4CC3811549B8A700A9EA21 /* NeuralAmpModeler-AAX-Info.plist */, @@ -1211,7 +1199,6 @@ isa = PBXGroup; children = ( 4FD16A0913B63081001D0217 /* NeuralAmpModeler.app */, - 4F20EF33132C69FE0030E34C /* NeuralAmpModeler.vst */, 4F9828E0140A9EB700F3FCC1 /* NeuralAmpModeler.vst3 */, 4F78DB5F13B6462B0032E0F3 /* NeuralAmpModeler.component */, 4FB600331567CB0A0020189A /* NeuralAmpModeler.aaxplugin */, @@ -1347,9 +1334,10 @@ 4F2FB1462A0047420027AB66 /* util.cpp */, 4F2FB14E2A0047420027AB66 /* util.h */, 4F2FB1472A0047420027AB66 /* version.h */, - 4F2FB1522A0047420027AB66 /* wavenet.cpp */, - B1D2F7002D0000010027AB66 /* slimmable_wavenet.cpp */, - 4F2FB14C2A0047420027AB66 /* wavenet.h */, + 4F2FB1522A0047420027AB66 /* model.cpp */, + B1D2F7002D0000010027AB66 /* slimmable.cpp */, + AAB7E0102CC4B8C6000B8B6E /* container.cpp */, + 4F2FB14C2A0047420027AB66 /* model.h */, 4F2FB15A2A0047420027AB68 /* film.h */, 4F2FB15B2A0047420027AB68 /* gating_activations.h */, 4F2FB15C2A0047420027AB68 /* registry.h */, @@ -1484,7 +1472,6 @@ 4F4CC4241549BEBF00A9EA21 /* AAX */, 4F78D9FA13B63CA10032E0F3 /* APP */, 4F3E69001409743C00C4D749 /* VST3 */, - 4F78D9F713B63C710032E0F3 /* VST2 */, 4F78D8E613B63BA40032E0F3 /* IPlug_include_in_plug_hdr.h */, 4F78D8E813B63BA40032E0F3 /* IPlug_include_in_plug_src.h */, 4FBAA593207918230054E717 /* IPlugDelegate_select.h */, @@ -1512,26 +1499,6 @@ name = IPlug; sourceTree = ""; }; - 4F78D8D113B63B5D0032E0F3 /* VST2_SDK */ = { - isa = PBXGroup; - children = ( - 4F78D8D213B63B5D0032E0F3 /* aeffect.h */, - 4F78D8D313B63B5D0032E0F3 /* aeffectx.h */, - ); - name = VST2_SDK; - path = ../../iPlug2/Dependencies/IPlug/VST2_SDK; - sourceTree = SOURCE_ROOT; - }; - 4F78D9F713B63C710032E0F3 /* VST2 */ = { - isa = PBXGroup; - children = ( - 4F78D8D113B63B5D0032E0F3 /* VST2_SDK */, - 4F1A527A205D910000CF2908 /* IPlugVST2.cpp */, - 4F1A5279205D90FF00CF2908 /* IPlugVST2.h */, - ); - name = VST2; - sourceTree = ""; - }; 4F78D9F913B63C920032E0F3 /* AUv2 */ = { isa = PBXGroup; children = ( @@ -2065,7 +2032,7 @@ 4F4856862773C3B5005BCF8E /* IPlugAUAudioUnit.h in Headers */, 4F2FB15F2A0047420027AB66 /* NoiseGate.h in Headers */, 4F2FB17D2A0047430027AB66 /* dsp.h in Headers */, - 4F2FB1A52A0047430027AB66 /* wavenet.h in Headers */, + 4F2FB1A52A0047430027AB66 /* model.h in Headers */, 4F2FB1E22A0047430027AB68 /* film.h in Headers */, 4F2FB1E32A0047430027AB68 /* gating_activations.h in Headers */, 4F2FB1E42A0047430027AB68 /* registry.h in Headers */, @@ -2126,26 +2093,6 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 4F20EEC8132C69FE0030E34C /* VST2 */ = { - isa = PBXNativeTarget; - buildConfigurationList = 4F20EF2F132C69FE0030E34C /* Build configuration list for PBXNativeTarget "VST2" */; - buildPhases = ( - 4FBCC1B31FD5AE9F00EFE550 /* Run Script - prepare_resources-mac.py */, - 4F20EEC9132C69FE0030E34C /* Resources */, - 4F20EECA132C69FE0030E34C /* Sources */, - 4F20EF2C132C69FE0030E34C /* Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - B87FD1F22351C76C00CF7307 /* PBXTargetDependency */, - ); - name = VST2; - productInstallPath = "$(HOME)/Library/Bundles"; - productName = IPlugExample; - productReference = 4F20EF33132C69FE0030E34C /* NeuralAmpModeler.vst */; - productType = "com.apple.product-type.bundle"; - }; 4F39075F2013EBA300DDA490 /* AUv3 */ = { isa = PBXNativeTarget; buildConfigurationList = 4F3907742013EBA400DDA490 /* Build configuration list for PBXNativeTarget "AUv3" */; @@ -2393,7 +2340,6 @@ targets = ( 4F78DAF113B643600032E0F3 /* All */, 4FD16A0813B63081001D0217 /* APP */, - 4F20EEC8132C69FE0030E34C /* VST2 */, 4F9828AA140A9EB700F3FCC1 /* VST3 */, 4F3AE17812C0E5E2001FD7A4 /* AU */, 4FB600121567CB0A0020189A /* AAX */, @@ -2418,13 +2364,6 @@ /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ - 4F20EEC9132C69FE0030E34C /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; 4F25BECE12C61F47005D51F7 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -2586,21 +2525,6 @@ shellPath = /bin/sh; shellScript = "python3 ../scripts/prepare_resources-mac.py\n../../iPlug2/WDL/swell/swell_resgen.sh ../resources/main.rc\n"; }; - 4FBCC1B31FD5AE9F00EFE550 /* Run Script - prepare_resources-mac.py */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "Run Script - prepare_resources-mac.py"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "python3 ../scripts/prepare_resources-mac.py\n"; - showEnvVarsInLog = 0; - }; 4FBCC1B41FD5AEB700EFE550 /* Run Script - prepare_resources-mac.py */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; @@ -2664,47 +2588,6 @@ /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - 4F20EECA132C69FE0030E34C /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 4F2FB16A2A0047430027AB66 /* NoiseGate.cpp in Sources */, - 4FDAC0EB207D76C600299363 /* IPlugTimer.cpp in Sources */, - 4F2FB1A72A0047430027AB66 /* lstm.cpp in Sources */, - 4F03A5AD20A4621100EBDFFB /* IGraphics.cpp in Sources */, - 4F5F344220C0226200487201 /* IPlugPaths.mm in Sources */, - AA341E1E2B9E5A530069C260 /* ToneStack.cpp in Sources */, - 4F2FB1B32A0047430027AB66 /* activations.cpp in Sources */, - 4F2FB1612A0047430027AB66 /* dsp.cpp in Sources */, - 4F2FB19D2A0047430027AB66 /* convnet.cpp in Sources */, - 4F6369EC20A466470022C370 /* IControl.cpp in Sources */, - 4FB1F58A20E4B005004157C8 /* IGraphicsMac.mm in Sources */, - 4F1A527B205D910000CF2908 /* IPlugVST2.cpp in Sources */, - 4F2FB1732A0047430027AB66 /* ImpulseResponse.cpp in Sources */, - 4F8C10E120BA2796006320CD /* IGraphicsEditorDelegate.cpp in Sources */, - 4F6369DE20A464BB0022C370 /* IGraphicsNanoVG_src.m in Sources */, - 4F7C4958255DDFC400DF7588 /* IControls.cpp in Sources */, - 4F2FB1562A0047420027AB66 /* RecursiveLinearFilter.cpp in Sources */, - 4F2FB1BC2A0047430027AB66 /* wavenet.cpp in Sources */, - B1D2F7022D0000020027AB66 /* slimmable_wavenet.cpp in Sources */, - 4F2FB1CE2A0047430027AB66 /* conv1d.cpp in Sources */, - 4F2FB1D82A0047430027AB66 /* ring_buffer.cpp in Sources */, - 4F2FB1922A0047430027AB66 /* dsp.cpp in Sources */, - 4F8D9707209EF5AC006E2A11 /* NeuralAmpModeler.cpp in Sources */, - 4F7C495A255DDFC400DF7588 /* ITextEntryControl.cpp in Sources */, - 4F2FB17F2A0047430027AB66 /* wav.cpp in Sources */, - 4F78D9BB13B63BA50032E0F3 /* IPlugAPIBase.cpp in Sources */, - 4FB1F59020E4B010004157C8 /* IGraphicsMac_view.mm in Sources */, - 4F993F7223055C96000313AF /* IPlugProcessor.cpp in Sources */, - 4F35DEAE207E5C5A00867D8F /* IPlugPluginBase.cpp in Sources */, - 4F6FD2B222675B6300FC59E6 /* IGraphicsCoreText.mm in Sources */, - 4F2FB1C52A0047430027AB66 /* get_dsp.cpp in Sources */, - 4F78D9C813B63BA50032E0F3 /* IPlugParameter.cpp in Sources */, - 4F7C4959255DDFC400DF7588 /* IPopupMenuControl.cpp in Sources */, - 4F2FB1882A0047430027AB66 /* util.cpp in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 4F39075C2013EBA300DDA490 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -2713,6 +2596,7 @@ 4F2FB1842A0047430027AB66 /* wav.cpp in Sources */, 4F2FB1C12A0047430027AB66 /* wavenet.cpp in Sources */, B1D2F7072D0000020027AB66 /* slimmable_wavenet.cpp in Sources */, + AAB7E0122CC4B8C6000B8B6E /* container.cpp in Sources */, 4F2FB1CF2A0047430027AB66 /* conv1d.cpp in Sources */, 4F2FB1D92A0047430027AB66 /* ring_buffer.cpp in Sources */, 4F2FB1662A0047430027AB66 /* dsp.cpp in Sources */, @@ -2751,6 +2635,7 @@ 4F993F7423055C96000313AF /* IPlugProcessor.cpp in Sources */, 4F2FB1BE2A0047430027AB66 /* wavenet.cpp in Sources */, B1D2F7042D0000020027AB66 /* slimmable_wavenet.cpp in Sources */, + AAB7E0132CC4B8C6000B8B6E /* container.cpp in Sources */, 4F2FB1D02A0047430027AB66 /* conv1d.cpp in Sources */, 4F2FB1DA2A0047430027AB66 /* ring_buffer.cpp in Sources */, 4F8C10E320BA2796006320CD /* IGraphicsEditorDelegate.cpp in Sources */, @@ -2792,6 +2677,7 @@ 4F2FB1992A0047430027AB66 /* dsp.cpp in Sources */, 4F2FB1C32A0047430027AB66 /* wavenet.cpp in Sources */, B1D2F7092D0000020027AB66 /* slimmable_wavenet.cpp in Sources */, + AAB7E0142CC4B8C6000B8B6E /* container.cpp in Sources */, 4F2FB1D12A0047430027AB66 /* conv1d.cpp in Sources */, 4F2FB1DB2A0047430027AB66 /* ring_buffer.cpp in Sources */, 4F3EE1D0231438D000004786 /* IGraphicsMac_view.mm in Sources */, @@ -2859,6 +2745,7 @@ 4F78BE2522E7406D00AD537E /* IPlugPluginBase.cpp in Sources */, 4F2FB1C22A0047430027AB66 /* wavenet.cpp in Sources */, B1D2F7082D0000020027AB66 /* slimmable_wavenet.cpp in Sources */, + AAB7E0152CC4B8C6000B8B6E /* container.cpp in Sources */, 4F2FB1D22A0047430027AB66 /* conv1d.cpp in Sources */, 4F2FB1DC2A0047430027AB66 /* ring_buffer.cpp in Sources */, 4F2FB1A32A0047430027AB66 /* convnet.cpp in Sources */, @@ -2894,6 +2781,7 @@ 4F2FB1622A0047430027AB66 /* dsp.cpp in Sources */, 4F2FB1BD2A0047430027AB66 /* wavenet.cpp in Sources */, B1D2F7032D0000020027AB66 /* slimmable_wavenet.cpp in Sources */, + AAB7E0162CC4B8C6000B8B6E /* container.cpp in Sources */, 4F2FB1D32A0047430027AB66 /* conv1d.cpp in Sources */, 4F2FB1DD2A0047430027AB66 /* ring_buffer.cpp in Sources */, 4F815919205D50EB00393585 /* memorystream.cpp in Sources */, @@ -2975,6 +2863,7 @@ 4FB600231567CB0A0020189A /* IPlugParameter.cpp in Sources */, 4F2FB1BF2A0047430027AB66 /* wavenet.cpp in Sources */, B1D2F7052D0000020027AB66 /* slimmable_wavenet.cpp in Sources */, + AAB7E0172CC4B8C6000B8B6E /* container.cpp in Sources */, 4F2FB1D42A0047430027AB66 /* conv1d.cpp in Sources */, 4F2FB1DE2A0047430027AB66 /* ring_buffer.cpp in Sources */, 4F2FB1A02A0047430027AB66 /* convnet.cpp in Sources */, @@ -3032,6 +2921,7 @@ 4F2FB1912A0047430027AB66 /* dsp.cpp in Sources */, 4F2FB1BB2A0047430027AB66 /* wavenet.cpp in Sources */, B1D2F7012D0000020027AB66 /* slimmable_wavenet.cpp in Sources */, + AAB7E0182CC4B8C6000B8B6E /* container.cpp in Sources */, 4F2FB1D52A0047430027AB66 /* conv1d.cpp in Sources */, 4F2FB1DF2A0047430027AB66 /* ring_buffer.cpp in Sources */, 4FB1F59120E4B011004157C8 /* IGraphicsMac_view.mm in Sources */, @@ -3108,6 +2998,7 @@ 4F2FB1AB2A0047430027AB66 /* lstm.cpp in Sources */, 4F2FB1C02A0047430027AB66 /* wavenet.cpp in Sources */, B1D2F7062D0000020027AB66 /* slimmable_wavenet.cpp in Sources */, + AAB7E0192CC4B8C6000B8B6E /* container.cpp in Sources */, 4F2FB1D62A0047430027AB66 /* conv1d.cpp in Sources */, 4F2FB1E02A0047430027AB66 /* ring_buffer.cpp in Sources */, 4FFBB91F20863B0E00DDD0E7 /* vstparameters.cpp in Sources */, @@ -3173,11 +3064,6 @@ target = B87FD1E62351C6F900CF7307 /* Update plists */; targetProxy = B87FD1EF2351C74300CF7307 /* PBXContainerItemProxy */; }; - B87FD1F22351C76C00CF7307 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = B87FD1E62351C6F900CF7307 /* Update plists */; - targetProxy = B87FD1F12351C76C00CF7307 /* PBXContainerItemProxy */; - }; B87FD1F42351C76E00CF7307 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = B87FD1E62351C6F900CF7307 /* Update plists */; @@ -3372,78 +3258,6 @@ }; name = Release; }; - 4F20EF30132C69FE0030E34C /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_IDENTITY = ""; - CURRENT_PROJECT_VERSION = 0.5.7; - DEAD_CODE_STRIPPING = YES; - DSTROOT = "$(VST2_PATH)"; - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(EXTRA_PLUGIN_DEFS)", - "$(EXTRA_VST2_DEFS)", - "$(VST2_DEFS)", - "$(inherited)", - ); - INFOPLIST_FILE = "../resources/NeuralAmpModeler-VST2-Info.plist"; - MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 0.5.7; - PRODUCT_BUNDLE_IDENTIFIER = "com.StevenAtkinson.vst.${BINARY_NAME}"; - SKIP_INSTALL = NO; - WARNING_CFLAGS = "-Wno-main"; - WRAPPER_EXTENSION = vst; - }; - name = Debug; - }; - 4F20EF31132C69FE0030E34C /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 0.5.7; - DEAD_CODE_STRIPPING = YES; - DEVELOPMENT_TEAM = 77BKRC84G3; - DSTROOT = "$(VST2_PATH)"; - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(EXTRA_PLUGIN_DEFS)", - "$(EXTRA_VST2_DEFS)", - "$(VST2_DEFS)", - "$(inherited)", - ); - INFOPLIST_FILE = "../resources/NeuralAmpModeler-VST2-Info.plist"; - MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 0.5.7; - PRODUCT_BUNDLE_IDENTIFIER = "com.StevenAtkinson.vst.${BINARY_NAME}"; - PROVISIONING_PROFILE_SPECIFIER = ""; - SKIP_INSTALL = NO; - WARNING_CFLAGS = "-Wno-main"; - WRAPPER_EXTENSION = vst; - }; - name = Release; - }; - 4F20EF32132C69FE0030E34C /* Tracer */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_IDENTITY = ""; - CURRENT_PROJECT_VERSION = 0.5.7; - DEAD_CODE_STRIPPING = YES; - DSTROOT = "$(VST2_PATH)"; - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(EXTRA_PLUGIN_DEFS)", - "$(EXTRA_VST2_DEFS)", - "$(VST2_DEFS)", - "$(inherited)", - ); - INFOPLIST_FILE = "../resources/NeuralAmpModeler-VST2-Info.plist"; - MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 0.5.7; - PRODUCT_BUNDLE_IDENTIFIER = "com.StevenAtkinson.vst.${BINARY_NAME}"; - SKIP_INSTALL = NO; - WARNING_CFLAGS = "-Wno-main"; - WRAPPER_EXTENSION = vst; - }; - name = Tracer; - }; 4F3907702013EBA400DDA490 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -4697,16 +4511,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 4F20EF2F132C69FE0030E34C /* Build configuration list for PBXNativeTarget "VST2" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 4F20EF30132C69FE0030E34C /* Debug */, - 4F20EF31132C69FE0030E34C /* Release */, - 4F20EF32132C69FE0030E34C /* Tracer */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; 4F3907742013EBA400DDA490 /* Build configuration list for PBXNativeTarget "AUv3" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/xcshareddata/xcschemes/macOS-VST2.xcscheme b/NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/xcshareddata/xcschemes/macOS-VST2.xcscheme deleted file mode 100644 index 62ad373d9..000000000 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/xcshareddata/xcschemes/macOS-VST2.xcscheme +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-vst2.vcxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-vst2.vcxproj deleted file mode 100644 index 52b1fc8e4..000000000 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-vst2.vcxproj +++ /dev/null @@ -1,373 +0,0 @@ - - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - Tracer - Win32 - - - Tracer - x64 - - - - {2EB4846A-93E0-43A0-821E-12237105168F} - NeuralAmpModeler - NeuralAmpModeler-vst2 - 10.0 - - - - DynamicLibrary - true - MultiByte - v143 - - - DynamicLibrary - true - MultiByte - v143 - - - DynamicLibrary - false - true - MultiByte - v143 - - - DynamicLibrary - false - true - MultiByte - v143 - - - DynamicLibrary - false - true - MultiByte - v143 - - - DynamicLibrary - false - true - MultiByte - v143 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(SolutionDir)build-win\vst2\$(Platform)\$(Configuration)\ - - - $(SolutionDir)build-win\vst2\$(Platform)\$(Configuration)\ - - - $(SolutionDir)build-win\vst2\$(Platform)\$(Configuration)\int\ - - - $(BINARY_NAME) - - - $(SolutionDir)build-win\vst2\$(Platform)\$(Configuration)\int\ - - $(BINARY_NAME) - - - $(SolutionDir)build-win\vst2\$(Platform)\$(Configuration)\ - - - $(SolutionDir)build-win\vst2\$(Platform)\$(Configuration)\ - - - $(SolutionDir)build-win\vst2\$(Platform)\$(Configuration)\int\ - $(BINARY_NAME) - - - $(SolutionDir)build-win\vst2\$(Platform)\$(Configuration)\int\ - $(BINARY_NAME) - - - $(SolutionDir)build-win\vst2\$(Platform)\$(Configuration)\ - - - $(SolutionDir)build-win\vst2\$(Platform)\$(Configuration)\ - - - $(SolutionDir)build-win\vst2\$(Platform)\$(Configuration)\int\ - $(BINARY_NAME) - - - $(SolutionDir)build-win\vst2\$(Platform)\$(Configuration)\int\ - $(BINARY_NAME) - - - - Level3 - Disabled - $(VST2_DEFS);$(DEBUG_DEFS);$(EXTRA_DEBUG_DEFS);%(PreprocessorDefinitions) - MultiThreadedDebug - $(VST2_INC_PATHS);%(AdditionalIncludeDirectories) - - - Windows - - - - - - Level3 - Disabled - $(VST2_DEFS);$(DEBUG_DEFS);$(EXTRA_DEBUG_DEFS);%(PreprocessorDefinitions) - MultiThreadedDebug - $(VST2_INC_PATHS);%(AdditionalIncludeDirectories) - - - Windows - - - - $(SolutionDir)\Resources\img;%(AdditionalIncludeDirectories) - - - - - Level3 - MaxSpeed - true - true - $(VST2_DEFS);$(RELEASE_DEFS);$(EXTRA_RELEASE_DEFS);%(PreprocessorDefinitions) - true - Speed - $(VST2_INC_PATHS);%(AdditionalIncludeDirectories) - - - true - true - Windows - - - - - - Level3 - MaxSpeed - true - true - $(VST2_DEFS);$(RELEASE_DEFS);$(EXTRA_RELEASE_DEFS);%(PreprocessorDefinitions) - true - Speed - $(VST2_INC_PATHS);%(AdditionalIncludeDirectories) - - - true - true - Windows - - - - - - Level3 - MaxSpeed - true - true - $(VST2_DEFS);$(TRACER_DEFS);$(EXTRA_TRACER_DEFS);%(PreprocessorDefinitions) - true - $(VST2_INC_PATHS);%(AdditionalIncludeDirectories) - - - true - true - Windows - - - - - - Level3 - MaxSpeed - true - true - $(VST2_DEFS);$(TRACER_DEFS);$(EXTRA_TRACER_DEFS);%(PreprocessorDefinitions) - true - $(VST2_INC_PATHS);%(AdditionalIncludeDirectories) - - - true - true - Windows - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-vst2.vcxproj.filters b/NeuralAmpModeler/projects/NeuralAmpModeler-vst2.vcxproj.filters deleted file mode 100644 index 4420d3f7e..000000000 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-vst2.vcxproj.filters +++ /dev/null @@ -1,318 +0,0 @@ - - - - - - IPlug - - - IPlug - - - IPlug - - - IPlug\VST2 - - - IGraphics - - - IGraphics\Platform - - - IPlug - - - IPlug - - - IGraphics - - - IGraphics - - - IGraphics\Controls - - - IGraphics\Controls - - - IGraphics\Controls - - - IPlug - - - IGraphics\Drawing - - - - dsp - - - dsp - - - dsp - - - dsp - - - dsp - - - dsp - - - dsp - - - dsp - - - dsp - - - dsp - - - dsp - - - - - - - IPlug - - - IPlug - - - IPlug - - - IPlug - - - IPlug - - - IPlug - - - IPlug - - - IPlug - - - IPlug - - - IPlug - - - resources - - - IPlug - - - IPlug - - - IPlug\VST2 - - - IPlug\VST2 - - - IPlug\VST2 - - - IGraphics - - - IGraphics - - - IGraphics - - - IGraphics - - - IGraphics - - - IGraphics - - - IGraphics - - - IGraphics - - - IGraphics - - - IGraphics - - - IGraphics\Drawing - - - IGraphics\Platform - - - IGraphics\Platform - - - IGraphics\Platform - - - IGraphics\Platform - - - IGraphics\Platform - - - IPlug - - - IGraphics - - - IGraphics - - - IGraphics\Controls - - - IGraphics\Controls - - - IGraphics\Controls - - - IGraphics\Controls - - - IGraphics\Controls - - - IGraphics\Controls - - - IGraphics\Controls - - - IGraphics\Controls - - - IPlug - - - IGraphics\Drawing - - - IPlug - - - IGraphics - - - dsp - - - dsp - - - dsp - - - dsp - - - dsp - - - dsp - - - dsp - - - dsp - - - - dsp - - - dsp - - - dsp - - - dsp - - - dsp - - - - - {2425d7db-3821-4242-b5c9-db34bda176ce} - - - {340070a8-76f3-47eb-9d5f-c13785b65579} - - - {35a9e026-dde0-499a-9432-4ee1754ffba8} - - - {4867b134-9c10-4435-b4ba-5b411e34340b} - - - {f77209f4-83aa-47eb-9a44-59880a83c238} - - - {2731d3da-3446-4ccb-83ff-8ae3793611b5} - - - {fa39707d-4118-45f2-92fb-d407fa5d3288} - - - {8c338368-7512-426b-af83-0f50719ca0bd} - - - {721003ab-1117-4143-86a2-3d9fd0d78e62} - - - - - resources - - - - - config - - - config - - - config - - - config - - - \ No newline at end of file diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-vst2.vcxproj.user b/NeuralAmpModeler/projects/NeuralAmpModeler-vst2.vcxproj.user deleted file mode 100644 index 2a85012fa..000000000 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-vst2.vcxproj.user +++ /dev/null @@ -1,33 +0,0 @@ - - - - $(VST2_32_HOST_PATH) - $(VST2_32_COMMAND_ARGS) - WindowsLocalDebugger - - - $(VST2_32_HOST_PATH) - WindowsLocalDebugger - $(VST2_32_COMMAND_ARGS) - - - $(VST2_32_HOST_PATH) - WindowsLocalDebugger - $(VST2_32_COMMAND_ARGS) - - - $(VST2_64_HOST_PATH) - $(VST2_64_COMMAND_ARGS) - WindowsLocalDebugger - - - $(VST2_64_HOST_PATH) - WindowsLocalDebugger - $(VST2_64_COMMAND_ARGS) - - - $(VST2_64_HOST_PATH) - WindowsLocalDebugger - $(VST2_64_COMMAND_ARGS) - - \ No newline at end of file diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj index fd0cfd1ec..87048b726 100644 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj @@ -1,463 +1,465 @@ - - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - Tracer - Win32 - - - Tracer - x64 - - - - {079FC65A-F0E5-4E97-B318-A16D1D0B89DF} - NeuralAmpModeler - NeuralAmpModeler-vst3 - 10.0 - - - - DynamicLibrary - true - MultiByte - v143 - - - DynamicLibrary - true - MultiByte - v143 - - - DynamicLibrary - false - true - MultiByte - v143 - - - DynamicLibrary - false - true - MultiByte - v143 - - - DynamicLibrary - false - true - MultiByte - v143 - - - DynamicLibrary - false - true - MultiByte - v143 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\ - - - $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\ - - - $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\int\ - - - .vst3 - - - $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\int\ - - .vst3 - - - $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\ - - - $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\ - - - $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\int\ - .vst3 - - - $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\int\ - .vst3 - - - $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\ - - - $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\ - - - $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\int\ - .vst3 - - - $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\int\ - .vst3 - - - - Level3 - Disabled - $(VST3_DEFS);$(DEBUG_DEFS);$(EXTRA_DEBUG_DEFS);%(PreprocessorDefinitions) - MultiThreadedDebug - $(VST3_INC_PATHS);%(AdditionalIncludeDirectories) - - - Windows - %(AdditionalDependencies) - ..\..\VST3_SDK\base\win\$(Platform)\$(Configuration)\;$(WDL_PATH)\IPlug\$(SolutionDir)build-win\$(Platform)\$(Configuration)\;$(WDL_PATH)\lice\$(SolutionDir)build-win\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) - - - - - - Level3 - Disabled - $(VST3_DEFS);$(DEBUG_DEFS);$(EXTRA_DEBUG_DEFS);%(PreprocessorDefinitions) - MultiThreadedDebug - $(VST3_INC_PATHS);%(AdditionalIncludeDirectories) - - - Windows - %(AdditionalDependencies) - - - - - - Level3 - MaxSpeed - true - true - $(VST3_DEFS);$(RELEASE_DEFS);$(EXTRA_RELEASE_DEFS);%(PreprocessorDefinitions) - true - Speed - $(VST3_INC_PATHS);%(AdditionalIncludeDirectories) - - - true - true - Windows - %(AdditionalDependencies) - ..\..\VST3_SDK\base\win\$(Platform)\$(Configuration)\;$(WDL_PATH)\IPlug\$(SolutionDir)build-win\$(Platform)\$(Configuration)\;$(WDL_PATH)\lice\$(SolutionDir)build-win\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) - - - - - - Level3 - MaxSpeed - true - true - $(VST3_DEFS);$(RELEASE_DEFS);$(EXTRA_RELEASE_DEFS);%(PreprocessorDefinitions) - true - Speed - $(VST3_INC_PATHS);%(AdditionalIncludeDirectories) - - - true - true - Windows - %(AdditionalDependencies) - - - - - - Level3 - MaxSpeed - true - true - $(VST3_DEFS);$(TRACER_DEFS);$(EXTRA_TRACER_DEFS);%(PreprocessorDefinitions) - true - $(VST3_INC_PATHS);%(AdditionalIncludeDirectories) - - - true - true - Windows - %(AdditionalDependencies) - - - - - - Level3 - MaxSpeed - true - true - $(VST3_DEFS);$(TRACER_DEFS);$(EXTRA_TRACER_DEFS);%(PreprocessorDefinitions) - true - $(VST3_INC_PATHS);%(AdditionalIncludeDirectories) - - - true - true - Windows - $(x64_LIB_PATHS);$(WDL_PATH)\lice\$(SolutionDir)build-win\$(Platform)\Release\;..\..\VST3_SDK\base\win\$(Platform)\Release\;%(AdditionalLibraryDirectories) - %(AdditionalDependencies) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - $(IntDir)%(RelativeDir) - $(IntDir)%(RelativeDir) - $(IntDir)%(RelativeDir) - $(IntDir)%(RelativeDir) - $(IntDir)%(RelativeDir) - $(IntDir)%(RelativeDir) - - - - - - - - - - - - - - - - - - Designer - - - - - - - - + + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + Tracer + Win32 + + + Tracer + x64 + + + + {079FC65A-F0E5-4E97-B318-A16D1D0B89DF} + NeuralAmpModeler + NeuralAmpModeler-vst3 + 10.0 + + + + DynamicLibrary + true + MultiByte + v143 + + + DynamicLibrary + true + MultiByte + v143 + + + DynamicLibrary + false + true + MultiByte + v143 + + + DynamicLibrary + false + true + MultiByte + v143 + + + DynamicLibrary + false + true + MultiByte + v143 + + + DynamicLibrary + false + true + MultiByte + v143 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\ + + + $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\ + + + $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\int\ + + + .vst3 + + + $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\int\ + + .vst3 + + + $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\ + + + $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\ + + + $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\int\ + .vst3 + + + $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\int\ + .vst3 + + + $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\ + + + $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\ + + + $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\int\ + .vst3 + + + $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\int\ + .vst3 + + + + Level3 + Disabled + $(VST3_DEFS);$(DEBUG_DEFS);$(EXTRA_DEBUG_DEFS);%(PreprocessorDefinitions) + MultiThreadedDebug + $(VST3_INC_PATHS);%(AdditionalIncludeDirectories) + + + Windows + %(AdditionalDependencies) + ..\..\VST3_SDK\base\win\$(Platform)\$(Configuration)\;$(WDL_PATH)\IPlug\$(SolutionDir)build-win\$(Platform)\$(Configuration)\;$(WDL_PATH)\lice\$(SolutionDir)build-win\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) + + + + + + Level3 + Disabled + $(VST3_DEFS);$(DEBUG_DEFS);$(EXTRA_DEBUG_DEFS);%(PreprocessorDefinitions) + MultiThreadedDebug + $(VST3_INC_PATHS);%(AdditionalIncludeDirectories) + + + Windows + %(AdditionalDependencies) + + + + + + Level3 + MaxSpeed + true + true + $(VST3_DEFS);$(RELEASE_DEFS);$(EXTRA_RELEASE_DEFS);%(PreprocessorDefinitions) + true + Speed + $(VST3_INC_PATHS);%(AdditionalIncludeDirectories) + + + true + true + Windows + %(AdditionalDependencies) + ..\..\VST3_SDK\base\win\$(Platform)\$(Configuration)\;$(WDL_PATH)\IPlug\$(SolutionDir)build-win\$(Platform)\$(Configuration)\;$(WDL_PATH)\lice\$(SolutionDir)build-win\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) + + + + + + Level3 + MaxSpeed + true + true + $(VST3_DEFS);$(RELEASE_DEFS);$(EXTRA_RELEASE_DEFS);%(PreprocessorDefinitions) + true + Speed + $(VST3_INC_PATHS);%(AdditionalIncludeDirectories) + + + true + true + Windows + %(AdditionalDependencies) + + + + + + Level3 + MaxSpeed + true + true + $(VST3_DEFS);$(TRACER_DEFS);$(EXTRA_TRACER_DEFS);%(PreprocessorDefinitions) + true + $(VST3_INC_PATHS);%(AdditionalIncludeDirectories) + + + true + true + Windows + %(AdditionalDependencies) + + + + + + Level3 + MaxSpeed + true + true + $(VST3_DEFS);$(TRACER_DEFS);$(EXTRA_TRACER_DEFS);%(PreprocessorDefinitions) + true + $(VST3_INC_PATHS);%(AdditionalIncludeDirectories) + + + true + true + Windows + $(x64_LIB_PATHS);$(WDL_PATH)\lice\$(SolutionDir)build-win\$(Platform)\Release\;..\..\VST3_SDK\base\win\$(Platform)\Release\;%(AdditionalLibraryDirectories) + %(AdditionalDependencies) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + $(IntDir)%(RelativeDir) + $(IntDir)%(RelativeDir) + $(IntDir)%(RelativeDir) + $(IntDir)%(RelativeDir) + $(IntDir)%(RelativeDir) + $(IntDir)%(RelativeDir) + + + + + + + + + + + + + + + + + + + Designer + + + + + + + + \ No newline at end of file diff --git a/NeuralAmpModeler/resources/NeuralAmpModeler-VST2-Info.plist b/NeuralAmpModeler/resources/NeuralAmpModeler-VST2-Info.plist deleted file mode 100644 index cb4d4477f..000000000 --- a/NeuralAmpModeler/resources/NeuralAmpModeler-VST2-Info.plist +++ /dev/null @@ -1,30 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - NeuralAmpModeler - CFBundleGetInfoString - NeuralAmpModeler v0.7.13 Copyright 2022 Steven Atkinson - CFBundleIdentifier - com.StevenAtkinson.vst.NeuralAmpModeler - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - NeuralAmpModeler - CFBundlePackageType - BNDL - CFBundleShortVersionString - 0.7.13 - CFBundleSignature - 1YEo - CFBundleVersion - 0.7.13 - CSResourcesFileMapped - - LSMinimumSystemVersion - 10.15.0 - - diff --git a/NeuralAmpModeler/scripts/makedist-mac.sh b/NeuralAmpModeler/scripts/makedist-mac.sh index 9ae43d524..a78af5d2f 100755 --- a/NeuralAmpModeler/scripts/makedist-mac.sh +++ b/NeuralAmpModeler/scripts/makedist-mac.sh @@ -69,9 +69,6 @@ fi # ARCHIVE_NAME=`python3 ${SCRIPTS}/get_archive_name.py ${PLUGIN_NAME} mac full` # fi -VST2=`echo | grep VST2_PATH $XCCONFIG` -VST2=$HOME${VST2//\VST2_PATH = \$(HOME)}/$PLUGIN_NAME.vst - VST3=`echo | grep VST3_PATH $XCCONFIG` VST3=$HOME${VST3//\VST3_PATH = \$(HOME)}/$PLUGIN_NAME.vst3 @@ -94,7 +91,6 @@ CERT_ID=${CERT_ID//\CERTIFICATE_ID = } DEV_ID_APP_STR="Developer ID Application: ${CERT_ID}" DEV_ID_INST_STR="Developer ID Installer: ${CERT_ID}" -echo $VST2 echo $VST3 echo $AU echo $APP @@ -128,10 +124,6 @@ if [ -d $AU ]; then sudo rm -f -R $AU fi -if [ -d $VST2 ]; then - sudo rm -f -R $VST2 -fi - if [ -d $VST3 ]; then sudo rm -f -R $VST3 fi @@ -168,10 +160,6 @@ if [ -d $AU ]; then ./$SCRIPTS/SetFileIcon -image resources/$PLUGIN_NAME.icns -file $AU fi -if [ -d $VST2 ]; then - ./$SCRIPTS/SetFileIcon -image resources/$PLUGIN_NAME.icns -file $VST2 -fi - if [ -d $VST3 ]; then ./$SCRIPTS/SetFileIcon -image resources/$PLUGIN_NAME.icns -file $VST3 fi @@ -194,10 +182,6 @@ if [ -d $AU ]; then strip -x $AU/Contents/MacOS/$PLUGIN_NAME fi -if [ -d $VST2 ]; then - strip -x $VST2/Contents/MacOS/$PLUGIN_NAME -fi - if [ -d $VST3 ]; then strip -x $VST3/Contents/MacOS/$PLUGIN_NAME fi @@ -226,8 +210,6 @@ if [ $CODESIGN == 1 ]; then codesign --force -s "${DEV_ID_APP_STR}" -v $APP --deep --strict --options=runtime #hardened runtime for app xattr -cr $AU codesign --force -s "${DEV_ID_APP_STR}" -v $AU --deep --strict - # xattr -cr $VST2 - # codesign --force -s "${DEV_ID_APP_STR}" -v $VST2 --deep --strict xattr -cr $VST3 codesign --force -s "${DEV_ID_APP_STR}" -v $VST3 --deep --strict #--------------------------------------------------------------------------------------------------------- @@ -313,10 +295,6 @@ else cp -R $AU build-mac/zip/$PLUGIN_NAME.component fi - if [ -d $VST2 ]; then - cp -R $VST2 build-mac/zip/$PLUGIN_NAME.vst - fi - if [ -d $VST3 ]; then cp -R $VST3 build-mac/zip/$PLUGIN_NAME.vst3 fi diff --git a/NeuralAmpModeler/scripts/makedist-win.bat b/NeuralAmpModeler/scripts/makedist-win.bat index 8ecde0ba2..16c84e995 100644 --- a/NeuralAmpModeler/scripts/makedist-win.bat +++ b/NeuralAmpModeler/scripts/makedist-win.bat @@ -83,7 +83,7 @@ REM echo Building 32 bit binaries... REM msbuild NeuralAmpModeler.sln /p:configuration=release /p:platform=win32 /nologo /verbosity:minimal /fileLogger /m /flp:logfile=build-win.log;errorsonly REM echo Building 64 bit binaries... -REM add projects with /t to build VST2 and AAX +REM add projects with /t to build VST3 and AAX msbuild NeuralAmpModeler.sln /t:NeuralAmpModeler-app;NeuralAmpModeler-vst3 /p:configuration=release /p:platform=x64 /nologo /verbosity:minimal /fileLogger /m /flp:logfile=build-win.log;errorsonly;append REM --echo Copying AAX Presets diff --git a/NeuralAmpModeler/scripts/makeinstaller-mac.sh b/NeuralAmpModeler/scripts/makeinstaller-mac.sh index b3d4e2f1b..df38d8c65 100755 --- a/NeuralAmpModeler/scripts/makeinstaller-mac.sh +++ b/NeuralAmpModeler/scripts/makeinstaller-mac.sh @@ -31,7 +31,6 @@ PRODUCT_NAME=NeuralAmpModeler # locations PRODUCTS="build-mac" -VST2="${PRODUCT_NAME}.vst" VST3="${PRODUCT_NAME}.vst3" AU="${PRODUCT_NAME}.component" APP="${PRODUCT_NAME}.app" @@ -70,11 +69,6 @@ build_flavor() rm -r $TMPDIR } -# try to build VST2 package -if [[ -d $PRODUCTS/$VST2 ]]; then - build_flavor "VST2" $VST2 "com.StevenAtkinson.vst2.pkg.${PRODUCT_NAME}" "/Library/Audio/Plug-Ins/VST" -fi - # # try to build VST3 package if [[ -d $PRODUCTS/$VST3 ]]; then build_flavor "VST3" $VST3 "com.StevenAtkinson.vst3.pkg.${PRODUCT_NAME}" "/Library/Audio/Plug-Ins/VST3" @@ -111,11 +105,6 @@ fi # create distribution.xml -if [[ -d $PRODUCTS/$VST2 ]]; then - VST2_PKG_REF="" - VST2_CHOICE="" - VST2_CHOICE_DEF="${PRODUCT_NAME}_VST2.pkg" -fi if [[ -d $PRODUCTS/$VST3 ]]; then VST3_PKG_REF="" VST3_CHOICE="" @@ -151,7 +140,6 @@ cat > ${TARGET_DIR}/distribution.xml << XMLEND - ${VST2_PKG_REF} ${VST3_PKG_REF} ${AU_PKG_REF} ${AAX_PKG_REF} @@ -159,14 +147,12 @@ cat > ${TARGET_DIR}/distribution.xml << XMLEND ${RES_PKG_REF} - ${VST2_CHOICE} ${VST3_CHOICE} ${AU_CHOICE} ${AAX_CHOICE} ${APP_CHOICE} ${RES_CHOICE} - ${VST2_CHOICE_DEF} ${VST3_CHOICE_DEF} ${AU_CHOICE_DEF} ${AAX_CHOICE_DEF} diff --git a/NeuralAmpModeler/scripts/postbuild-win.bat b/NeuralAmpModeler/scripts/postbuild-win.bat index 05cd134ee..c953203ba 100644 --- a/NeuralAmpModeler/scripts/postbuild-win.bat +++ b/NeuralAmpModeler/scripts/postbuild-win.bat @@ -1,38 +1,32 @@ @echo off -REM - CALL "$(SolutionDir)scripts\postbuild-win.bat" "$(TargetExt)" "$(BINARY_NAME)" "$(Platform)" "$(COPY_VST2)" "$(TargetPath)" "$(VST2_32_PATH)" "$(VST2_64_PATH)" "$(VST3_32_PATH)" "$(VST3_64_PATH)" "$(AAX_32_PATH)" "$(AAX_64_PATH)" "$(BUILD_DIR)" "$(VST_ICON)" "$(AAX_ICON)" " +REM - CALL "$(SolutionDir)scripts\postbuild-win.bat" "$(TargetExt)" "$(BINARY_NAME)" "$(Platform)" "$(TargetPath)" "$(VST3_32_PATH)" "$(VST3_64_PATH)" "$(AAX_32_PATH)" "$(AAX_64_PATH)" "$(BUILD_DIR)" "$(VST_ICON)" "$(AAX_ICON)" " REM $(CREATE_BUNDLE_SCRIPT)" set FORMAT=%1 set NAME=%2 set PLATFORM=%3 -set COPY_VST2=%4 -set BUILT_BINARY=%5 -set VST2_32_PATH=%6 -set VST2_64_PATH=%7 -set VST3_32_PATH=%8 -set VST3_64_PATH=%9 +set BUILT_BINARY=%4 +set VST3_32_PATH=%5 +set VST3_64_PATH=%6 shift shift shift shift shift shift -set AAX_32_PATH=%4 -set AAX_64_PATH=%5 -set BUILD_DIR=%6 -set VST_ICON=%7 -set AAX_ICON=%8 -set CREATE_BUNDLE_SCRIPT=%9 +set AAX_32_PATH=%1 +set AAX_64_PATH=%2 +set BUILD_DIR=%3 +set VST_ICON=%4 +set AAX_ICON=%5 +set CREATE_BUNDLE_SCRIPT=%6 echo POSTBUILD SCRIPT VARIABLES ----------------------------------------------------- echo FORMAT %FORMAT% echo NAME %NAME% echo PLATFORM %PLATFORM% -echo COPY_VST2 %COPY_VST2% echo BUILT_BINARY %BUILT_BINARY% -echo VST2_32_PATH %VST2_32_PATH% -echo VST2_64_PATH %VST2_64_PATH% echo VST3_32_PATH %VST3_32_PATH% echo VST3_64_PATH %VST3_64_PATH% echo BUILD_DIR %BUILD_DIR% @@ -50,15 +44,6 @@ if %PLATFORM% == "Win32" ( copy /y %BUILT_BINARY% %BUILD_DIR%\%NAME%_%PLATFORM%.dll ) - if %FORMAT% == ".dll" ( - if %COPY_VST2% == "1" ( - echo copying 32bit binary to 32bit VST2 Plugins folder ... - copy /y %BUILT_BINARY% %VST2_32_PATH% - ) else ( - echo not copying 32bit VST2 binary - ) - ) - if %FORMAT% == ".vst3" ( echo copying 32bit binary to VST3 BUNDLE .. call %CREATE_BUNDLE_SCRIPT% %BUILD_DIR%\%NAME%.vst3 %VST_ICON% %FORMAT% @@ -93,15 +78,6 @@ if %PLATFORM% == "x64" ( copy /y %BUILT_BINARY% %BUILD_DIR%\%NAME%_%PLATFORM%.dll ) - if %FORMAT% == ".dll" ( - if %COPY_VST2% == "1" ( - echo copying 64bit binary to 64bit VST2 Plugins folder ... - copy /y %BUILT_BINARY% %VST2_64_PATH% - ) else ( - echo not copying 64bit VST2 binary - ) - ) - if %FORMAT% == ".vst3" ( echo copying 64bit binary to VST3 BUNDLE ... call %CREATE_BUNDLE_SCRIPT% %BUILD_DIR%\%NAME%.vst3 %VST_ICON% %FORMAT% @@ -121,4 +97,4 @@ if %PLATFORM% == "x64" ( call %CREATE_BUNDLE_SCRIPT% %BUILD_DIR%\%NAME%.aaxplugin %AAX_ICON% %FORMAT% xcopy /E /H /Y %BUILD_DIR%\%NAME%.aaxplugin\Contents\* %AAX_64_PATH%\%NAME%.aaxplugin\Contents\ ) -) \ No newline at end of file +) diff --git a/NeuralAmpModeler/scripts/update_version-mac.py b/NeuralAmpModeler/scripts/update_version-mac.py index 245c8df31..b4bd311df 100644 --- a/NeuralAmpModeler/scripts/update_version-mac.py +++ b/NeuralAmpModeler/scripts/update_version-mac.py @@ -65,32 +65,6 @@ def main(): with open(plistpath, "wb") as f2: plistlib.dump(vst3, f2) - # VST2 - - plistpath = projectpath + "/resources/" + config["BUNDLE_NAME"] + "-VST2-Info.plist" - with open(plistpath, "rb") as f: - vst2 = plistlib.load(f) - vst2["CFBundleExecutable"] = config["BUNDLE_NAME"] - vst2["CFBundleGetInfoString"] = CFBundleGetInfoString - vst2["CFBundleIdentifier"] = ( - config["BUNDLE_DOMAIN"] - + "." - + config["BUNDLE_MFR"] - + ".vst." - + config["BUNDLE_NAME"] - + "" - ) - vst2["CFBundleName"] = config["BUNDLE_NAME"] - vst2["CFBundleVersion"] = CFBundleVersion - vst2["CFBundleShortVersionString"] = CFBundleVersion - vst2["LSMinimumSystemVersion"] = LSMinimumSystemVersion - vst2["CFBundlePackageType"] = CFBundlePackageType - vst2["CFBundleSignature"] = config["PLUG_UNIQUE_ID"] - vst2["CSResourcesFileMapped"] = CSResourcesFileMapped - - with open(plistpath, "wb") as f2: - plistlib.dump(vst2, f2) - # AUDIOUNIT v2 plistpath = projectpath + "/resources/" + config["BUNDLE_NAME"] + "-AU-Info.plist" diff --git a/NeuralAmpModelerCore b/NeuralAmpModelerCore index 29763dce4..8b5a7cef1 160000 --- a/NeuralAmpModelerCore +++ b/NeuralAmpModelerCore @@ -1 +1 @@ -Subproject commit 29763dce4d8247ab70787b5b3b28e86b752d1472 +Subproject commit 8b5a7cef1c8a4b6faed26a5767e1fc553f0f55f5 diff --git a/common-mac.xcconfig b/common-mac.xcconfig index efb6c582e..f9ccd132b 100644 --- a/common-mac.xcconfig +++ b/common-mac.xcconfig @@ -33,7 +33,6 @@ TRACER_DEFS = $DEBUG_DEFS TRACER_BUILD // here you can change if a TRACER build // macros for individual plug-in format builds etc ALL_DEFS = NOMINMAX PLUGIN_DEFS = SWELL_CLEANUP_ON_UNLOAD // macros for all plug-in builds -VST2_DEFS = VST2_API $PLUGIN_DEFS IPLUG_EDITOR=1 IPLUG_DSP=1 VST3_DEFS = VST3_API $PLUGIN_DEFS IPLUG_EDITOR=1 IPLUG_DSP=1 VST3C_DEFS = VST3C_API $PLUGIN_DEFS IPLUG_EDITOR=1 IPLUG_DSP=0 VST3P_DEFS = VST3P_API $PLUGIN_DEFS IPLUG_EDITOR=0 IPLUG_DSP=1 //NO_IGRAPHICS @@ -83,7 +82,6 @@ JSON_INC_PATH = $(DEPS_PATH)/Extras/nlohmann EXTRAS_INC_PATHS = $(EXTRAS_PATH) $(EXTRAS_PATH)/Synth $(EXTRAS_PATH)/Faust $(EXTRAS_PATH)/OSC $(EXTRAS_PATH)/HIIR $(EXTRAS_PATH)/WebSocket $(CIVETWEB_INC_PATHS) $(JSON11_PATH) $(RTAUDIO_PATH) $(RTMIDI_PATH) $(JSON_INC_PATH) // Plug-in SDK paths -VST2_SDK = $(DEPS_PATH)/IPlug/VST2_SDK VST3_SDK = $(DEPS_PATH)/IPlug/VST3_SDK AAX_SDK = $(DEPS_PATH)/IPlug/AAX_SDK REAPER_SDK = $(DEPS_PATH)/IPlug/Reaper @@ -145,7 +143,6 @@ AUv3_FRAMEWORKS = -framework AudioToolbox -framework AVFoundation -framework Cor // You can also build to the system plug-in folder, but you will need to explicitly add write permissions to build stuff there // The AAX folder should be the location of the PT Dev build plug-ins folder, installer scripts will copy to the non-developer build -VST2_PATH = $(HOME)/Library/Audio/Plug-Ins/VST VST3_PATH = $(HOME)/Library/Audio/Plug-Ins/VST3 AU_PATH = $(HOME)/Library/Audio/Plug-Ins/Components AAX_PATH = /Library/Application Support/Avid/Audio/Plug-Ins diff --git a/common-win.props b/common-win.props index d4478742a..6b63c47e3 100644 --- a/common-win.props +++ b/common-win.props @@ -28,23 +28,17 @@ $(IGRAPHICS_DEPS_PATH)\imgui;$(IGRAPHICS_DEPS_PATH)\imgui\backends $(IGRAPHICS_DEPS_PATH)\yoga;$(IGRAPHICS_DEPS_PATH)\yoga\yoga $(IGRAPHICS_PATH);$(IGRAPHICS_PATH)\Controls;$(IGRAPHICS_PATH)\Drawing;$(IGRAPHICS_PATH)\Platforms;$(IGRAPHICS_PATH)\Extras;$(NANOSVG_PATH);$(NANOVG_PATH);$(PNG_PATH);$(ZLIB_PATH);$(FREETYPE_PATH);$(STB_PATH);$(IMGUI_INC_PATHS);$(SKIA_INC_PATHS);$(YOGA_INC_PATHS) - $(IPLUG_DEPS_PATH)\VST2_SDK $(IPLUG_DEPS_PATH)\VST3_SDK $(IPLUG_DEPS_PATH)\RTAudio\include $(IPLUG_DEPS_PATH)\AAX_SDK - $(ProgramFiles)\REAPER\reaper.exe - $(ProgramW6432)\REAPER (x64)\reaper.exe $(ProgramFiles)\REAPER\reaper.exe $(ProgramW6432)\REAPER (x64)\reaper.exe $(CommonProgramFiles)\VST3 $(CommonProgramW6432)\VST3 - $(ProgramFiles)\VstPlugins - $(ProgramW6432)\VstPlugins $(CommonProgramFiles)\Avid\Audio\Plug-Ins $(CommonProgramW6432)\Avid\Audio\Plug-Ins $(APPDATA)\REAPER\UserPlugins APP_API;__WINDOWS_DS__;__WINDOWS_MM__;__WINDOWS_ASIO__;IPLUG_EDITOR=1;IPLUG_DSP=1 - VST2_API;VST_FORCE_DEPRECATED;IPLUG_EDITOR=1;IPLUG_DSP=1 VST3_API;IPLUG_EDITOR=1;IPLUG_DSP=1 VST3P_API;IPLUG_EDITOR=0;IPLUG_DSP=1 VST3C_API;IPLUG_EDITOR=1;IPLUG_DSP=0 @@ -52,18 +46,14 @@ NDEBUG; TRACER_BUILD;NDEBUG; $(IPLUG_PATH)\APP;$(IPLUG_DEPS_PATH)\RTAudio\include;$(IPLUG_DEPS_PATH)\RTAudio;$(IPLUG_DEPS_PATH)\RTMidi - $(IPLUG_PATH)\VST2;$(VST2_SDK) $(IPLUG_PATH)\VST3;$(VST3_SDK) $(IPLUG_PATH)\AAX;$(AAX_SDK)\Interfaces;$(AAX_SDK)\Interfaces\ACF; AAX_API;IPLUG_EDITOR=1;IPLUG_DSP=1;_WINDOWS;WIN32;_WIN32;WINDOWS_VERSION;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NOMINMAX wininet.lib;odbc32.lib;odbccp32.lib;psapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib; dsound.lib;winmm.lib; - $(SolutionDir)$(SolutionName).RPP - $(SolutionDir)$(SolutionName).RPP $(SolutionDir)$(SolutionName).RPP $(SolutionDir)$(SolutionName).RPP - 1 $(IPLUG_DEPS_PATH)/Reaper;$(IPLUG_PATH)\ReaperExt; $(AAX_SDK)\Utilities\PlugIn.ico $(IPLUG2_ROOT)\Scripts\icons\VST_Logo_Steinberg.ico @@ -172,9 +162,6 @@ $(IGRAPHICS_INC_PATHS) - - $(VST2_SDK) - $(VST3_SDK) @@ -184,12 +171,6 @@ $(AAX_SDK) - - $(VST2_32_HOST_PATH) - - - $(VST2_64_HOST_PATH) - $(VST3_32_HOST_PATH) @@ -202,12 +183,6 @@ $(VST3_64_PATH) - - $(VST2_32_PATH) - - - $(VST2_64_PATH) - $(AAX_32_PATH) @@ -220,9 +195,6 @@ $(APP_DEFS) - - $(VST2_DEFS) - $(VST3_DEFS) @@ -244,9 +216,6 @@ $(APP_INC_PATHS) - - $(VST2_INC_PATHS) - $(VST3_INC_PATHS) @@ -265,21 +234,12 @@ $(APP_LIBS) - - $(VST2_32_COMMAND_ARGS) - - - $(VST2_64_COMMAND_ARGS) - $(VST3_64_COMMAND_ARGS) $(VST3_32_COMMAND_ARGS) - - $(COPY_VST2) - $(REAPER_INC_PATHS) From f013826db7b8635e2d250aa797feec97e8678f36 Mon Sep 17 00:00:00 2001 From: Steven Atkinson Date: Mon, 20 Apr 2026 13:09:58 -0700 Subject: [PATCH 15/18] Update NeuralAmpModelerCore --- NeuralAmpModelerCore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NeuralAmpModelerCore b/NeuralAmpModelerCore index 8b5a7cef1..a2c2e66ce 160000 --- a/NeuralAmpModelerCore +++ b/NeuralAmpModelerCore @@ -1 +1 @@ -Subproject commit 8b5a7cef1c8a4b6faed26a5767e1fc553f0f55f5 +Subproject commit a2c2e66ce2dd04636d700d8a890c43249033939f From 33fddd1997a75f03946204695b76e704afd6b759 Mon Sep 17 00:00:00 2001 From: Steven Atkinson Date: Mon, 20 Apr 2026 13:10:07 -0700 Subject: [PATCH 16/18] Update project files --- .../config/NeuralAmpModeler-mac.xcconfig | 2 +- .../config/NeuralAmpModeler-win.props | 2 +- .../projects/NeuralAmpModeler-aax.vcxproj | 2 ++ .../projects/NeuralAmpModeler-app.vcxproj | 2 ++ .../project.pbxproj | 20 +++++++++++++++++++ .../projects/NeuralAmpModeler-vst3.vcxproj | 2 ++ 6 files changed, 28 insertions(+), 2 deletions(-) diff --git a/NeuralAmpModeler/config/NeuralAmpModeler-mac.xcconfig b/NeuralAmpModeler/config/NeuralAmpModeler-mac.xcconfig index e03e26746..5291fe263 100644 --- a/NeuralAmpModeler/config/NeuralAmpModeler-mac.xcconfig +++ b/NeuralAmpModeler/config/NeuralAmpModeler-mac.xcconfig @@ -24,7 +24,7 @@ EXTRA_LNK_FLAGS = -framework Accelerate -framework Metal -framework MetalKit // //------------------------------ // PREPROCESSOR MACROS -EXTRA_ALL_DEFS = OBJC_PREFIX=vNeuralAmpModeler SWELL_APP_PREFIX=Swell_vNeuralAmpModeler IGRAPHICS_NANOVG IGRAPHICS_METAL GRAYED_ALPHA=0.5f +EXTRA_ALL_DEFS = OBJC_PREFIX=vNeuralAmpModeler SWELL_APP_PREFIX=Swell_vNeuralAmpModeler IGRAPHICS_NANOVG IGRAPHICS_METAL GRAYED_ALPHA=0.5f NAM_ENABLE_A2_FAST //EXTRA_DEBUG_DEFS = //EXTRA_RELEASE_DEFS = //EXTRA_TRACER_DEFS = diff --git a/NeuralAmpModeler/config/NeuralAmpModeler-win.props b/NeuralAmpModeler/config/NeuralAmpModeler-win.props index c81ebf92f..c69767281 100644 --- a/NeuralAmpModeler/config/NeuralAmpModeler-win.props +++ b/NeuralAmpModeler/config/NeuralAmpModeler-win.props @@ -3,7 +3,7 @@ $(ProjectDir)..\..\iPlug2 NeuralAmpModeler - IGRAPHICS_NANOVG;IGRAPHICS_GL2;GRAYED_ALPHA=0.5f + IGRAPHICS_NANOVG;IGRAPHICS_GL2;GRAYED_ALPHA=0.5f;NAM_ENABLE_A2_FAST diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-aax.vcxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-aax.vcxproj index ff83f513f..b4ea647f2 100644 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-aax.vcxproj +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-aax.vcxproj @@ -432,6 +432,7 @@ + @@ -545,6 +546,7 @@ + diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-app.vcxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-app.vcxproj index c8852819e..e016cc972 100644 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-app.vcxproj +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-app.vcxproj @@ -348,6 +348,7 @@ + @@ -414,6 +415,7 @@ + diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/project.pbxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/project.pbxproj index 495fde4c8..303db93cb 100644 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/project.pbxproj +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/project.pbxproj @@ -205,6 +205,14 @@ B1D2F7072D0000020027AB66 /* slimmable_wavenet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1D2F7002D0000010027AB66 /* slimmable_wavenet.cpp */; }; B1D2F7082D0000020027AB66 /* slimmable_wavenet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1D2F7002D0000010027AB66 /* slimmable_wavenet.cpp */; }; B1D2F7092D0000020027AB66 /* slimmable_wavenet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1D2F7002D0000010027AB66 /* slimmable_wavenet.cpp */; }; + C2A2FAE112D0000120027AB66 /* a2_fast.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2A2FAE012D0000110027AB66 /* a2_fast.cpp */; }; + C2A2FAE122D0000120027AB66 /* a2_fast.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2A2FAE012D0000110027AB66 /* a2_fast.cpp */; }; + C2A2FAE132D0000120027AB66 /* a2_fast.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2A2FAE012D0000110027AB66 /* a2_fast.cpp */; }; + C2A2FAE142D0000120027AB66 /* a2_fast.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2A2FAE012D0000110027AB66 /* a2_fast.cpp */; }; + C2A2FAE152D0000120027AB66 /* a2_fast.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2A2FAE012D0000110027AB66 /* a2_fast.cpp */; }; + C2A2FAE162D0000120027AB66 /* a2_fast.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2A2FAE012D0000110027AB66 /* a2_fast.cpp */; }; + C2A2FAE172D0000120027AB66 /* a2_fast.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2A2FAE012D0000110027AB66 /* a2_fast.cpp */; }; + C2A2FAE182D0000120027AB66 /* a2_fast.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2A2FAE012D0000110027AB66 /* a2_fast.cpp */; }; AAB7E0112CC4B8C6000B8B6E /* container.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAB7E0102CC4B8C6000B8B6E /* container.cpp */; }; AAB7E0122CC4B8C6000B8B6E /* container.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAB7E0102CC4B8C6000B8B6E /* container.cpp */; }; AAB7E0132CC4B8C6000B8B6E /* container.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAB7E0102CC4B8C6000B8B6E /* container.cpp */; }; @@ -711,6 +719,8 @@ 4F2FB1502A0047420027AB66 /* activations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = activations.h; sourceTree = ""; }; 4F2FB1512A0047420027AB66 /* activations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = activations.cpp; sourceTree = ""; }; 4F2FB1522A0047420027AB66 /* model.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wavenet/model.cpp; sourceTree = ""; }; + C2A2FAE012D0000110027AB66 /* a2_fast.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wavenet/a2_fast.cpp; sourceTree = ""; }; + C2A2FAE022D0000110027AB66 /* a2_fast.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wavenet/a2_fast.h; sourceTree = ""; }; B1D2F7002D0000010027AB66 /* slimmable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wavenet/slimmable.cpp; sourceTree = ""; }; AAB7E0102CC4B8C6000B8B6E /* container.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = container.cpp; sourceTree = ""; }; 4F2FB1532A0047420027AB66 /* get_dsp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = get_dsp.cpp; sourceTree = ""; }; @@ -1335,6 +1345,8 @@ 4F2FB14E2A0047420027AB66 /* util.h */, 4F2FB1472A0047420027AB66 /* version.h */, 4F2FB1522A0047420027AB66 /* model.cpp */, + C2A2FAE012D0000110027AB66 /* a2_fast.cpp */, + C2A2FAE022D0000110027AB66 /* a2_fast.h */, B1D2F7002D0000010027AB66 /* slimmable.cpp */, AAB7E0102CC4B8C6000B8B6E /* container.cpp */, 4F2FB14C2A0047420027AB66 /* model.h */, @@ -2596,6 +2608,7 @@ 4F2FB1842A0047430027AB66 /* wav.cpp in Sources */, 4F2FB1C12A0047430027AB66 /* wavenet.cpp in Sources */, B1D2F7072D0000020027AB66 /* slimmable_wavenet.cpp in Sources */, + C2A2FAE112D0000120027AB66 /* a2_fast.cpp in Sources */, AAB7E0122CC4B8C6000B8B6E /* container.cpp in Sources */, 4F2FB1CF2A0047430027AB66 /* conv1d.cpp in Sources */, 4F2FB1D92A0047430027AB66 /* ring_buffer.cpp in Sources */, @@ -2635,6 +2648,7 @@ 4F993F7423055C96000313AF /* IPlugProcessor.cpp in Sources */, 4F2FB1BE2A0047430027AB66 /* wavenet.cpp in Sources */, B1D2F7042D0000020027AB66 /* slimmable_wavenet.cpp in Sources */, + C2A2FAE122D0000120027AB66 /* a2_fast.cpp in Sources */, AAB7E0132CC4B8C6000B8B6E /* container.cpp in Sources */, 4F2FB1D02A0047430027AB66 /* conv1d.cpp in Sources */, 4F2FB1DA2A0047430027AB66 /* ring_buffer.cpp in Sources */, @@ -2677,6 +2691,7 @@ 4F2FB1992A0047430027AB66 /* dsp.cpp in Sources */, 4F2FB1C32A0047430027AB66 /* wavenet.cpp in Sources */, B1D2F7092D0000020027AB66 /* slimmable_wavenet.cpp in Sources */, + C2A2FAE132D0000120027AB66 /* a2_fast.cpp in Sources */, AAB7E0142CC4B8C6000B8B6E /* container.cpp in Sources */, 4F2FB1D12A0047430027AB66 /* conv1d.cpp in Sources */, 4F2FB1DB2A0047430027AB66 /* ring_buffer.cpp in Sources */, @@ -2745,6 +2760,7 @@ 4F78BE2522E7406D00AD537E /* IPlugPluginBase.cpp in Sources */, 4F2FB1C22A0047430027AB66 /* wavenet.cpp in Sources */, B1D2F7082D0000020027AB66 /* slimmable_wavenet.cpp in Sources */, + C2A2FAE142D0000120027AB66 /* a2_fast.cpp in Sources */, AAB7E0152CC4B8C6000B8B6E /* container.cpp in Sources */, 4F2FB1D22A0047430027AB66 /* conv1d.cpp in Sources */, 4F2FB1DC2A0047430027AB66 /* ring_buffer.cpp in Sources */, @@ -2781,6 +2797,7 @@ 4F2FB1622A0047430027AB66 /* dsp.cpp in Sources */, 4F2FB1BD2A0047430027AB66 /* wavenet.cpp in Sources */, B1D2F7032D0000020027AB66 /* slimmable_wavenet.cpp in Sources */, + C2A2FAE152D0000120027AB66 /* a2_fast.cpp in Sources */, AAB7E0162CC4B8C6000B8B6E /* container.cpp in Sources */, 4F2FB1D32A0047430027AB66 /* conv1d.cpp in Sources */, 4F2FB1DD2A0047430027AB66 /* ring_buffer.cpp in Sources */, @@ -2863,6 +2880,7 @@ 4FB600231567CB0A0020189A /* IPlugParameter.cpp in Sources */, 4F2FB1BF2A0047430027AB66 /* wavenet.cpp in Sources */, B1D2F7052D0000020027AB66 /* slimmable_wavenet.cpp in Sources */, + C2A2FAE162D0000120027AB66 /* a2_fast.cpp in Sources */, AAB7E0172CC4B8C6000B8B6E /* container.cpp in Sources */, 4F2FB1D42A0047430027AB66 /* conv1d.cpp in Sources */, 4F2FB1DE2A0047430027AB66 /* ring_buffer.cpp in Sources */, @@ -2921,6 +2939,7 @@ 4F2FB1912A0047430027AB66 /* dsp.cpp in Sources */, 4F2FB1BB2A0047430027AB66 /* wavenet.cpp in Sources */, B1D2F7012D0000020027AB66 /* slimmable_wavenet.cpp in Sources */, + C2A2FAE172D0000120027AB66 /* a2_fast.cpp in Sources */, AAB7E0182CC4B8C6000B8B6E /* container.cpp in Sources */, 4F2FB1D52A0047430027AB66 /* conv1d.cpp in Sources */, 4F2FB1DF2A0047430027AB66 /* ring_buffer.cpp in Sources */, @@ -2998,6 +3017,7 @@ 4F2FB1AB2A0047430027AB66 /* lstm.cpp in Sources */, 4F2FB1C02A0047430027AB66 /* wavenet.cpp in Sources */, B1D2F7062D0000020027AB66 /* slimmable_wavenet.cpp in Sources */, + C2A2FAE182D0000120027AB66 /* a2_fast.cpp in Sources */, AAB7E0192CC4B8C6000B8B6E /* container.cpp in Sources */, 4F2FB1D62A0047430027AB66 /* conv1d.cpp in Sources */, 4F2FB1E02A0047430027AB66 /* ring_buffer.cpp in Sources */, diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj index 87048b726..ec59513a1 100644 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj @@ -357,6 +357,7 @@ + @@ -442,6 +443,7 @@ + From 50909b564d038d2f20adb1ffed59a57179305ede Mon Sep 17 00:00:00 2001 From: Steven Atkinson Date: Mon, 20 Apr 2026 13:38:12 -0700 Subject: [PATCH 17/18] Restore VST2 build targets and tooling Re-add the macOS VST2 Xcode target (with current NAM sources, container, and a2_fast), the macOS-VST2 scheme, plist, and shared xcconfig/props used for VST2 preprocessor paths. Restore packaging and version scripts that reference VST2. Regenerate the Windows VST2 Visual Studio project from the current VST3 project so it builds the same NeuralAmpModelerCore sources with IPlugVST2 instead of the obsolete local dsp layout. Made-with: Cursor --- .../project.pbxproj | 218 +++++++++ .../xcschemes/macOS-VST2.xcscheme | 84 ++++ .../projects/NeuralAmpModeler-vst2.vcxproj | 416 ++++++++++++++++++ .../NeuralAmpModeler-vst2.vcxproj.filters | 356 +++++++++++++++ .../NeuralAmpModeler-vst2.vcxproj.user | 33 ++ .../NeuralAmpModeler-VST2-Info.plist | 30 ++ NeuralAmpModeler/scripts/makedist-mac.sh | 22 + NeuralAmpModeler/scripts/makedist-win.bat | 2 +- NeuralAmpModeler/scripts/makeinstaller-mac.sh | 14 + NeuralAmpModeler/scripts/postbuild-win.bat | 46 +- .../scripts/update_version-mac.py | 26 ++ common-mac.xcconfig | 3 + common-win.props | 40 ++ 13 files changed, 1278 insertions(+), 12 deletions(-) create mode 100644 NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/xcshareddata/xcschemes/macOS-VST2.xcscheme create mode 100644 NeuralAmpModeler/projects/NeuralAmpModeler-vst2.vcxproj create mode 100644 NeuralAmpModeler/projects/NeuralAmpModeler-vst2.vcxproj.filters create mode 100644 NeuralAmpModeler/projects/NeuralAmpModeler-vst2.vcxproj.user create mode 100644 NeuralAmpModeler/resources/NeuralAmpModeler-VST2-Info.plist diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/project.pbxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/project.pbxproj index 303db93cb..3e03e6b10 100644 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/project.pbxproj +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/project.pbxproj @@ -55,6 +55,7 @@ 4F0848292015129A00F9E881 /* IPlugAAX_Parameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F0848252015129300F9E881 /* IPlugAAX_Parameters.cpp */; }; 4F0D965C23099F6900BFDED0 /* IPlugProcessor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F8F61A8202807B9003F2573 /* IPlugProcessor.cpp */; }; 4F10D3D9203A6719003EF82A /* RtMidi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F10D3D7203A6719003EF82A /* RtMidi.cpp */; settings = {COMPILER_FLAGS = "-Wno-shorten-64-to-32"; }; }; + 4F1A527B205D910000CF2908 /* IPlugVST2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F1A527A205D910000CF2908 /* IPlugVST2.cpp */; }; 4F1A527E205D911A00CF2908 /* IPlugVST3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F1A527C205D911900CF2908 /* IPlugVST3.cpp */; }; 4F1A5282205D913300CF2908 /* IPlugAPP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F1A5280205D913300CF2908 /* IPlugAPP.cpp */; }; 4F1A5285205D914A00CF2908 /* IPlugAAX.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F1A5284205D914A00CF2908 /* IPlugAAX.cpp */; }; @@ -213,6 +214,7 @@ C2A2FAE162D0000120027AB66 /* a2_fast.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2A2FAE012D0000110027AB66 /* a2_fast.cpp */; }; C2A2FAE172D0000120027AB66 /* a2_fast.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2A2FAE012D0000110027AB66 /* a2_fast.cpp */; }; C2A2FAE182D0000120027AB66 /* a2_fast.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2A2FAE012D0000110027AB66 /* a2_fast.cpp */; }; + C2A2FAE192D0000120027AB66 /* a2_fast.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2A2FAE012D0000110027AB66 /* a2_fast.cpp */; }; AAB7E0112CC4B8C6000B8B6E /* container.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAB7E0102CC4B8C6000B8B6E /* container.cpp */; }; AAB7E0122CC4B8C6000B8B6E /* container.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAB7E0102CC4B8C6000B8B6E /* container.cpp */; }; AAB7E0132CC4B8C6000B8B6E /* container.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAB7E0102CC4B8C6000B8B6E /* container.cpp */; }; @@ -580,6 +582,13 @@ remoteGlobalIDString = B87FD1E62351C6F900CF7307; remoteInfo = PLists; }; + B87FD1F12351C76C00CF7307 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 089C1669FE841209C02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = B87FD1E62351C6F900CF7307; + remoteInfo = PLists; + }; B87FD1F32351C76E00CF7307 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 089C1669FE841209C02AAC07 /* Project object */; @@ -673,6 +682,8 @@ 4F10D3D3203A6711003EF82A /* RtAudio.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RtAudio.cpp; path = ../../iPlug2/Dependencies/IPlug/RTAudio/RtAudio.cpp; sourceTree = ""; }; 4F10D3D6203A6719003EF82A /* RtMidi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RtMidi.h; path = ../../iPlug2/Dependencies/IPlug/RTMidi/RtMidi.h; sourceTree = ""; }; 4F10D3D7203A6719003EF82A /* RtMidi.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RtMidi.cpp; path = ../../iPlug2/Dependencies/IPlug/RTMidi/RtMidi.cpp; sourceTree = ""; }; + 4F1A5279205D90FF00CF2908 /* IPlugVST2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IPlugVST2.h; path = ../../iPlug2/IPlug/VST2/IPlugVST2.h; sourceTree = ""; }; + 4F1A527A205D910000CF2908 /* IPlugVST2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = IPlugVST2.cpp; path = ../../iPlug2/IPlug/VST2/IPlugVST2.cpp; sourceTree = ""; }; 4F1A527C205D911900CF2908 /* IPlugVST3.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; name = IPlugVST3.cpp; path = ../../iPlug2/IPlug/VST3/IPlugVST3.cpp; sourceTree = ""; tabWidth = 2; }; 4F1A527D205D911900CF2908 /* IPlugVST3.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; name = IPlugVST3.h; path = ../../iPlug2/IPlug/VST3/IPlugVST3.h; sourceTree = ""; tabWidth = 2; }; 4F1A527F205D913200CF2908 /* IPlugAPP.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; name = IPlugAPP.h; path = ../../iPlug2/IPlug/APP/IPlugAPP.h; sourceTree = ""; tabWidth = 2; }; @@ -685,8 +696,10 @@ 4F1A528A205D916F00CF2908 /* IPlugAU.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; name = IPlugAU.cpp; path = ../../iPlug2/IPlug/AUv2/IPlugAU.cpp; sourceTree = ""; tabWidth = 2; }; 4F1B4AE32014D33600BC64D4 /* NeuralAmpModeler-macOS-MainMenu.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "NeuralAmpModeler-macOS-MainMenu.xib"; path = "../resources/NeuralAmpModeler-macOS-MainMenu.xib"; sourceTree = ""; }; 4F1F1BE9135B1F60003A5BB2 /* wdlendian.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = wdlendian.h; path = ../../iPlug2/WDL/wdlendian.h; sourceTree = SOURCE_ROOT; }; + 4F20EF33132C69FE0030E34C /* NeuralAmpModeler.vst */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = NeuralAmpModeler.vst; sourceTree = BUILT_PRODUCTS_DIR; }; 4F23BA1313B647E50097A67E /* NeuralAmpModeler-AU-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "NeuralAmpModeler-AU-Info.plist"; path = "../resources/NeuralAmpModeler-AU-Info.plist"; sourceTree = ""; }; 4F23BA1413B647E50097A67E /* NeuralAmpModeler-macOS-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "NeuralAmpModeler-macOS-Info.plist"; path = "../resources/NeuralAmpModeler-macOS-Info.plist"; sourceTree = ""; }; + 4F23BA1513B647E50097A67E /* NeuralAmpModeler-VST2-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "NeuralAmpModeler-VST2-Info.plist"; path = "../resources/NeuralAmpModeler-VST2-Info.plist"; sourceTree = ""; }; 4F2EA977203A50E9008E4850 /* IPlugAPP_dialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; name = IPlugAPP_dialog.cpp; path = ../../iPlug2/IPlug/APP/IPlugAPP_dialog.cpp; sourceTree = ""; tabWidth = 2; }; 4F2FB13A2A0047420027AB66 /* Resample.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Resample.h; sourceTree = ""; }; 4F2FB13B2A0047420027AB66 /* RecursiveLinearFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RecursiveLinearFilter.cpp; sourceTree = ""; }; @@ -742,6 +755,8 @@ 4F3EE1F0231438D000004786 /* NeuralAmpModeler.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = NeuralAmpModeler.app; sourceTree = BUILT_PRODUCTS_DIR; }; 4F3EF92628DE6DF4002972F2 /* img */ = {isa = PBXFileReference; lastKnownFileType = folder; name = img; path = ../resources/img; sourceTree = ""; }; 4F3FB118202273A500622761 /* NeuralAmpModeler-macOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "NeuralAmpModeler-macOS.entitlements"; sourceTree = ""; }; + 4F78D8D213B63B5D0032E0F3 /* aeffect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = aeffect.h; sourceTree = ""; }; + 4F78D8D313B63B5D0032E0F3 /* aeffectx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = aeffectx.h; sourceTree = ""; }; 4F4237201FC852FE0067D58C /* IPlugConstants.h */ = {isa = PBXFileReference; indentWidth = 2; lastKnownFileType = sourcecode.c.h; name = IPlugConstants.h; path = ../../iPlug2/IPlug/IPlugConstants.h; sourceTree = ""; tabWidth = 2; }; 4F4237231FC863060067D58C /* IPlugUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; name = IPlugUtilities.h; path = ../../iPlug2/IPlug/IPlugUtilities.h; sourceTree = ""; tabWidth = 2; }; 4F472105209B37A100A0A0A8 /* IPlugVST3_View.h */ = {isa = PBXFileReference; indentWidth = 2; lastKnownFileType = sourcecode.c.h; name = IPlugVST3_View.h; path = ../../iPlug2/IPlug/VST3/IPlugVST3_View.h; sourceTree = ""; tabWidth = 2; }; @@ -1085,6 +1100,13 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ + 4F20EF2C132C69FE0030E34C /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; 4F39075D2013EBA300DDA490 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -1199,6 +1221,7 @@ 4F3907872013ED2F00DDA490 /* NeuralAmpModeler-macOS-AUv3-Info.plist */, 4F78BE1122E73DD900AD537E /* NeuralAmpModeler-macOS-AUv3Framework-Info.plist */, 4F3E693A1409747300C4D749 /* NeuralAmpModeler-VST3-Info.plist */, + 4F23BA1513B647E50097A67E /* NeuralAmpModeler-VST2-Info.plist */, 4F23BA1313B647E50097A67E /* NeuralAmpModeler-AU-Info.plist */, 4F4CC3811549B8A700A9EA21 /* NeuralAmpModeler-AAX-Info.plist */, ); @@ -1209,6 +1232,7 @@ isa = PBXGroup; children = ( 4FD16A0913B63081001D0217 /* NeuralAmpModeler.app */, + 4F20EF33132C69FE0030E34C /* NeuralAmpModeler.vst */, 4F9828E0140A9EB700F3FCC1 /* NeuralAmpModeler.vst3 */, 4F78DB5F13B6462B0032E0F3 /* NeuralAmpModeler.component */, 4FB600331567CB0A0020189A /* NeuralAmpModeler.aaxplugin */, @@ -1483,6 +1507,7 @@ 4F3907762013EBE800DDA490 /* AUv3 */, 4F4CC4241549BEBF00A9EA21 /* AAX */, 4F78D9FA13B63CA10032E0F3 /* APP */, + 4F78D9F713B63C710032E0F3 /* VST2 */, 4F3E69001409743C00C4D749 /* VST3 */, 4F78D8E613B63BA40032E0F3 /* IPlug_include_in_plug_hdr.h */, 4F78D8E813B63BA40032E0F3 /* IPlug_include_in_plug_src.h */, @@ -1511,6 +1536,26 @@ name = IPlug; sourceTree = ""; }; + 4F78D8D113B63B5D0032E0F3 /* VST2_SDK */ = { + isa = PBXGroup; + children = ( + 4F78D8D213B63B5D0032E0F3 /* aeffect.h */, + 4F78D8D313B63B5D0032E0F3 /* aeffectx.h */, + ); + name = VST2_SDK; + path = ../../iPlug2/Dependencies/IPlug/VST2_SDK; + sourceTree = SOURCE_ROOT; + }; + 4F78D9F713B63C710032E0F3 /* VST2 */ = { + isa = PBXGroup; + children = ( + 4F78D8D113B63B5D0032E0F3 /* VST2_SDK */, + 4F1A527A205D910000CF2908 /* IPlugVST2.cpp */, + 4F1A5279205D90FF00CF2908 /* IPlugVST2.h */, + ); + name = VST2; + sourceTree = ""; + }; 4F78D9F913B63C920032E0F3 /* AUv2 */ = { isa = PBXGroup; children = ( @@ -2105,6 +2150,26 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ + 4F20EEC8132C69FE0030E34C /* VST2 */ = { + isa = PBXNativeTarget; + buildConfigurationList = 4F20EF2F132C69FE0030E34C /* Build configuration list for PBXNativeTarget "VST2" */; + buildPhases = ( + 4FBCC1B31FD5AE9F00EFE550 /* Run Script - prepare_resources-mac.py */, + 4F20EEC9132C69FE0030E34C /* Resources */, + 4F20EECA132C69FE0030E34C /* Sources */, + 4F20EF2C132C69FE0030E34C /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + B87FD1F22351C76C00CF7307 /* PBXTargetDependency */, + ); + name = VST2; + productInstallPath = "$(HOME)/Library/Bundles"; + productName = IPlugExample; + productReference = 4F20EF33132C69FE0030E34C /* NeuralAmpModeler.vst */; + productType = "com.apple.product-type.bundle"; + }; 4F39075F2013EBA300DDA490 /* AUv3 */ = { isa = PBXNativeTarget; buildConfigurationList = 4F3907742013EBA400DDA490 /* Build configuration list for PBXNativeTarget "AUv3" */; @@ -2352,6 +2417,7 @@ targets = ( 4F78DAF113B643600032E0F3 /* All */, 4FD16A0813B63081001D0217 /* APP */, + 4F20EEC8132C69FE0030E34C /* VST2 */, 4F9828AA140A9EB700F3FCC1 /* VST3 */, 4F3AE17812C0E5E2001FD7A4 /* AU */, 4FB600121567CB0A0020189A /* AAX */, @@ -2376,6 +2442,13 @@ /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ + 4F20EEC9132C69FE0030E34C /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; 4F25BECE12C61F47005D51F7 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -2537,6 +2610,21 @@ shellPath = /bin/sh; shellScript = "python3 ../scripts/prepare_resources-mac.py\n../../iPlug2/WDL/swell/swell_resgen.sh ../resources/main.rc\n"; }; + 4FBCC1B31FD5AE9F00EFE550 /* Run Script - prepare_resources-mac.py */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Run Script - prepare_resources-mac.py"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "python3 ../scripts/prepare_resources-mac.py\n"; + showEnvVarsInLog = 0; + }; 4FBCC1B41FD5AEB700EFE550 /* Run Script - prepare_resources-mac.py */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; @@ -2600,6 +2688,49 @@ /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ + 4F20EECA132C69FE0030E34C /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 4F2FB16A2A0047430027AB66 /* NoiseGate.cpp in Sources */, + 4FDAC0EB207D76C600299363 /* IPlugTimer.cpp in Sources */, + 4F2FB1A72A0047430027AB66 /* lstm.cpp in Sources */, + 4F03A5AD20A4621100EBDFFB /* IGraphics.cpp in Sources */, + 4F5F344220C0226200487201 /* IPlugPaths.mm in Sources */, + AA341E1E2B9E5A530069C260 /* ToneStack.cpp in Sources */, + 4F2FB1B32A0047430027AB66 /* activations.cpp in Sources */, + 4F2FB1612A0047430027AB66 /* dsp.cpp in Sources */, + 4F2FB19D2A0047430027AB66 /* convnet.cpp in Sources */, + 4F6369EC20A466470022C370 /* IControl.cpp in Sources */, + 4FB1F58A20E4B005004157C8 /* IGraphicsMac.mm in Sources */, + 4F1A527B205D910000CF2908 /* IPlugVST2.cpp in Sources */, + 4F2FB1732A0047430027AB66 /* ImpulseResponse.cpp in Sources */, + 4F8C10E120BA2796006320CD /* IGraphicsEditorDelegate.cpp in Sources */, + 4F6369DE20A464BB0022C370 /* IGraphicsNanoVG_src.m in Sources */, + 4F7C4958255DDFC400DF7588 /* IControls.cpp in Sources */, + 4F2FB1562A0047420027AB66 /* RecursiveLinearFilter.cpp in Sources */, + 4F2FB1BC2A0047430027AB66 /* wavenet.cpp in Sources */, + B1D2F7022D0000020027AB66 /* slimmable_wavenet.cpp in Sources */, + C2A2FAE192D0000120027AB66 /* a2_fast.cpp in Sources */, + AAB7E0112CC4B8C6000B8B6E /* container.cpp in Sources */, + 4F2FB1CE2A0047430027AB66 /* conv1d.cpp in Sources */, + 4F2FB1D82A0047430027AB66 /* ring_buffer.cpp in Sources */, + 4F2FB1922A0047430027AB66 /* dsp.cpp in Sources */, + 4F8D9707209EF5AC006E2A11 /* NeuralAmpModeler.cpp in Sources */, + 4F7C495A255DDFC400DF7588 /* ITextEntryControl.cpp in Sources */, + 4F2FB17F2A0047430027AB66 /* wav.cpp in Sources */, + 4F78D9BB13B63BA50032E0F3 /* IPlugAPIBase.cpp in Sources */, + 4FB1F59020E4B010004157C8 /* IGraphicsMac_view.mm in Sources */, + 4F993F7223055C96000313AF /* IPlugProcessor.cpp in Sources */, + 4F35DEAE207E5C5A00867D8F /* IPlugPluginBase.cpp in Sources */, + 4F6FD2B222675B6300FC59E6 /* IGraphicsCoreText.mm in Sources */, + 4F2FB1C52A0047430027AB66 /* get_dsp.cpp in Sources */, + 4F78D9C813B63BA50032E0F3 /* IPlugParameter.cpp in Sources */, + 4F7C4959255DDFC400DF7588 /* IPopupMenuControl.cpp in Sources */, + 4F2FB1882A0047430027AB66 /* util.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 4F39075C2013EBA300DDA490 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -3084,6 +3215,11 @@ target = B87FD1E62351C6F900CF7307 /* Update plists */; targetProxy = B87FD1EF2351C74300CF7307 /* PBXContainerItemProxy */; }; + B87FD1F22351C76C00CF7307 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = B87FD1E62351C6F900CF7307 /* Update plists */; + targetProxy = B87FD1F12351C76C00CF7307 /* PBXContainerItemProxy */; + }; B87FD1F42351C76E00CF7307 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = B87FD1E62351C6F900CF7307 /* Update plists */; @@ -3278,6 +3414,78 @@ }; name = Release; }; + 4F20EF30132C69FE0030E34C /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_IDENTITY = ""; + CURRENT_PROJECT_VERSION = 0.5.7; + DEAD_CODE_STRIPPING = YES; + DSTROOT = "$(VST2_PATH)"; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(EXTRA_PLUGIN_DEFS)", + "$(EXTRA_VST2_DEFS)", + "$(VST2_DEFS)", + "$(inherited)", + ); + INFOPLIST_FILE = "../resources/NeuralAmpModeler-VST2-Info.plist"; + MACOSX_DEPLOYMENT_TARGET = 10.15; + MARKETING_VERSION = 0.5.7; + PRODUCT_BUNDLE_IDENTIFIER = "com.StevenAtkinson.vst.${BINARY_NAME}"; + SKIP_INSTALL = NO; + WARNING_CFLAGS = "-Wno-main"; + WRAPPER_EXTENSION = vst; + }; + name = Debug; + }; + 4F20EF31132C69FE0030E34C /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 0.5.7; + DEAD_CODE_STRIPPING = YES; + DEVELOPMENT_TEAM = 77BKRC84G3; + DSTROOT = "$(VST2_PATH)"; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(EXTRA_PLUGIN_DEFS)", + "$(EXTRA_VST2_DEFS)", + "$(VST2_DEFS)", + "$(inherited)", + ); + INFOPLIST_FILE = "../resources/NeuralAmpModeler-VST2-Info.plist"; + MACOSX_DEPLOYMENT_TARGET = 10.15; + MARKETING_VERSION = 0.5.7; + PRODUCT_BUNDLE_IDENTIFIER = "com.StevenAtkinson.vst.${BINARY_NAME}"; + PROVISIONING_PROFILE_SPECIFIER = ""; + SKIP_INSTALL = NO; + WARNING_CFLAGS = "-Wno-main"; + WRAPPER_EXTENSION = vst; + }; + name = Release; + }; + 4F20EF32132C69FE0030E34C /* Tracer */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_IDENTITY = ""; + CURRENT_PROJECT_VERSION = 0.5.7; + DEAD_CODE_STRIPPING = YES; + DSTROOT = "$(VST2_PATH)"; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(EXTRA_PLUGIN_DEFS)", + "$(EXTRA_VST2_DEFS)", + "$(VST2_DEFS)", + "$(inherited)", + ); + INFOPLIST_FILE = "../resources/NeuralAmpModeler-VST2-Info.plist"; + MACOSX_DEPLOYMENT_TARGET = 10.15; + MARKETING_VERSION = 0.5.7; + PRODUCT_BUNDLE_IDENTIFIER = "com.StevenAtkinson.vst.${BINARY_NAME}"; + SKIP_INSTALL = NO; + WARNING_CFLAGS = "-Wno-main"; + WRAPPER_EXTENSION = vst; + }; + name = Tracer; + }; 4F3907702013EBA400DDA490 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -4531,6 +4739,16 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + 4F20EF2F132C69FE0030E34C /* Build configuration list for PBXNativeTarget "VST2" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 4F20EF30132C69FE0030E34C /* Debug */, + 4F20EF31132C69FE0030E34C /* Release */, + 4F20EF32132C69FE0030E34C /* Tracer */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; 4F3907742013EBA400DDA490 /* Build configuration list for PBXNativeTarget "AUv3" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/xcshareddata/xcschemes/macOS-VST2.xcscheme b/NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/xcshareddata/xcschemes/macOS-VST2.xcscheme new file mode 100644 index 000000000..62ad373d9 --- /dev/null +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/xcshareddata/xcschemes/macOS-VST2.xcscheme @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-vst2.vcxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-vst2.vcxproj new file mode 100644 index 000000000..ab7b769ec --- /dev/null +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-vst2.vcxproj @@ -0,0 +1,416 @@ + + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + Tracer + Win32 + + + Tracer + x64 + + + + {2EB4846A-93E0-43A0-821E-12237105168F} + NeuralAmpModeler + NeuralAmpModeler-vst2 + 10.0 + + + + DynamicLibrary + true + MultiByte + v143 + + + DynamicLibrary + true + MultiByte + v143 + + + DynamicLibrary + false + true + MultiByte + v143 + + + DynamicLibrary + false + true + MultiByte + v143 + + + DynamicLibrary + false + true + MultiByte + v143 + + + DynamicLibrary + false + true + MultiByte + v143 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(SolutionDir)build-win\vst2\$(Platform)\$(Configuration)\ + + + $(SolutionDir)build-win\vst2\$(Platform)\$(Configuration)\ + + + $(SolutionDir)build-win\vst2\$(Platform)\$(Configuration)\int\ + + + $(BINARY_NAME) + .dll + + + $(SolutionDir)build-win\vst2\$(Platform)\$(Configuration)\int\ + + $(BINARY_NAME) + .dll + + + $(SolutionDir)build-win\vst2\$(Platform)\$(Configuration)\ + + + $(SolutionDir)build-win\vst2\$(Platform)\$(Configuration)\ + + + $(SolutionDir)build-win\vst2\$(Platform)\$(Configuration)\int\ + $(BINARY_NAME) + .dll + + + $(SolutionDir)build-win\vst2\$(Platform)\$(Configuration)\int\ + $(BINARY_NAME) + .dll + + + $(SolutionDir)build-win\vst2\$(Platform)\$(Configuration)\ + + + $(SolutionDir)build-win\vst2\$(Platform)\$(Configuration)\ + + + $(SolutionDir)build-win\vst2\$(Platform)\$(Configuration)\int\ + $(BINARY_NAME) + .dll + + + $(SolutionDir)build-win\vst2\$(Platform)\$(Configuration)\int\ + $(BINARY_NAME) + .dll + + + + Level3 + Disabled + $(VST2_DEFS);$(DEBUG_DEFS);$(EXTRA_DEBUG_DEFS);%(PreprocessorDefinitions) + MultiThreadedDebug + $(VST2_INC_PATHS);%(AdditionalIncludeDirectories) + + + Windows + %(AdditionalDependencies) + %(AdditionalLibraryDirectories) + + + + + + Level3 + Disabled + $(VST2_DEFS);$(DEBUG_DEFS);$(EXTRA_DEBUG_DEFS);%(PreprocessorDefinitions) + MultiThreadedDebug + $(VST2_INC_PATHS);%(AdditionalIncludeDirectories) + + + Windows + %(AdditionalDependencies) + + + + + + Level3 + MaxSpeed + true + true + $(VST2_DEFS);$(RELEASE_DEFS);$(EXTRA_RELEASE_DEFS);%(PreprocessorDefinitions) + true + Speed + $(VST2_INC_PATHS);%(AdditionalIncludeDirectories) + + + true + true + Windows + %(AdditionalDependencies) + %(AdditionalLibraryDirectories) + + + + + + Level3 + MaxSpeed + true + true + $(VST2_DEFS);$(RELEASE_DEFS);$(EXTRA_RELEASE_DEFS);%(PreprocessorDefinitions) + true + Speed + $(VST2_INC_PATHS);%(AdditionalIncludeDirectories) + + + true + true + Windows + %(AdditionalDependencies) + + + + + + Level3 + MaxSpeed + true + true + $(VST2_DEFS);$(TRACER_DEFS);$(EXTRA_TRACER_DEFS);%(PreprocessorDefinitions) + true + $(VST2_INC_PATHS);%(AdditionalIncludeDirectories) + + + true + true + Windows + %(AdditionalDependencies) + + + + + + Level3 + MaxSpeed + true + true + $(VST2_DEFS);$(TRACER_DEFS);$(EXTRA_TRACER_DEFS);%(PreprocessorDefinitions) + true + $(VST2_INC_PATHS);%(AdditionalIncludeDirectories) + + + true + true + Windows + %(AdditionalLibraryDirectories) + %(AdditionalDependencies) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + + + + + + + + + + + + + + + + + + + $(IntDir)%(RelativeDir) + $(IntDir)%(RelativeDir) + $(IntDir)%(RelativeDir) + $(IntDir)%(RelativeDir) + $(IntDir)%(RelativeDir) + $(IntDir)%(RelativeDir) + + + + + + + + + + + + + + + + + + + + Designer + + + + + + + + + \ No newline at end of file diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-vst2.vcxproj.filters b/NeuralAmpModeler/projects/NeuralAmpModeler-vst2.vcxproj.filters new file mode 100644 index 000000000..8eff1ee93 --- /dev/null +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-vst2.vcxproj.filters @@ -0,0 +1,356 @@ + + + + + + IGraphics + + + IGraphics\Platform + + + IGraphics\Controls + + + IGraphics\Controls + + + IPlug + + + IPlug + + + IPlug + + + IPlug + + + IPlug + + + IGraphics\Controls + + + IGraphics\Controls + + + IPlug + + + IPlug\VST2 + + + IGraphics\Drawing + + + IGraphics\Drawing + + + IGraphics + + + NAM + + + NAM + + + NAM + + + NAM + + + NAM + + + NAM + + + NAM + + + dsp + + + dsp + + + dsp + + + dsp + + + dsp + + + + + + + + resources + + + IGraphics + + + IGraphics + + + IGraphics + + + IGraphics + + + IGraphics + + + IGraphics + + + IGraphics + + + IGraphics + + + IGraphics + + + IGraphics + + + IGraphics\Drawing + + + IGraphics\Platform + + + IGraphics\Platform + + + IGraphics\Platform + + + IGraphics\Platform + + + IGraphics\Platform + + + IGraphics\Controls + + + IGraphics\Controls + + + IGraphics\Controls + + + IGraphics\Controls + + + IGraphics\Controls + + + IGraphics\Controls + + + IPlug + + + IPlug + + + IPlug + + + IPlug + + + IPlug + + + IPlug + + + IPlug + + + IPlug + + + IPlug + + + IPlug + + + IPlug + + + IPlug + + + IPlug + + + IGraphics\Controls + + + IGraphics\Controls + + + IPlug + + + IGraphics\Drawing + + + IGraphics + + + IPlug + + + IGraphics + + + + NAM + + + NAM + + + NAM + + + NAM + + + NAM + + + NAM + + + NAM + + + + dsp + + + dsp + + + dsp + + + dsp + + + dsp + + + dsp + + + dsp + + + IPlug\Extras + + + IPlug\Extras + + + dsp\ResamplingContainer + + + dsp\ResamplingContainer\Dependencies + + + dsp\ResamplingContainer\Dependencies\WDL + + + dsp\ResamplingContainer\Dependencies\WDL + + + dsp\ResamplingContainer\Dependencies\WDL + + + + NAM + + + + + {74cd52f2-b3b1-45bf-b24a-5e60e66b70de} + + + {30a371c3-625a-4283-948b-afc6665bd15e} + + + {0468a615-fe74-4ab5-8e07-f68a4a4d2c61} + + + {70240a88-f166-4127-a108-4162d68a58a3} + + + {dc3b907e-91a1-483f-a535-c11681237069} + + + {40c50427-6a81-4d1f-a6f2-9712d345f626} + + + {5674951e-0cfd-4a71-98fb-050914b34427} + + + {0ce889c3-9b8a-47b9-a9b5-7592348bc27f} + + + {3d65ee8b-86ee-4713-a5ec-d73919c6419c} + + + {ed745419-3921-4abe-8286-170fa316a5ac} + + + {4b6a01ff-796f-4098-a581-3b22035cc8be} + + + {e899ee48-2aa4-4daa-8147-60bc5a3e395e} + + + {5dd75b0e-6ab4-45ff-b6f6-f93972c1f58a} + + + {a467e512-e643-4711-ad15-f0cf98f8eef2} + + + + + resources + + + + + config + + + config + + + config + + + config + + + \ No newline at end of file diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-vst2.vcxproj.user b/NeuralAmpModeler/projects/NeuralAmpModeler-vst2.vcxproj.user new file mode 100644 index 000000000..2a85012fa --- /dev/null +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-vst2.vcxproj.user @@ -0,0 +1,33 @@ + + + + $(VST2_32_HOST_PATH) + $(VST2_32_COMMAND_ARGS) + WindowsLocalDebugger + + + $(VST2_32_HOST_PATH) + WindowsLocalDebugger + $(VST2_32_COMMAND_ARGS) + + + $(VST2_32_HOST_PATH) + WindowsLocalDebugger + $(VST2_32_COMMAND_ARGS) + + + $(VST2_64_HOST_PATH) + $(VST2_64_COMMAND_ARGS) + WindowsLocalDebugger + + + $(VST2_64_HOST_PATH) + WindowsLocalDebugger + $(VST2_64_COMMAND_ARGS) + + + $(VST2_64_HOST_PATH) + WindowsLocalDebugger + $(VST2_64_COMMAND_ARGS) + + \ No newline at end of file diff --git a/NeuralAmpModeler/resources/NeuralAmpModeler-VST2-Info.plist b/NeuralAmpModeler/resources/NeuralAmpModeler-VST2-Info.plist new file mode 100644 index 000000000..cb4d4477f --- /dev/null +++ b/NeuralAmpModeler/resources/NeuralAmpModeler-VST2-Info.plist @@ -0,0 +1,30 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleExecutable + NeuralAmpModeler + CFBundleGetInfoString + NeuralAmpModeler v0.7.13 Copyright 2022 Steven Atkinson + CFBundleIdentifier + com.StevenAtkinson.vst.NeuralAmpModeler + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + NeuralAmpModeler + CFBundlePackageType + BNDL + CFBundleShortVersionString + 0.7.13 + CFBundleSignature + 1YEo + CFBundleVersion + 0.7.13 + CSResourcesFileMapped + + LSMinimumSystemVersion + 10.15.0 + + diff --git a/NeuralAmpModeler/scripts/makedist-mac.sh b/NeuralAmpModeler/scripts/makedist-mac.sh index a78af5d2f..9ae43d524 100755 --- a/NeuralAmpModeler/scripts/makedist-mac.sh +++ b/NeuralAmpModeler/scripts/makedist-mac.sh @@ -69,6 +69,9 @@ fi # ARCHIVE_NAME=`python3 ${SCRIPTS}/get_archive_name.py ${PLUGIN_NAME} mac full` # fi +VST2=`echo | grep VST2_PATH $XCCONFIG` +VST2=$HOME${VST2//\VST2_PATH = \$(HOME)}/$PLUGIN_NAME.vst + VST3=`echo | grep VST3_PATH $XCCONFIG` VST3=$HOME${VST3//\VST3_PATH = \$(HOME)}/$PLUGIN_NAME.vst3 @@ -91,6 +94,7 @@ CERT_ID=${CERT_ID//\CERTIFICATE_ID = } DEV_ID_APP_STR="Developer ID Application: ${CERT_ID}" DEV_ID_INST_STR="Developer ID Installer: ${CERT_ID}" +echo $VST2 echo $VST3 echo $AU echo $APP @@ -124,6 +128,10 @@ if [ -d $AU ]; then sudo rm -f -R $AU fi +if [ -d $VST2 ]; then + sudo rm -f -R $VST2 +fi + if [ -d $VST3 ]; then sudo rm -f -R $VST3 fi @@ -160,6 +168,10 @@ if [ -d $AU ]; then ./$SCRIPTS/SetFileIcon -image resources/$PLUGIN_NAME.icns -file $AU fi +if [ -d $VST2 ]; then + ./$SCRIPTS/SetFileIcon -image resources/$PLUGIN_NAME.icns -file $VST2 +fi + if [ -d $VST3 ]; then ./$SCRIPTS/SetFileIcon -image resources/$PLUGIN_NAME.icns -file $VST3 fi @@ -182,6 +194,10 @@ if [ -d $AU ]; then strip -x $AU/Contents/MacOS/$PLUGIN_NAME fi +if [ -d $VST2 ]; then + strip -x $VST2/Contents/MacOS/$PLUGIN_NAME +fi + if [ -d $VST3 ]; then strip -x $VST3/Contents/MacOS/$PLUGIN_NAME fi @@ -210,6 +226,8 @@ if [ $CODESIGN == 1 ]; then codesign --force -s "${DEV_ID_APP_STR}" -v $APP --deep --strict --options=runtime #hardened runtime for app xattr -cr $AU codesign --force -s "${DEV_ID_APP_STR}" -v $AU --deep --strict + # xattr -cr $VST2 + # codesign --force -s "${DEV_ID_APP_STR}" -v $VST2 --deep --strict xattr -cr $VST3 codesign --force -s "${DEV_ID_APP_STR}" -v $VST3 --deep --strict #--------------------------------------------------------------------------------------------------------- @@ -295,6 +313,10 @@ else cp -R $AU build-mac/zip/$PLUGIN_NAME.component fi + if [ -d $VST2 ]; then + cp -R $VST2 build-mac/zip/$PLUGIN_NAME.vst + fi + if [ -d $VST3 ]; then cp -R $VST3 build-mac/zip/$PLUGIN_NAME.vst3 fi diff --git a/NeuralAmpModeler/scripts/makedist-win.bat b/NeuralAmpModeler/scripts/makedist-win.bat index 16c84e995..8ecde0ba2 100644 --- a/NeuralAmpModeler/scripts/makedist-win.bat +++ b/NeuralAmpModeler/scripts/makedist-win.bat @@ -83,7 +83,7 @@ REM echo Building 32 bit binaries... REM msbuild NeuralAmpModeler.sln /p:configuration=release /p:platform=win32 /nologo /verbosity:minimal /fileLogger /m /flp:logfile=build-win.log;errorsonly REM echo Building 64 bit binaries... -REM add projects with /t to build VST3 and AAX +REM add projects with /t to build VST2 and AAX msbuild NeuralAmpModeler.sln /t:NeuralAmpModeler-app;NeuralAmpModeler-vst3 /p:configuration=release /p:platform=x64 /nologo /verbosity:minimal /fileLogger /m /flp:logfile=build-win.log;errorsonly;append REM --echo Copying AAX Presets diff --git a/NeuralAmpModeler/scripts/makeinstaller-mac.sh b/NeuralAmpModeler/scripts/makeinstaller-mac.sh index df38d8c65..b3d4e2f1b 100755 --- a/NeuralAmpModeler/scripts/makeinstaller-mac.sh +++ b/NeuralAmpModeler/scripts/makeinstaller-mac.sh @@ -31,6 +31,7 @@ PRODUCT_NAME=NeuralAmpModeler # locations PRODUCTS="build-mac" +VST2="${PRODUCT_NAME}.vst" VST3="${PRODUCT_NAME}.vst3" AU="${PRODUCT_NAME}.component" APP="${PRODUCT_NAME}.app" @@ -69,6 +70,11 @@ build_flavor() rm -r $TMPDIR } +# try to build VST2 package +if [[ -d $PRODUCTS/$VST2 ]]; then + build_flavor "VST2" $VST2 "com.StevenAtkinson.vst2.pkg.${PRODUCT_NAME}" "/Library/Audio/Plug-Ins/VST" +fi + # # try to build VST3 package if [[ -d $PRODUCTS/$VST3 ]]; then build_flavor "VST3" $VST3 "com.StevenAtkinson.vst3.pkg.${PRODUCT_NAME}" "/Library/Audio/Plug-Ins/VST3" @@ -105,6 +111,11 @@ fi # create distribution.xml +if [[ -d $PRODUCTS/$VST2 ]]; then + VST2_PKG_REF="" + VST2_CHOICE="" + VST2_CHOICE_DEF="${PRODUCT_NAME}_VST2.pkg" +fi if [[ -d $PRODUCTS/$VST3 ]]; then VST3_PKG_REF="" VST3_CHOICE="" @@ -140,6 +151,7 @@ cat > ${TARGET_DIR}/distribution.xml << XMLEND + ${VST2_PKG_REF} ${VST3_PKG_REF} ${AU_PKG_REF} ${AAX_PKG_REF} @@ -147,12 +159,14 @@ cat > ${TARGET_DIR}/distribution.xml << XMLEND ${RES_PKG_REF} + ${VST2_CHOICE} ${VST3_CHOICE} ${AU_CHOICE} ${AAX_CHOICE} ${APP_CHOICE} ${RES_CHOICE} + ${VST2_CHOICE_DEF} ${VST3_CHOICE_DEF} ${AU_CHOICE_DEF} ${AAX_CHOICE_DEF} diff --git a/NeuralAmpModeler/scripts/postbuild-win.bat b/NeuralAmpModeler/scripts/postbuild-win.bat index c953203ba..05cd134ee 100644 --- a/NeuralAmpModeler/scripts/postbuild-win.bat +++ b/NeuralAmpModeler/scripts/postbuild-win.bat @@ -1,32 +1,38 @@ @echo off -REM - CALL "$(SolutionDir)scripts\postbuild-win.bat" "$(TargetExt)" "$(BINARY_NAME)" "$(Platform)" "$(TargetPath)" "$(VST3_32_PATH)" "$(VST3_64_PATH)" "$(AAX_32_PATH)" "$(AAX_64_PATH)" "$(BUILD_DIR)" "$(VST_ICON)" "$(AAX_ICON)" " +REM - CALL "$(SolutionDir)scripts\postbuild-win.bat" "$(TargetExt)" "$(BINARY_NAME)" "$(Platform)" "$(COPY_VST2)" "$(TargetPath)" "$(VST2_32_PATH)" "$(VST2_64_PATH)" "$(VST3_32_PATH)" "$(VST3_64_PATH)" "$(AAX_32_PATH)" "$(AAX_64_PATH)" "$(BUILD_DIR)" "$(VST_ICON)" "$(AAX_ICON)" " REM $(CREATE_BUNDLE_SCRIPT)" set FORMAT=%1 set NAME=%2 set PLATFORM=%3 -set BUILT_BINARY=%4 -set VST3_32_PATH=%5 -set VST3_64_PATH=%6 +set COPY_VST2=%4 +set BUILT_BINARY=%5 +set VST2_32_PATH=%6 +set VST2_64_PATH=%7 +set VST3_32_PATH=%8 +set VST3_64_PATH=%9 shift shift shift shift shift shift -set AAX_32_PATH=%1 -set AAX_64_PATH=%2 -set BUILD_DIR=%3 -set VST_ICON=%4 -set AAX_ICON=%5 -set CREATE_BUNDLE_SCRIPT=%6 +set AAX_32_PATH=%4 +set AAX_64_PATH=%5 +set BUILD_DIR=%6 +set VST_ICON=%7 +set AAX_ICON=%8 +set CREATE_BUNDLE_SCRIPT=%9 echo POSTBUILD SCRIPT VARIABLES ----------------------------------------------------- echo FORMAT %FORMAT% echo NAME %NAME% echo PLATFORM %PLATFORM% +echo COPY_VST2 %COPY_VST2% echo BUILT_BINARY %BUILT_BINARY% +echo VST2_32_PATH %VST2_32_PATH% +echo VST2_64_PATH %VST2_64_PATH% echo VST3_32_PATH %VST3_32_PATH% echo VST3_64_PATH %VST3_64_PATH% echo BUILD_DIR %BUILD_DIR% @@ -44,6 +50,15 @@ if %PLATFORM% == "Win32" ( copy /y %BUILT_BINARY% %BUILD_DIR%\%NAME%_%PLATFORM%.dll ) + if %FORMAT% == ".dll" ( + if %COPY_VST2% == "1" ( + echo copying 32bit binary to 32bit VST2 Plugins folder ... + copy /y %BUILT_BINARY% %VST2_32_PATH% + ) else ( + echo not copying 32bit VST2 binary + ) + ) + if %FORMAT% == ".vst3" ( echo copying 32bit binary to VST3 BUNDLE .. call %CREATE_BUNDLE_SCRIPT% %BUILD_DIR%\%NAME%.vst3 %VST_ICON% %FORMAT% @@ -78,6 +93,15 @@ if %PLATFORM% == "x64" ( copy /y %BUILT_BINARY% %BUILD_DIR%\%NAME%_%PLATFORM%.dll ) + if %FORMAT% == ".dll" ( + if %COPY_VST2% == "1" ( + echo copying 64bit binary to 64bit VST2 Plugins folder ... + copy /y %BUILT_BINARY% %VST2_64_PATH% + ) else ( + echo not copying 64bit VST2 binary + ) + ) + if %FORMAT% == ".vst3" ( echo copying 64bit binary to VST3 BUNDLE ... call %CREATE_BUNDLE_SCRIPT% %BUILD_DIR%\%NAME%.vst3 %VST_ICON% %FORMAT% @@ -97,4 +121,4 @@ if %PLATFORM% == "x64" ( call %CREATE_BUNDLE_SCRIPT% %BUILD_DIR%\%NAME%.aaxplugin %AAX_ICON% %FORMAT% xcopy /E /H /Y %BUILD_DIR%\%NAME%.aaxplugin\Contents\* %AAX_64_PATH%\%NAME%.aaxplugin\Contents\ ) -) +) \ No newline at end of file diff --git a/NeuralAmpModeler/scripts/update_version-mac.py b/NeuralAmpModeler/scripts/update_version-mac.py index b4bd311df..245c8df31 100644 --- a/NeuralAmpModeler/scripts/update_version-mac.py +++ b/NeuralAmpModeler/scripts/update_version-mac.py @@ -65,6 +65,32 @@ def main(): with open(plistpath, "wb") as f2: plistlib.dump(vst3, f2) + # VST2 + + plistpath = projectpath + "/resources/" + config["BUNDLE_NAME"] + "-VST2-Info.plist" + with open(plistpath, "rb") as f: + vst2 = plistlib.load(f) + vst2["CFBundleExecutable"] = config["BUNDLE_NAME"] + vst2["CFBundleGetInfoString"] = CFBundleGetInfoString + vst2["CFBundleIdentifier"] = ( + config["BUNDLE_DOMAIN"] + + "." + + config["BUNDLE_MFR"] + + ".vst." + + config["BUNDLE_NAME"] + + "" + ) + vst2["CFBundleName"] = config["BUNDLE_NAME"] + vst2["CFBundleVersion"] = CFBundleVersion + vst2["CFBundleShortVersionString"] = CFBundleVersion + vst2["LSMinimumSystemVersion"] = LSMinimumSystemVersion + vst2["CFBundlePackageType"] = CFBundlePackageType + vst2["CFBundleSignature"] = config["PLUG_UNIQUE_ID"] + vst2["CSResourcesFileMapped"] = CSResourcesFileMapped + + with open(plistpath, "wb") as f2: + plistlib.dump(vst2, f2) + # AUDIOUNIT v2 plistpath = projectpath + "/resources/" + config["BUNDLE_NAME"] + "-AU-Info.plist" diff --git a/common-mac.xcconfig b/common-mac.xcconfig index f9ccd132b..efb6c582e 100644 --- a/common-mac.xcconfig +++ b/common-mac.xcconfig @@ -33,6 +33,7 @@ TRACER_DEFS = $DEBUG_DEFS TRACER_BUILD // here you can change if a TRACER build // macros for individual plug-in format builds etc ALL_DEFS = NOMINMAX PLUGIN_DEFS = SWELL_CLEANUP_ON_UNLOAD // macros for all plug-in builds +VST2_DEFS = VST2_API $PLUGIN_DEFS IPLUG_EDITOR=1 IPLUG_DSP=1 VST3_DEFS = VST3_API $PLUGIN_DEFS IPLUG_EDITOR=1 IPLUG_DSP=1 VST3C_DEFS = VST3C_API $PLUGIN_DEFS IPLUG_EDITOR=1 IPLUG_DSP=0 VST3P_DEFS = VST3P_API $PLUGIN_DEFS IPLUG_EDITOR=0 IPLUG_DSP=1 //NO_IGRAPHICS @@ -82,6 +83,7 @@ JSON_INC_PATH = $(DEPS_PATH)/Extras/nlohmann EXTRAS_INC_PATHS = $(EXTRAS_PATH) $(EXTRAS_PATH)/Synth $(EXTRAS_PATH)/Faust $(EXTRAS_PATH)/OSC $(EXTRAS_PATH)/HIIR $(EXTRAS_PATH)/WebSocket $(CIVETWEB_INC_PATHS) $(JSON11_PATH) $(RTAUDIO_PATH) $(RTMIDI_PATH) $(JSON_INC_PATH) // Plug-in SDK paths +VST2_SDK = $(DEPS_PATH)/IPlug/VST2_SDK VST3_SDK = $(DEPS_PATH)/IPlug/VST3_SDK AAX_SDK = $(DEPS_PATH)/IPlug/AAX_SDK REAPER_SDK = $(DEPS_PATH)/IPlug/Reaper @@ -143,6 +145,7 @@ AUv3_FRAMEWORKS = -framework AudioToolbox -framework AVFoundation -framework Cor // You can also build to the system plug-in folder, but you will need to explicitly add write permissions to build stuff there // The AAX folder should be the location of the PT Dev build plug-ins folder, installer scripts will copy to the non-developer build +VST2_PATH = $(HOME)/Library/Audio/Plug-Ins/VST VST3_PATH = $(HOME)/Library/Audio/Plug-Ins/VST3 AU_PATH = $(HOME)/Library/Audio/Plug-Ins/Components AAX_PATH = /Library/Application Support/Avid/Audio/Plug-Ins diff --git a/common-win.props b/common-win.props index 6b63c47e3..d4478742a 100644 --- a/common-win.props +++ b/common-win.props @@ -28,17 +28,23 @@ $(IGRAPHICS_DEPS_PATH)\imgui;$(IGRAPHICS_DEPS_PATH)\imgui\backends $(IGRAPHICS_DEPS_PATH)\yoga;$(IGRAPHICS_DEPS_PATH)\yoga\yoga $(IGRAPHICS_PATH);$(IGRAPHICS_PATH)\Controls;$(IGRAPHICS_PATH)\Drawing;$(IGRAPHICS_PATH)\Platforms;$(IGRAPHICS_PATH)\Extras;$(NANOSVG_PATH);$(NANOVG_PATH);$(PNG_PATH);$(ZLIB_PATH);$(FREETYPE_PATH);$(STB_PATH);$(IMGUI_INC_PATHS);$(SKIA_INC_PATHS);$(YOGA_INC_PATHS) + $(IPLUG_DEPS_PATH)\VST2_SDK $(IPLUG_DEPS_PATH)\VST3_SDK $(IPLUG_DEPS_PATH)\RTAudio\include $(IPLUG_DEPS_PATH)\AAX_SDK + $(ProgramFiles)\REAPER\reaper.exe + $(ProgramW6432)\REAPER (x64)\reaper.exe $(ProgramFiles)\REAPER\reaper.exe $(ProgramW6432)\REAPER (x64)\reaper.exe $(CommonProgramFiles)\VST3 $(CommonProgramW6432)\VST3 + $(ProgramFiles)\VstPlugins + $(ProgramW6432)\VstPlugins $(CommonProgramFiles)\Avid\Audio\Plug-Ins $(CommonProgramW6432)\Avid\Audio\Plug-Ins $(APPDATA)\REAPER\UserPlugins APP_API;__WINDOWS_DS__;__WINDOWS_MM__;__WINDOWS_ASIO__;IPLUG_EDITOR=1;IPLUG_DSP=1 + VST2_API;VST_FORCE_DEPRECATED;IPLUG_EDITOR=1;IPLUG_DSP=1 VST3_API;IPLUG_EDITOR=1;IPLUG_DSP=1 VST3P_API;IPLUG_EDITOR=0;IPLUG_DSP=1 VST3C_API;IPLUG_EDITOR=1;IPLUG_DSP=0 @@ -46,14 +52,18 @@ NDEBUG; TRACER_BUILD;NDEBUG; $(IPLUG_PATH)\APP;$(IPLUG_DEPS_PATH)\RTAudio\include;$(IPLUG_DEPS_PATH)\RTAudio;$(IPLUG_DEPS_PATH)\RTMidi + $(IPLUG_PATH)\VST2;$(VST2_SDK) $(IPLUG_PATH)\VST3;$(VST3_SDK) $(IPLUG_PATH)\AAX;$(AAX_SDK)\Interfaces;$(AAX_SDK)\Interfaces\ACF; AAX_API;IPLUG_EDITOR=1;IPLUG_DSP=1;_WINDOWS;WIN32;_WIN32;WINDOWS_VERSION;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NOMINMAX wininet.lib;odbc32.lib;odbccp32.lib;psapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib; dsound.lib;winmm.lib; + $(SolutionDir)$(SolutionName).RPP + $(SolutionDir)$(SolutionName).RPP $(SolutionDir)$(SolutionName).RPP $(SolutionDir)$(SolutionName).RPP + 1 $(IPLUG_DEPS_PATH)/Reaper;$(IPLUG_PATH)\ReaperExt; $(AAX_SDK)\Utilities\PlugIn.ico $(IPLUG2_ROOT)\Scripts\icons\VST_Logo_Steinberg.ico @@ -162,6 +172,9 @@ $(IGRAPHICS_INC_PATHS) + + $(VST2_SDK) + $(VST3_SDK) @@ -171,6 +184,12 @@ $(AAX_SDK) + + $(VST2_32_HOST_PATH) + + + $(VST2_64_HOST_PATH) + $(VST3_32_HOST_PATH) @@ -183,6 +202,12 @@ $(VST3_64_PATH) + + $(VST2_32_PATH) + + + $(VST2_64_PATH) + $(AAX_32_PATH) @@ -195,6 +220,9 @@ $(APP_DEFS) + + $(VST2_DEFS) + $(VST3_DEFS) @@ -216,6 +244,9 @@ $(APP_INC_PATHS) + + $(VST2_INC_PATHS) + $(VST3_INC_PATHS) @@ -234,12 +265,21 @@ $(APP_LIBS) + + $(VST2_32_COMMAND_ARGS) + + + $(VST2_64_COMMAND_ARGS) + $(VST3_64_COMMAND_ARGS) $(VST3_32_COMMAND_ARGS) + + $(COPY_VST2) + $(REAPER_INC_PATHS) From a452a4e4e7bbc37514355e1937f6459f7dfb846e Mon Sep 17 00:00:00 2001 From: Steven Atkinson Date: Mon, 20 Apr 2026 14:06:45 -0700 Subject: [PATCH 18/18] Restore historical Windows VST2 project files Bring back the pre-removal NeuralAmpModeler-vst2 Visual Studio projects as-is to keep the branch diff small for review; macOS VST2 remains the supported path. Made-with: Cursor --- .../projects/NeuralAmpModeler-vst2.vcxproj | 115 ++---- .../NeuralAmpModeler-vst2.vcxproj.filters | 336 ++++++++---------- 2 files changed, 185 insertions(+), 266 deletions(-) diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-vst2.vcxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-vst2.vcxproj index ab7b769ec..52b1fc8e4 100644 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-vst2.vcxproj +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-vst2.vcxproj @@ -113,13 +113,11 @@ $(BINARY_NAME) - .dll $(SolutionDir)build-win\vst2\$(Platform)\$(Configuration)\int\ $(BINARY_NAME) - .dll $(SolutionDir)build-win\vst2\$(Platform)\$(Configuration)\ @@ -130,12 +128,10 @@ $(SolutionDir)build-win\vst2\$(Platform)\$(Configuration)\int\ $(BINARY_NAME) - .dll $(SolutionDir)build-win\vst2\$(Platform)\$(Configuration)\int\ $(BINARY_NAME) - .dll $(SolutionDir)build-win\vst2\$(Platform)\$(Configuration)\ @@ -146,12 +142,10 @@ $(SolutionDir)build-win\vst2\$(Platform)\$(Configuration)\int\ $(BINARY_NAME) - .dll $(SolutionDir)build-win\vst2\$(Platform)\$(Configuration)\int\ $(BINARY_NAME) - .dll @@ -163,8 +157,6 @@ Windows - %(AdditionalDependencies) - %(AdditionalLibraryDirectories) @@ -178,9 +170,11 @@ Windows - %(AdditionalDependencies) + + $(SolutionDir)\Resources\img;%(AdditionalIncludeDirectories) + @@ -197,8 +191,6 @@ true true Windows - %(AdditionalDependencies) - %(AdditionalLibraryDirectories) @@ -217,7 +209,6 @@ true true Windows - %(AdditionalDependencies) @@ -235,7 +226,6 @@ true true Windows - %(AdditionalDependencies) @@ -253,25 +243,27 @@ true true Windows - %(AdditionalLibraryDirectories) - %(AdditionalDependencies) + + + - + + @@ -286,17 +278,14 @@ - - - - + @@ -305,38 +294,22 @@ - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - @@ -360,52 +333,36 @@ + - - - - - - + + + + + + + + + + + - - - - - $(IntDir)%(RelativeDir) - $(IntDir)%(RelativeDir) - $(IntDir)%(RelativeDir) - $(IntDir)%(RelativeDir) - $(IntDir)%(RelativeDir) - $(IntDir)%(RelativeDir) - - - - - - - - - - - - - Designer - + + diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-vst2.vcxproj.filters b/NeuralAmpModeler/projects/NeuralAmpModeler-vst2.vcxproj.filters index 8eff1ee93..4420d3f7e 100644 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-vst2.vcxproj.filters +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-vst2.vcxproj.filters @@ -1,133 +1,175 @@ - + - - IGraphics - - - IGraphics\Platform - - - IGraphics\Controls - - - IGraphics\Controls - IPlug IPlug - + IPlug - + + IPlug\VST2 + + + IGraphics + + + IGraphics\Platform + + IPlug IPlug - + + IGraphics + + + IGraphics + + IGraphics\Controls IGraphics\Controls + + IGraphics\Controls + IPlug - - IPlug\VST2 - - - IGraphics\Drawing - IGraphics\Drawing - - IGraphics - - - NAM - - - NAM + + + dsp - - NAM + + dsp - - NAM + + dsp - - NAM + + dsp - - NAM + + dsp - - NAM + + dsp - + dsp - + dsp - + dsp - + dsp - + dsp - + + IPlug + + + IPlug + + + IPlug + + + IPlug + + + IPlug + + + IPlug + + + IPlug + + + IPlug + + + IPlug + + + IPlug + resources + + IPlug + + + IPlug + + + IPlug\VST2 + + + IPlug\VST2 + + + IPlug\VST2 + IGraphics - + IGraphics - + IGraphics - + IGraphics - + IGraphics - + IGraphics - + IGraphics - + IGraphics - + IGraphics - + IGraphics IGraphics\Drawing - + + IGraphics\Platform + + IGraphics\Platform @@ -136,16 +178,25 @@ IGraphics\Platform - + IGraphics\Platform - - IGraphics\Platform + + IPlug + + + IGraphics + + + IGraphics IGraphics\Controls - + + IGraphics\Controls + + IGraphics\Controls @@ -154,184 +205,95 @@ IGraphics\Controls - + IGraphics\Controls - + IGraphics\Controls - - IPlug - - - IPlug - - - IPlug - - - IPlug - - - IPlug - - - IPlug - - - IPlug - - - IPlug - - - IPlug - - - IPlug - - - IPlug - - - IPlug - - - IPlug - IGraphics\Controls - - IGraphics\Controls - IPlug IGraphics\Drawing - - IGraphics - IPlug IGraphics - - - NAM - - - NAM - - - NAM - - - NAM - - - NAM - - - NAM - - - NAM - - - + dsp - + dsp - + dsp - + dsp - + dsp - + dsp - + dsp - - IPlug\Extras - - - IPlug\Extras - - - dsp\ResamplingContainer + + dsp - - dsp\ResamplingContainer\Dependencies + + + dsp - - dsp\ResamplingContainer\Dependencies\WDL + + dsp - - dsp\ResamplingContainer\Dependencies\WDL + + dsp - - dsp\ResamplingContainer\Dependencies\WDL + + dsp - - - NAM + + dsp + + {2425d7db-3821-4242-b5c9-db34bda176ce} + - {74cd52f2-b3b1-45bf-b24a-5e60e66b70de} + {340070a8-76f3-47eb-9d5f-c13785b65579} + + + {35a9e026-dde0-499a-9432-4ee1754ffba8} - {30a371c3-625a-4283-948b-afc6665bd15e} + {4867b134-9c10-4435-b4ba-5b411e34340b} - {0468a615-fe74-4ab5-8e07-f68a4a4d2c61} + {f77209f4-83aa-47eb-9a44-59880a83c238} - {70240a88-f166-4127-a108-4162d68a58a3} + {2731d3da-3446-4ccb-83ff-8ae3793611b5} - {dc3b907e-91a1-483f-a535-c11681237069} - - - {40c50427-6a81-4d1f-a6f2-9712d345f626} - - - {5674951e-0cfd-4a71-98fb-050914b34427} + {fa39707d-4118-45f2-92fb-d407fa5d3288} - {0ce889c3-9b8a-47b9-a9b5-7592348bc27f} - - - {3d65ee8b-86ee-4713-a5ec-d73919c6419c} + {8c338368-7512-426b-af83-0f50719ca0bd} - {ed745419-3921-4abe-8286-170fa316a5ac} - - - {4b6a01ff-796f-4098-a581-3b22035cc8be} - - - {e899ee48-2aa4-4daa-8147-60bc5a3e395e} - - - {5dd75b0e-6ab4-45ff-b6f6-f93972c1f58a} - - - {a467e512-e643-4711-ad15-f0cf98f8eef2} + {721003ab-1117-4143-86a2-3d9fd0d78e62} @@ -340,9 +302,6 @@ - - config - config @@ -352,5 +311,8 @@ config + + config + \ No newline at end of file