From 5fb8d2325fdcd87313155222f5f21e1ec10ce184 Mon Sep 17 00:00:00 2001 From: Steven Atkinson Date: Mon, 20 Apr 2026 12:36:16 -0700 Subject: [PATCH] Remove VST2 build targets Drop VST2 Visual Studio projects, macOS scheme and plist, and trim VST2-related scripts and shared config. Align Windows/macOS project files. Made-with: Cursor --- .../config/NeuralAmpModeler-win.props | 2 +- .../projects/NeuralAmpModeler-aax.vcxproj | 1120 +++++++++-------- .../projects/NeuralAmpModeler-app.vcxproj | 868 ++++++------- .../project.pbxproj | 52 +- .../project.pbxproj | 318 ++--- .../xcschemes/macOS-VST2.xcscheme | 84 -- .../projects/NeuralAmpModeler-vst2.vcxproj | 373 ------ .../NeuralAmpModeler-vst2.vcxproj.filters | 318 ----- .../NeuralAmpModeler-vst2.vcxproj.user | 33 - .../projects/NeuralAmpModeler-vst3.vcxproj | 918 +++++++------- .../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 - 18 files changed, 1625 insertions(+), 2644 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 ccd34be0f..ff83f513f 100644 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-aax.vcxproj +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-aax.vcxproj @@ -1,556 +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 d81a7e050..c8852819e 100644 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-app.vcxproj +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-app.vcxproj @@ -1,430 +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 04bdb95e5..cf9d95eb7 100644 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-iOS.xcodeproj/project.pbxproj +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-iOS.xcodeproj/project.pbxproj @@ -44,14 +44,23 @@ 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 */; }; + 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, ); }; }; @@ -280,13 +289,22 @@ 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 = ""; }; + 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 = ""; }; 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; }; @@ -670,8 +688,17 @@ 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 */, + 4FBDC97329FFF143004FF203 /* ring_buffer.h */, + 4FBDC97429FFF143004FF203 /* film.h */, + 4FBDC97529FFF143004FF203 /* gating_activations.h */, + 4FBDC97629FFF143004FF203 /* registry.h */, ); name = NAM; path = ../../NeuralAmpModelerCore/NAM; @@ -832,7 +859,12 @@ 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 */, + 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 */, @@ -1058,7 +1090,11 @@ 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 */, 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 9ee8d2eb8..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 */; }; @@ -137,13 +136,36 @@ 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 */; }; 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 */; }; 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 */; }; @@ -174,6 +196,24 @@ 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 */; }; + 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 */; }; @@ -532,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 */; @@ -632,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; }; @@ -646,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 = ""; }; @@ -668,13 +697,22 @@ 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 = ""; }; - 4F2FB14C2A0047420027AB66 /* wavenet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wavenet.h; 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 /* 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 = ""; }; 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 = ""; }; 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 = ""; }; + 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; }; @@ -719,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; }; @@ -1039,13 +1075,6 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 4F20EF2C132C69FE0030E34C /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; 4F39075D2013EBA300DDA490 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -1159,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 */, @@ -1171,7 +1199,6 @@ isa = PBXGroup; children = ( 4FD16A0913B63081001D0217 /* NeuralAmpModeler.app */, - 4F20EF33132C69FE0030E34C /* NeuralAmpModeler.vst */, 4F9828E0140A9EB700F3FCC1 /* NeuralAmpModeler.vst3 */, 4F78DB5F13B6462B0032E0F3 /* NeuralAmpModeler.component */, 4FB600331567CB0A0020189A /* NeuralAmpModeler.aaxplugin */, @@ -1294,7 +1321,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 */, @@ -1303,8 +1334,13 @@ 4F2FB1462A0047420027AB66 /* util.cpp */, 4F2FB14E2A0047420027AB66 /* util.h */, 4F2FB1472A0047420027AB66 /* version.h */, - 4F2FB1522A0047420027AB66 /* 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 */, ); name = NAM; path = ../../NeuralAmpModelerCore/NAM; @@ -1436,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 */, @@ -1464,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 = ( @@ -2017,7 +2032,10 @@ 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 */, 4F78BE1222E73DD900AD537E /* NeuralAmpModelerAU.h in Headers */, 4F2FB1542A0047420027AB66 /* Resample.h in Headers */, 4F2FB15E2A0047420027AB66 /* wav.h in Headers */, @@ -2075,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" */; @@ -2342,7 +2340,6 @@ targets = ( 4F78DAF113B643600032E0F3 /* All */, 4FD16A0813B63081001D0217 /* APP */, - 4F20EEC8132C69FE0030E34C /* VST2 */, 4F9828AA140A9EB700F3FCC1 /* VST3 */, 4F3AE17812C0E5E2001FD7A4 /* AU */, 4FB600121567CB0A0020189A /* AAX */, @@ -2367,13 +2364,6 @@ /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ - 4F20EEC9132C69FE0030E34C /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; 4F25BECE12C61F47005D51F7 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -2535,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; @@ -2613,44 +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 */, - 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; @@ -2658,6 +2595,10 @@ 4F2FB1A22A0047430027AB66 /* convnet.cpp in Sources */, 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 */, 4F2FB1AC2A0047430027AB66 /* lstm.cpp in Sources */, 4F2FB1B82A0047430027AB66 /* activations.cpp in Sources */, @@ -2693,6 +2634,10 @@ 4F2FB18A2A0047430027AB66 /* util.cpp in Sources */, 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 */, 4F6FD2B422675B6300FC59E6 /* IGraphicsCoreText.mm in Sources */, 4FDAC0ED207D76C600299363 /* IPlugTimer.cpp in Sources */, @@ -2731,6 +2676,10 @@ 4F3EE1CF231438D000004786 /* swell-menu.mm in Sources */, 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 */, 4F7C496E255DDFCB00DF7588 /* IPopupMenuControl.cpp in Sources */, 4F3EE1D1231438D000004786 /* swell-appstub.mm in Sources */, @@ -2795,6 +2744,10 @@ AA341E252B9E5A530069C260 /* ToneStack.cpp in Sources */, 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 */, 4F78BE2622E7406D00AD537E /* IPlugAPIBase.cpp in Sources */, 4F2FB1AD2A0047430027AB66 /* lstm.cpp in Sources */, @@ -2827,6 +2780,10 @@ 4F2FB1802A0047430027AB66 /* wav.cpp in Sources */, 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 */, 4F9828C1140A9EB700F3FCC1 /* IPlugParameter.cpp in Sources */, 4F81591A205D50EB00393585 /* pluginview.cpp in Sources */, @@ -2905,6 +2862,10 @@ AA341E212B9E5A530069C260 /* ToneStack.cpp in Sources */, 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 */, 4FB600261567CB0A0020189A /* AAX_Exports.cpp in Sources */, 4F2FB1AA2A0047430027AB66 /* lstm.cpp in Sources */, @@ -2959,6 +2920,10 @@ 4FD16D3E13B63595001D0217 /* swell-menu.mm in Sources */, 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 */, 4F7C4956255DDFC300DF7588 /* IPopupMenuControl.cpp in Sources */, 4F5C5F6B21BED08700E024A7 /* swell-appstub.mm in Sources */, @@ -3032,6 +2997,10 @@ 4F2FB1652A0047430027AB66 /* dsp.cpp in Sources */, 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 */, 4FFBB92120863B0E00DDD0E7 /* vstcomponentbase.cpp in Sources */, 4FFBB92220863B0E00DDD0E7 /* IPlugVST3_Processor.cpp in Sources */, @@ -3095,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 */; @@ -3294,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 = { @@ -4619,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 4763a404e..87048b726 100644 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj @@ -1,455 +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/common-mac.xcconfig b/common-mac.xcconfig index fb1b2be53..f058f2ed8 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 3f4930f78..525510abc 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)