diff --git a/.github/workflows/build-native.yml b/.github/workflows/build-native.yml index a5b527e1..5f9935e3 100644 --- a/.github/workflows/build-native.yml +++ b/.github/workflows/build-native.yml @@ -107,7 +107,7 @@ jobs: run: | powershell -Command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; Invoke-WebRequest https://github.com/Tracktion/pluginval/releases/download/latest_release/pluginval_Windows.zip -OutFile pluginval.zip" powershell -Command "Expand-Archive pluginval.zip -DestinationPath ." - pluginval.exe --skip-gui-tests --validate-in-process --output-dir "./bin" --validate ${{env.PROJECT_NAME}}.vst3 + pluginval.exe --skip-gui-tests --validate-in-process --output-dir "./bin" --validate ${{env.PROJECT_NAME}}.vst3/Contents/x86_64-win/${{env.PROJECT_NAME}}.vst3 if %ERRORLEVEL% neq 0 exit /b 1 shell: cmd diff --git a/TemplateProject/TemplateProject.sln b/TemplateProject/TemplateProject.sln index cbd2d819..ce15b81c 100644 --- a/TemplateProject/TemplateProject.sln +++ b/TemplateProject/TemplateProject.sln @@ -15,72 +15,72 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TemplateProject-clap", "pro EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 + Debug|ARM64EC = Debug|ARM64EC Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 + Release|ARM64EC = Release|ARM64EC Release|x64 = Release|x64 - Tracer|Win32 = Tracer|Win32 + Tracer|ARM64EC = Tracer|ARM64EC Tracer|x64 = Tracer|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {41785AE4-5B70-4A75-880B-4B418B4E13C6}.Debug|Win32.ActiveCfg = Debug|Win32 - {41785AE4-5B70-4A75-880B-4B418B4E13C6}.Debug|Win32.Build.0 = Debug|Win32 + {41785AE4-5B70-4A75-880B-4B418B4E13C6}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC + {41785AE4-5B70-4A75-880B-4B418B4E13C6}.Debug|ARM64EC.Build.0 = Debug|ARM64EC {41785AE4-5B70-4A75-880B-4B418B4E13C6}.Debug|x64.ActiveCfg = Debug|x64 {41785AE4-5B70-4A75-880B-4B418B4E13C6}.Debug|x64.Build.0 = Debug|x64 - {41785AE4-5B70-4A75-880B-4B418B4E13C6}.Release|Win32.ActiveCfg = Release|Win32 - {41785AE4-5B70-4A75-880B-4B418B4E13C6}.Release|Win32.Build.0 = Release|Win32 + {41785AE4-5B70-4A75-880B-4B418B4E13C6}.Release|ARM64EC.ActiveCfg = Release|ARM64EC + {41785AE4-5B70-4A75-880B-4B418B4E13C6}.Release|ARM64EC.Build.0 = Release|ARM64EC {41785AE4-5B70-4A75-880B-4B418B4E13C6}.Release|x64.ActiveCfg = Release|x64 {41785AE4-5B70-4A75-880B-4B418B4E13C6}.Release|x64.Build.0 = Release|x64 - {41785AE4-5B70-4A75-880B-4B418B4E13C6}.Tracer|Win32.ActiveCfg = Tracer|Win32 - {41785AE4-5B70-4A75-880B-4B418B4E13C6}.Tracer|Win32.Build.0 = Tracer|Win32 + {41785AE4-5B70-4A75-880B-4B418B4E13C6}.Tracer|ARM64EC.ActiveCfg = Tracer|ARM64EC + {41785AE4-5B70-4A75-880B-4B418B4E13C6}.Tracer|ARM64EC.Build.0 = Tracer|ARM64EC {41785AE4-5B70-4A75-880B-4B418B4E13C6}.Tracer|x64.ActiveCfg = Tracer|x64 {41785AE4-5B70-4A75-880B-4B418B4E13C6}.Tracer|x64.Build.0 = Tracer|x64 - {2EB4846A-93E0-43A0-821E-12237105168F}.Debug|Win32.ActiveCfg = Debug|Win32 - {2EB4846A-93E0-43A0-821E-12237105168F}.Debug|Win32.Build.0 = Debug|Win32 + {2EB4846A-93E0-43A0-821E-12237105168F}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC + {2EB4846A-93E0-43A0-821E-12237105168F}.Debug|ARM64EC.Build.0 = Debug|ARM64EC {2EB4846A-93E0-43A0-821E-12237105168F}.Debug|x64.ActiveCfg = Debug|x64 {2EB4846A-93E0-43A0-821E-12237105168F}.Debug|x64.Build.0 = Debug|x64 - {2EB4846A-93E0-43A0-821E-12237105168F}.Release|Win32.ActiveCfg = Release|Win32 - {2EB4846A-93E0-43A0-821E-12237105168F}.Release|Win32.Build.0 = Release|Win32 + {2EB4846A-93E0-43A0-821E-12237105168F}.Release|ARM64EC.ActiveCfg = Release|ARM64EC + {2EB4846A-93E0-43A0-821E-12237105168F}.Release|ARM64EC.Build.0 = Release|ARM64EC {2EB4846A-93E0-43A0-821E-12237105168F}.Release|x64.ActiveCfg = Release|x64 {2EB4846A-93E0-43A0-821E-12237105168F}.Release|x64.Build.0 = Release|x64 - {2EB4846A-93E0-43A0-821E-12237105168F}.Tracer|Win32.ActiveCfg = Tracer|Win32 - {2EB4846A-93E0-43A0-821E-12237105168F}.Tracer|Win32.Build.0 = Tracer|Win32 + {2EB4846A-93E0-43A0-821E-12237105168F}.Tracer|ARM64EC.ActiveCfg = Tracer|ARM64EC + {2EB4846A-93E0-43A0-821E-12237105168F}.Tracer|ARM64EC.Build.0 = Tracer|ARM64EC {2EB4846A-93E0-43A0-821E-12237105168F}.Tracer|x64.ActiveCfg = Tracer|x64 {2EB4846A-93E0-43A0-821E-12237105168F}.Tracer|x64.Build.0 = Tracer|x64 - {079FC65A-F0E5-4E97-B318-A16D1D0B89DF}.Debug|Win32.ActiveCfg = Debug|Win32 - {079FC65A-F0E5-4E97-B318-A16D1D0B89DF}.Debug|Win32.Build.0 = Debug|Win32 + {079FC65A-F0E5-4E97-B318-A16D1D0B89DF}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC + {079FC65A-F0E5-4E97-B318-A16D1D0B89DF}.Debug|ARM64EC.Build.0 = Debug|ARM64EC {079FC65A-F0E5-4E97-B318-A16D1D0B89DF}.Debug|x64.ActiveCfg = Debug|x64 {079FC65A-F0E5-4E97-B318-A16D1D0B89DF}.Debug|x64.Build.0 = Debug|x64 - {079FC65A-F0E5-4E97-B318-A16D1D0B89DF}.Release|Win32.ActiveCfg = Release|Win32 - {079FC65A-F0E5-4E97-B318-A16D1D0B89DF}.Release|Win32.Build.0 = Release|Win32 + {079FC65A-F0E5-4E97-B318-A16D1D0B89DF}.Release|ARM64EC.ActiveCfg = Release|ARM64EC + {079FC65A-F0E5-4E97-B318-A16D1D0B89DF}.Release|ARM64EC.Build.0 = Release|ARM64EC {079FC65A-F0E5-4E97-B318-A16D1D0B89DF}.Release|x64.ActiveCfg = Release|x64 {079FC65A-F0E5-4E97-B318-A16D1D0B89DF}.Release|x64.Build.0 = Release|x64 - {079FC65A-F0E5-4E97-B318-A16D1D0B89DF}.Tracer|Win32.ActiveCfg = Tracer|Win32 - {079FC65A-F0E5-4E97-B318-A16D1D0B89DF}.Tracer|Win32.Build.0 = Tracer|Win32 + {079FC65A-F0E5-4E97-B318-A16D1D0B89DF}.Tracer|ARM64EC.ActiveCfg = Tracer|ARM64EC + {079FC65A-F0E5-4E97-B318-A16D1D0B89DF}.Tracer|ARM64EC.Build.0 = Tracer|ARM64EC {079FC65A-F0E5-4E97-B318-A16D1D0B89DF}.Tracer|x64.ActiveCfg = Tracer|x64 {079FC65A-F0E5-4E97-B318-A16D1D0B89DF}.Tracer|x64.Build.0 = Tracer|x64 - {DC4B5920-933D-4C82-B842-F34431D55A93}.Debug|Win32.ActiveCfg = Debug|Win32 - {DC4B5920-933D-4C82-B842-F34431D55A93}.Debug|Win32.Build.0 = Debug|Win32 + {DC4B5920-933D-4C82-B842-F34431D55A93}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC + {DC4B5920-933D-4C82-B842-F34431D55A93}.Debug|ARM64EC.Build.0 = Debug|ARM64EC {DC4B5920-933D-4C82-B842-F34431D55A93}.Debug|x64.ActiveCfg = Debug|x64 {DC4B5920-933D-4C82-B842-F34431D55A93}.Debug|x64.Build.0 = Debug|x64 - {DC4B5920-933D-4C82-B842-F34431D55A93}.Release|Win32.ActiveCfg = Release|Win32 - {DC4B5920-933D-4C82-B842-F34431D55A93}.Release|Win32.Build.0 = Release|Win32 + {DC4B5920-933D-4C82-B842-F34431D55A93}.Release|ARM64EC.ActiveCfg = Release|ARM64EC + {DC4B5920-933D-4C82-B842-F34431D55A93}.Release|ARM64EC.Build.0 = Release|ARM64EC {DC4B5920-933D-4C82-B842-F34431D55A93}.Release|x64.ActiveCfg = Release|x64 {DC4B5920-933D-4C82-B842-F34431D55A93}.Release|x64.Build.0 = Release|x64 - {DC4B5920-933D-4C82-B842-F34431D55A93}.Tracer|Win32.ActiveCfg = Tracer|Win32 - {DC4B5920-933D-4C82-B842-F34431D55A93}.Tracer|Win32.Build.0 = Tracer|Win32 + {DC4B5920-933D-4C82-B842-F34431D55A93}.Tracer|ARM64EC.ActiveCfg = Tracer|ARM64EC + {DC4B5920-933D-4C82-B842-F34431D55A93}.Tracer|ARM64EC.Build.0 = Tracer|ARM64EC {DC4B5920-933D-4C82-B842-F34431D55A93}.Tracer|x64.ActiveCfg = Tracer|x64 {DC4B5920-933D-4C82-B842-F34431D55A93}.Tracer|x64.Build.0 = Tracer|x64 - {6D05871E-274A-48CA-A39A-AB1C9D7DC78C}.Debug|Win32.ActiveCfg = Debug|Win32 - {6D05871E-274A-48CA-A39A-AB1C9D7DC78C}.Debug|Win32.Build.0 = Debug|Win32 + {6D05871E-274A-48CA-A39A-AB1C9D7DC78C}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC + {6D05871E-274A-48CA-A39A-AB1C9D7DC78C}.Debug|ARM64EC.Build.0 = Debug|ARM64EC {6D05871E-274A-48CA-A39A-AB1C9D7DC78C}.Debug|x64.ActiveCfg = Debug|x64 {6D05871E-274A-48CA-A39A-AB1C9D7DC78C}.Debug|x64.Build.0 = Debug|x64 - {6D05871E-274A-48CA-A39A-AB1C9D7DC78C}.Release|Win32.ActiveCfg = Release|Win32 - {6D05871E-274A-48CA-A39A-AB1C9D7DC78C}.Release|Win32.Build.0 = Release|Win32 + {6D05871E-274A-48CA-A39A-AB1C9D7DC78C}.Release|ARM64EC.ActiveCfg = Release|ARM64EC + {6D05871E-274A-48CA-A39A-AB1C9D7DC78C}.Release|ARM64EC.Build.0 = Release|ARM64EC {6D05871E-274A-48CA-A39A-AB1C9D7DC78C}.Release|x64.ActiveCfg = Release|x64 {6D05871E-274A-48CA-A39A-AB1C9D7DC78C}.Release|x64.Build.0 = Release|x64 - {6D05871E-274A-48CA-A39A-AB1C9D7DC78C}.Tracer|Win32.ActiveCfg = Tracer|Win32 - {6D05871E-274A-48CA-A39A-AB1C9D7DC78C}.Tracer|Win32.Build.0 = Tracer|Win32 + {6D05871E-274A-48CA-A39A-AB1C9D7DC78C}.Tracer|ARM64EC.ActiveCfg = Tracer|ARM64EC + {6D05871E-274A-48CA-A39A-AB1C9D7DC78C}.Tracer|ARM64EC.Build.0 = Tracer|ARM64EC {6D05871E-274A-48CA-A39A-AB1C9D7DC78C}.Tracer|x64.ActiveCfg = Tracer|x64 {6D05871E-274A-48CA-A39A-AB1C9D7DC78C}.Tracer|x64.Build.0 = Tracer|x64 EndGlobalSection diff --git a/TemplateProject/config/TemplateProject-win.props b/TemplateProject/config/TemplateProject-win.props index 5c9ae918..b186f6eb 100644 --- a/TemplateProject/config/TemplateProject-win.props +++ b/TemplateProject/config/TemplateProject-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)" "$(CLAP_PATH)" "$(BUILD_DIR)" "$(VST_ICON)" "$(AAX_ICON)" "$(CREATE_BUNDLE_SCRIPT)" + CALL "$(SolutionDir)scripts\postbuild-win.bat" "$(TargetExt)" "$(BINARY_NAME)" "$(Platform)" "$(COPY_VST2)" "$(TargetPath)" "$(VST2_ARM64EC_PATH)" "$(VST2_X64_PATH)" "$(VST3_ARM64EC_PATH)" "$(VST3_X64_PATH)" "$(AAX_ARM64EC_PATH)" "$(AAX_X64_PATH)" "$(CLAP_ARM64EC_PATH)" "$(CLAP_X64_PATH)" "$(BUILD_DIR)" "$(VST_ICON)" "$(AAX_ICON)" "$(CREATE_BUNDLE_SCRIPT)" "$(ICUDAT_PATH)" CALL "$(SolutionDir)scripts\prebuild-win.bat" "$(TargetExt)" "$(BINARY_NAME)" "$(Platform)" "$(TargetPath)" "$(OutDir)" diff --git a/TemplateProject/projects/TemplateProject-aax.vcxproj b/TemplateProject/projects/TemplateProject-aax.vcxproj index cebca6af..354c556b 100644 --- a/TemplateProject/projects/TemplateProject-aax.vcxproj +++ b/TemplateProject/projects/TemplateProject-aax.vcxproj @@ -2,25 +2,25 @@ - + Debug - Win32 + ARM64EC Debug x64 - + Release - Win32 + ARM64EC Release x64 - + Tracer - Win32 + ARM64EC Tracer @@ -34,15 +34,15 @@ 10.0 - + DynamicLibrary v143 - + DynamicLibrary v143 - + DynamicLibrary v143 @@ -61,15 +61,15 @@ - + - + - + @@ -88,15 +88,15 @@ <_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 $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\ $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\int\ false @@ -107,13 +107,13 @@ false false - + .aaxplugin - + .aaxplugin - + .aaxplugin @@ -125,7 +125,7 @@ .aaxplugin - + @@ -161,7 +161,7 @@ - + @@ -203,7 +203,7 @@ - + @@ -381,17 +381,17 @@ - true + true true - true + true true - true + true true - true - true - true + true + true + true true true true @@ -414,28 +414,28 @@ Document - true + true true true Document - true - true + true + true true true Document - true - true - true + true + true + true Document - true - true - true + true + true + true true true @@ -508,4 +508,4 @@ - \ No newline at end of file + diff --git a/TemplateProject/projects/TemplateProject-app.vcxproj b/TemplateProject/projects/TemplateProject-app.vcxproj index 8046c121..a893be6e 100644 --- a/TemplateProject/projects/TemplateProject-app.vcxproj +++ b/TemplateProject/projects/TemplateProject-app.vcxproj @@ -2,25 +2,25 @@ - + Debug - Win32 + ARM64EC Debug x64 - + Release - Win32 + ARM64EC Release x64 - + Tracer - Win32 + ARM64EC Tracer @@ -34,7 +34,7 @@ 10.0 - + Application true MultiByte @@ -46,7 +46,7 @@ MultiByte v143 - + Application false true @@ -60,7 +60,7 @@ MultiByte v143 - + Application false true @@ -77,7 +77,7 @@ - + @@ -85,7 +85,7 @@ - + @@ -93,7 +93,7 @@ - + @@ -102,13 +102,13 @@ - + $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\ $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\ - + $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\int\ @@ -117,31 +117,31 @@ $(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 @@ -175,7 +175,7 @@ - + Level3 MaxSpeed @@ -217,7 +217,7 @@ SA_API - + Level3 MaxSpeed @@ -331,17 +331,17 @@ - true + true true - true + true true - true + true true - true - true - true + true + true + true true true true @@ -382,4 +382,4 @@ - \ No newline at end of file + diff --git a/TemplateProject/projects/TemplateProject-app.vcxproj.user b/TemplateProject/projects/TemplateProject-app.vcxproj.user index 95730123..27c7edcc 100644 --- a/TemplateProject/projects/TemplateProject-app.vcxproj.user +++ b/TemplateProject/projects/TemplateProject-app.vcxproj.user @@ -3,4 +3,7 @@ WindowsLocalDebugger + + WindowsLocalDebugger + \ No newline at end of file diff --git a/TemplateProject/projects/TemplateProject-clap.vcxproj b/TemplateProject/projects/TemplateProject-clap.vcxproj index ab6772d4..cdc29b43 100644 --- a/TemplateProject/projects/TemplateProject-clap.vcxproj +++ b/TemplateProject/projects/TemplateProject-clap.vcxproj @@ -2,25 +2,25 @@ - + Debug - Win32 + ARM64EC Debug x64 - + Release - Win32 + ARM64EC Release x64 - + Tracer - Win32 + ARM64EC Tracer @@ -34,7 +34,7 @@ 10.0 - + DynamicLibrary true MultiByte @@ -46,7 +46,7 @@ MultiByte v143 - + DynamicLibrary false true @@ -60,7 +60,7 @@ MultiByte v143 - + DynamicLibrary false true @@ -77,7 +77,7 @@ - + @@ -85,7 +85,7 @@ - + @@ -93,7 +93,7 @@ - + @@ -102,13 +102,13 @@ - + $(SolutionDir)build-win\clap\$(Platform)\$(Configuration)\ $(SolutionDir)build-win\clap\$(Platform)\$(Configuration)\ - + $(SolutionDir)build-win\clap\$(Platform)\$(Configuration)\int\ @@ -121,13 +121,13 @@ $(BINARY_NAME) .clap - + $(SolutionDir)build-win\clap\$(Platform)\$(Configuration)\ $(SolutionDir)build-win\clap\$(Platform)\$(Configuration)\ - + $(SolutionDir)build-win\clap\$(Platform)\$(Configuration)\int\ $(BINARY_NAME) .clap @@ -137,13 +137,13 @@ $(BINARY_NAME) .clap - + $(SolutionDir)build-win\clap\$(Platform)\$(Configuration)\ $(SolutionDir)build-win\clap\$(Platform)\$(Configuration)\ - + $(SolutionDir)build-win\clap\$(Platform)\$(Configuration)\int\ $(BINARY_NAME) .clap @@ -153,7 +153,7 @@ $(BINARY_NAME) .clap - + Level3 Disabled @@ -182,7 +182,7 @@ $(SolutionDir)\Resources\img;%(AdditionalIncludeDirectories) - + Level3 MaxSpeed @@ -218,7 +218,7 @@ - + Level3 MaxSpeed @@ -305,17 +305,17 @@ - true - true - true + true + true + true true true true - true - true - true + true + true + true true true true @@ -348,4 +348,4 @@ - \ No newline at end of file + diff --git a/TemplateProject/projects/TemplateProject-vst2.vcxproj b/TemplateProject/projects/TemplateProject-vst2.vcxproj index b5ccac70..60d845aa 100644 --- a/TemplateProject/projects/TemplateProject-vst2.vcxproj +++ b/TemplateProject/projects/TemplateProject-vst2.vcxproj @@ -2,25 +2,25 @@ - + Debug - Win32 + ARM64EC Debug x64 - + Release - Win32 + ARM64EC Release x64 - + Tracer - Win32 + ARM64EC Tracer @@ -34,7 +34,7 @@ 10.0 - + DynamicLibrary true MultiByte @@ -46,7 +46,7 @@ MultiByte v143 - + DynamicLibrary false true @@ -60,7 +60,7 @@ MultiByte v143 - + DynamicLibrary false true @@ -77,7 +77,7 @@ - + @@ -85,7 +85,7 @@ - + @@ -93,7 +93,7 @@ - + @@ -102,13 +102,13 @@ - + $(SolutionDir)build-win\vst2\$(Platform)\$(Configuration)\ $(SolutionDir)build-win\vst2\$(Platform)\$(Configuration)\ - + $(SolutionDir)build-win\vst2\$(Platform)\$(Configuration)\int\ @@ -119,13 +119,13 @@ $(BINARY_NAME) - + $(SolutionDir)build-win\vst2\$(Platform)\$(Configuration)\ $(SolutionDir)build-win\vst2\$(Platform)\$(Configuration)\ - + $(SolutionDir)build-win\vst2\$(Platform)\$(Configuration)\int\ $(BINARY_NAME) @@ -133,13 +133,13 @@ $(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) @@ -147,7 +147,7 @@ $(SolutionDir)build-win\vst2\$(Platform)\$(Configuration)\int\ $(BINARY_NAME) - + Level3 Disabled @@ -176,7 +176,7 @@ $(SolutionDir)\Resources\img;%(AdditionalIncludeDirectories) - + Level3 MaxSpeed @@ -212,7 +212,7 @@ - + Level3 MaxSpeed @@ -302,17 +302,17 @@ - true - true - true + true + true + true true true true - true - true - true + true + true + true true true true @@ -345,4 +345,4 @@ - \ No newline at end of file + diff --git a/TemplateProject/projects/TemplateProject-vst2.vcxproj.user b/TemplateProject/projects/TemplateProject-vst2.vcxproj.user index 2a85012f..2463040a 100644 --- a/TemplateProject/projects/TemplateProject-vst2.vcxproj.user +++ b/TemplateProject/projects/TemplateProject-vst2.vcxproj.user @@ -1,33 +1,63 @@  - $(VST2_32_HOST_PATH) - $(VST2_32_COMMAND_ARGS) + $(VST2_X64_HOST_PATH) + $(VST2_X64_COMMAND_ARGS) + WindowsLocalDebugger + + + $(VST2_ARM64EC_HOST_PATH) + $(VST2_ARM64EC_COMMAND_ARGS) WindowsLocalDebugger - $(VST2_32_HOST_PATH) + $(VST2_X64_HOST_PATH) + WindowsLocalDebugger + $(VST2_X64_COMMAND_ARGS) + + + $(VST2_ARM64EC_HOST_PATH) WindowsLocalDebugger - $(VST2_32_COMMAND_ARGS) + $(VST2_ARM64EC_COMMAND_ARGS) - $(VST2_32_HOST_PATH) + $(VST2_X64_HOST_PATH) + WindowsLocalDebugger + $(VST2_X64_COMMAND_ARGS) + + + $(VST2_ARM64EC_HOST_PATH) WindowsLocalDebugger - $(VST2_32_COMMAND_ARGS) + $(VST2_ARM64EC_COMMAND_ARGS) - $(VST2_64_HOST_PATH) - $(VST2_64_COMMAND_ARGS) + $(VST2_X64_HOST_PATH) + $(VST2_X64_COMMAND_ARGS) + WindowsLocalDebugger + + + $(VST2_ARM64EC_HOST_PATH) + $(VST2_ARM64EC_COMMAND_ARGS) WindowsLocalDebugger - $(VST2_64_HOST_PATH) + $(VST2_X64_HOST_PATH) + WindowsLocalDebugger + $(VST2_X64_COMMAND_ARGS) + + + $(VST2_ARM64EC_HOST_PATH) WindowsLocalDebugger - $(VST2_64_COMMAND_ARGS) + $(VST2_X64_COMMAND_ARGS) - $(VST2_64_HOST_PATH) + $(VST2_X64_HOST_PATH) + WindowsLocalDebugger + $(VST2_X64_COMMAND_ARGS) + + + $(VST2_ARM64EC_HOST_PATH) WindowsLocalDebugger - $(VST2_64_COMMAND_ARGS) + $(VST2_X64_COMMAND_ARGS) \ No newline at end of file diff --git a/TemplateProject/projects/TemplateProject-vst3.vcxproj b/TemplateProject/projects/TemplateProject-vst3.vcxproj index 5be0ffef..e2cfd8e1 100644 --- a/TemplateProject/projects/TemplateProject-vst3.vcxproj +++ b/TemplateProject/projects/TemplateProject-vst3.vcxproj @@ -2,25 +2,25 @@ - + Debug - Win32 + ARM64EC Debug x64 - + Release - Win32 + ARM64EC Release x64 - + Tracer - Win32 + ARM64EC Tracer @@ -34,7 +34,7 @@ 10.0 - + DynamicLibrary true MultiByte @@ -46,7 +46,7 @@ MultiByte v143 - + DynamicLibrary false true @@ -60,7 +60,7 @@ MultiByte v143 - + DynamicLibrary false true @@ -77,7 +77,7 @@ - + @@ -85,7 +85,7 @@ - + @@ -93,7 +93,7 @@ - + @@ -102,13 +102,13 @@ - + $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\ $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\ - + $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\int\ @@ -119,13 +119,13 @@ .vst3 - + $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\ $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\ - + $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\int\ .vst3 @@ -133,13 +133,13 @@ $(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 @@ -147,7 +147,7 @@ $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\int\ .vst3 - + Level3 Disabled @@ -176,7 +176,7 @@ - + Level3 MaxSpeed @@ -215,7 +215,7 @@ - + Level3 MaxSpeed @@ -361,17 +361,17 @@ - true - true - true + true + true + true true true true - true - true - true + true + true + true true true true @@ -407,4 +407,4 @@ - \ No newline at end of file + diff --git a/TemplateProject/projects/TemplateProject-vst3.vcxproj.user b/TemplateProject/projects/TemplateProject-vst3.vcxproj.user index da8be2a5..6a15358b 100644 --- a/TemplateProject/projects/TemplateProject-vst3.vcxproj.user +++ b/TemplateProject/projects/TemplateProject-vst3.vcxproj.user @@ -1,33 +1,63 @@  - $(VST3_32_HOST_PATH) - $(VST3_32_COMMAND_ARGS) + $(VST3_X64_HOST_PATH) + $(VST3_X64_COMMAND_ARGS) + WindowsLocalDebugger + + + $(VST3_ARM64EC_HOST_PATH) + $(VST3_ARM64EC_COMMAND_ARGS) WindowsLocalDebugger - $(VST3_32_HOST_PATH) + $(VST3_X64_HOST_PATH) + WindowsLocalDebugger + $(VST3_X64_COMMAND_ARGS) + + + $(VST3_ARM64EC_HOST_PATH) WindowsLocalDebugger - $(VST3_32_COMMAND_ARGS) + $(VST3_ARM64EC_COMMAND_ARGS) - $(VST3_32_HOST_PATH) + $(VST3_X64_HOST_PATH) + WindowsLocalDebugger + $(VST3_X64_COMMAND_ARGS) + + + $(VST3_ARM64EC_HOST_PATH) WindowsLocalDebugger - $(VST3_32_COMMAND_ARGS) + $(VST3_ARM64EC_COMMAND_ARGS) - $(VST3_64_HOST_PATH) - $(VST3_64_COMMAND_ARGS) + $(VST3_X64_HOST_PATH) + $(VST3_X64_COMMAND_ARGS) + WindowsLocalDebugger + + + $(VST3_ARM64EC_HOST_PATH) + $(VST3_ARM64EC_COMMAND_ARGS) WindowsLocalDebugger - $(VST3_64_HOST_PATH) + $(VST3_X64_HOST_PATH) + WindowsLocalDebugger + $(VST3_X64_COMMAND_ARGS) + + + $(VST3_ARM64EC_HOST_PATH) WindowsLocalDebugger - $(VST3_64_COMMAND_ARGS) + $(VST3_X64_COMMAND_ARGS) - $(VST3_64_HOST_PATH) + $(VST3_X64_HOST_PATH) + WindowsLocalDebugger + $(VST3_X64_COMMAND_ARGS) + + + $(VST3_ARM64EC_HOST_PATH) WindowsLocalDebugger - $(VST3_64_COMMAND_ARGS) + $(VST3_X64_COMMAND_ARGS) \ No newline at end of file diff --git a/TemplateProject/scripts/makedist-win.bat b/TemplateProject/scripts/makedist-win.bat index 981cfa32..15d5c18c 100644 --- a/TemplateProject/scripts/makedist-win.bat +++ b/TemplateProject/scripts/makedist-win.bat @@ -48,22 +48,12 @@ copy /b *.cpp+,, echo ------------------------------------------------------------------ echo Building ... -if exist "%ProgramFiles(x86)%" (goto 64-Bit) else (goto 32-Bit) - -if not defined DevEnvDir ( -:32-Bit -echo 32-Bit O/S detected -call "%ProgramFiles%\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x86_x64 -goto END - -:64-Bit -echo 64-Bit Host O/S detected -call "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x86_x64 -goto END -:END +if exist "%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat" ( + call "%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat" x64 +) else ( + call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" x64 ) - REM - set preprocessor macros like this, for instance to set demo preprocessor macro: if %DEMO% == 1 ( set CMDLINE_DEFINES="DEMO_VERSION=1" @@ -74,14 +64,14 @@ if %DEMO% == 1 ( ) REM - Could build individual targets like this: -REM - msbuild TemplateProject-app.vcxproj /p:configuration=release /p:platform=win32 +REM - msbuild TemplateProject-app.vcxproj /p:configuration=release /p:platform=x64 -REM echo Building 32 bit binaries... -REM msbuild TemplateProject.sln /p:configuration=release /p:platform=win32 /nologo /verbosity:minimal /fileLogger /m /flp:logfile=build-win.log;errorsonly - -REM echo Building 64 bit binaries... +echo Building x64 binaries... REM add projects with /t to build VST2 and AAX -msbuild TemplateProject.sln /t:TemplateProject-app;TemplateProject-vst3;TemplateProject-clap /p:configuration=release /p:platform=x64 /nologo /verbosity:minimal /fileLogger /m /flp:logfile=build-win.log;errorsonly;append +msbuild TemplateProject.sln /t:TemplateProject-app;TemplateProject-vst3;TemplateProject-clap /p:configuration=release /p:platform=x64 /nologo /verbosity:minimal /fileLogger /m /flp:logfile=build-win.log;errorsonly + +echo Building ARM64EC binaries... +msbuild TemplateProject.sln /t:TemplateProject-app;TemplateProject-vst3;TemplateProject-clap /p:configuration=release /p:platform=ARM64EC /nologo /verbosity:minimal /fileLogger /m /flp:logfile=build-win-arm64ec.log;errorsonly REM --echo Copying AAX Presets diff --git a/TemplateProject/scripts/makezip-win.py b/TemplateProject/scripts/makezip-win.py index 289b7fce..db00ce04 100644 --- a/TemplateProject/scripts/makezip-win.py +++ b/TemplateProject/scripts/makezip-win.py @@ -9,6 +9,15 @@ from get_archive_name import get_archive_name +def add_folder_to_zip(zf, folder_path, archive_base): + """Add a folder and its contents to a zip file, preserving structure.""" + for root, dirs, files in os.walk(folder_path): + for file in files: + file_path = os.path.join(root, file) + arcname = os.path.join(archive_base, os.path.relpath(file_path, folder_path)) + print("adding " + file_path + " as " + arcname) + zf.write(file_path, arcname, zipfile.ZIP_DEFLATED) + def main(): if len(sys.argv) != 3: print("Usage: make_zip.py demo[0/1] zip[0/1]") @@ -18,55 +27,68 @@ def main(): zip=int(sys.argv[2]) dir = projectpath + "\\build-win\\out" - + if os.path.exists(dir): shutil.rmtree(dir) - + os.makedirs(dir) - - files = [] + + zipname = get_archive_name(projectpath, "win", "demo" if demo == 1 else "full" ) + zf = zipfile.ZipFile(projectpath + "\\build-win\\out\\" + zipname + ".zip", mode="w") if not zip: installer = "\\build-win\\installer\\TemplateProject Installer.exe" - + if demo: installer = "\\build-win\\installer\\TemplateProject Demo Installer.exe" - + files = [ projectpath + installer, projectpath + "\\installer\\changelog.txt", projectpath + "\\installer\\known-issues.txt", - projectpath + "\\manual\\TemplateProject manual.pdf" + projectpath + "\\manual\\TemplateProject manual.pdf" ] + + for f in files: + print("adding " + f) + zf.write(f, os.path.basename(f), zipfile.ZIP_DEFLATED) else: + # Add VST3 bundle with folder structure preserved + vst3_bundle = projectpath + "\\build-win\\TemplateProject.vst3" + if os.path.exists(vst3_bundle): + add_folder_to_zip(zf, vst3_bundle, "TemplateProject.vst3") + + # Add standalone executables files = [ - projectpath + "\\build-win\\TemplateProject.vst3\\Contents\\x86_64-win\\TemplateProject.vst3", projectpath + "\\build-win\\TemplateProject_x64.exe", + projectpath + "\\build-win\\TemplateProject_ARM64EC.exe", projectpath + "\\build-win\\TemplateProject.clap" ] - zipname = get_archive_name(projectpath, "win", "demo" if demo == 1 else "full" ) - - zf = zipfile.ZipFile(projectpath + "\\build-win\\out\\" + zipname + ".zip", mode="w") - - for f in files: - print("adding " + f) - zf.write(f, os.path.basename(f), zipfile.ZIP_DEFLATED) + for f in files: + if os.path.exists(f): + print("adding " + f) + zf.write(f, os.path.basename(f), zipfile.ZIP_DEFLATED) zf.close() print("wrote " + zipname) + # Create PDB archive zf = zipfile.ZipFile(projectpath + "\\build-win\\out\\" + zipname + "-pdbs.zip", mode="w") files = [ projectpath + "\\build-win\\pdbs\\TemplateProject-vst3_x64.pdb", + projectpath + "\\build-win\\pdbs\\TemplateProject-vst3_ARM64EC.pdb", projectpath + "\\build-win\\pdbs\\TemplateProject-app_x64.pdb", - projectpath + "\\build-win\\pdbs\\TemplateProject-clap_x64.pdb" + projectpath + "\\build-win\\pdbs\\TemplateProject-app_ARM64EC.pdb", + projectpath + "\\build-win\\pdbs\\TemplateProject-clap_x64.pdb", + projectpath + "\\build-win\\pdbs\\TemplateProject-clap_ARM64EC.pdb" ] for f in files: - print("adding " + f) - zf.write(f, os.path.basename(f), zipfile.ZIP_DEFLATED) + if os.path.exists(f): + print("adding " + f) + zf.write(f, os.path.basename(f), zipfile.ZIP_DEFLATED) zf.close() print("wrote " + zipname) diff --git a/TemplateProject/scripts/postbuild-win.bat b/TemplateProject/scripts/postbuild-win.bat index f7e1df48..a1e8b27b 100644 --- a/TemplateProject/scripts/postbuild-win.bat +++ b/TemplateProject/scripts/postbuild-win.bat @@ -1,137 +1,205 @@ @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)" "$(CLAP_PATH)" "$(BUILD_DIR)" "$(VST_ICON)" "$(AAX_ICON)" " -REM $(CREATE_BUNDLE_SCRIPT)" +REM - CALL "$(SolutionDir)scripts\postbuild-win.bat" "$(TargetExt)" "$(BINARY_NAME)" "$(Platform)" "$(COPY_VST2)" "$(TargetPath)" "$(VST2_ARM64EC_PATH)" "$(VST2_X64_PATH)" "$(VST3_ARM64EC_PATH)" "$(VST3_X64_PATH)" "$(AAX_ARM64EC_PATH)" "$(AAX_X64_PATH)" "$(CLAP_ARM64EC_PATH)" "$(CLAP_X64_PATH)" "$(BUILD_DIR)" "$(VST_ICON)" "$(AAX_ICON)" "$(CREATE_BUNDLE_SCRIPT)" "$(ICUDAT_PATH)" 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 VST2_ARM64EC_PATH=%6 +set VST2_X64_PATH=%7 +set VST3_ARM64EC_PATH=%8 +set VST3_X64_PATH=%9 shift -shift shift shift -shift shift shift -set AAX_32_PATH=%3 -set AAX_64_PATH=%4 -set CLAP_PATH=%5 -set BUILD_DIR=%6 -set VST_ICON=%7 -set AAX_ICON=%8 +shift +shift +set AAX_ARM64EC_PATH=%3 +set AAX_X64_PATH=%4 +set CLAP_ARM64EC_PATH=%5 +set CLAP_X64_PATH=%6 +set BUILD_DIR=%7 +set VST_ICON=%8 +set AAX_ICON=%9 +shift set CREATE_BUNDLE_SCRIPT=%9 +shift +set ICUDAT_PATH=%9 echo POSTBUILD SCRIPT VARIABLES ----------------------------------------------------- -echo FORMAT %FORMAT% -echo NAME %NAME% -echo PLATFORM %PLATFORM% -echo COPY_VST2 %COPY_VST2% -echo BUILT_BINARY %BUILT_BINARY% -echo VST2_32_PATH %VST2_32_PATH% -echo VST2_64_PATH %VST2_64_PATH% -echo VST3_32_PATH %VST3_32_PATH% -echo VST3_64_PATH %VST3_64_PATH% -echo CLAP_PATH %CLAP_PATH% +echo FORMAT %FORMAT% +echo NAME %NAME% +echo PLATFORM %PLATFORM% +echo COPY_VST2 %COPY_VST2% +echo BUILT_BINARY %BUILT_BINARY% +echo VST2_ARM64EC_PATH %VST2_ARM64EC_PATH% +echo VST2_X64_PATH %VST2_X64_PATH% +echo VST3_ARM64EC_PATH %VST3_ARM64EC_PATH% +echo VST3_X64_PATH %VST3_X64_PATH% +echo CLAP_ARM64EC_PATH %CLAP_ARM64EC_PATH% +echo CLAP_X64_PATH %CLAP_X64_PATH% echo BUILD_DIR %BUILD_DIR% -echo VST_ICON %VST_ICON% -echo AAX_ICON %AAX_ICON% +echo VST_ICON %VST_ICON% +echo AAX_ICON %AAX_ICON% echo CREATE_BUNDLE_SCRIPT %CREATE_BUNDLE_SCRIPT% +echo ICUDAT_PATH %ICUDAT_PATH% echo END POSTBUILD SCRIPT VARIABLES ----------------------------------------------------- -if %PLATFORM% == "Win32" ( +if %PLATFORM% == "ARM64EC" ( + if exist "%ICUDAT_PATH%" ( + echo copying icudtl.dat file next to built binary: %BUILT_BINARY% + for %%F in (%BUILT_BINARY%) do ( + copy /y %ICUDAT_PATH% "%%~dpF" + ) + ) else ( + echo icudtl.dat not found at %ICUDAT_PATH%, skipping... + ) + if %FORMAT% == ".exe" ( + echo copying exe to build dir: %BUILD_DIR%\%NAME%_%PLATFORM%.exe copy /y %BUILT_BINARY% %BUILD_DIR%\%NAME%_%PLATFORM%.exe + if exist "%ICUDAT_PATH%" ( + echo copying dat file to build dir: %BUILD_DIR% + copy /y %ICUDAT_PATH% %BUILD_DIR% + ) ) if %FORMAT% == ".dll" ( copy /y %BUILT_BINARY% %BUILD_DIR%\%NAME%_%PLATFORM%.dll + if exist "%ICUDAT_PATH%" ( + copy /y %ICUDAT_PATH% %BUILD_DIR% + ) ) - + if %FORMAT% == ".dll" ( if %COPY_VST2% == "1" ( - echo copying 32bit binary to 32bit VST2 Plugins folder ... - copy /y %BUILT_BINARY% %VST2_32_PATH% + echo copying ARM64EC binary to ARM64EC VST2 Plugins folder ... + copy /y %BUILT_BINARY% %VST2_ARM64EC_PATH% + if exist "%ICUDAT_PATH%" ( + copy /y %ICUDAT_PATH% %VST2_ARM64EC_PATH% + ) ) else ( - echo not copying 32bit VST2 binary + echo not copying ARM64EC VST2 binary ) ) - + if %FORMAT% == ".vst3" ( - echo copying 32bit binary to VST3 BUNDLE .. + echo copying ARM64EC binary to VST3 BUNDLE .. call %CREATE_BUNDLE_SCRIPT% %BUILD_DIR%\%NAME%.vst3 %VST_ICON% %FORMAT% - copy /y %BUILT_BINARY% %BUILD_DIR%\%NAME%.vst3\Contents\x86-win - if exist %VST3_32_PATH% ( - echo copying VST3 bundle to 32bit VST3 Plugins folder ... - call %CREATE_BUNDLE_SCRIPT% %VST3_32_PATH%\%NAME%.vst3 %VST_ICON% %FORMAT% - xcopy /E /H /Y %BUILD_DIR%\%NAME%.vst3\Contents\* %VST3_32_PATH%\%NAME%.vst3\Contents\ + copy /y %BUILT_BINARY% %BUILD_DIR%\%NAME%.vst3\Contents\arm64ec-win + if exist "%ICUDAT_PATH%" ( + copy /y %ICUDAT_PATH% %BUILD_DIR%\%NAME%.vst3\Contents\arm64ec-win + ) + if exist %VST3_ARM64EC_PATH% ( + echo copying VST3 bundle to ARM64EC VST3 Plugins folder ... + call %CREATE_BUNDLE_SCRIPT% %VST3_ARM64EC_PATH%\%NAME%.vst3 %VST_ICON% %FORMAT% + xcopy /E /H /Y %BUILD_DIR%\%NAME%.vst3\Contents\* %VST3_ARM64EC_PATH%\%NAME%.vst3\Contents\ ) ) - + if %FORMAT% == ".aaxplugin" ( - echo copying 32bit binary to AAX BUNDLE .. + echo copying ARM64EC binary to AAX BUNDLE .. call %CREATE_BUNDLE_SCRIPT% %BUILD_DIR%\%NAME%.aaxplugin %AAX_ICON% %FORMAT% - copy /y %BUILT_BINARY% %BUILD_DIR%\%NAME%.aaxplugin\Contents\Win32 - echo copying 32bit bundle to 32bit AAX Plugins folder ... + copy /y %BUILT_BINARY% %BUILD_DIR%\%NAME%.aaxplugin\Contents\Arm64ec + if exist "%ICUDAT_PATH%" ( + copy /y %ICUDAT_PATH% %BUILD_DIR%\%NAME%.aaxplugin\Contents\Arm64ec + ) + echo copying ARM64EC bundle to ARM64EC AAX Plugins folder ... call %CREATE_BUNDLE_SCRIPT% %BUILD_DIR%\%NAME%.aaxplugin %AAX_ICON% %FORMAT% - xcopy /E /H /Y %BUILD_DIR%\%NAME%.aaxplugin\Contents\* %AAX_32_PATH%\%NAME%.aaxplugin\Contents\ + xcopy /E /H /Y %BUILD_DIR%\%NAME%.aaxplugin\Contents\* %AAX_ARM64EC_PATH%\%NAME%.aaxplugin\Contents\ + ) + + if %FORMAT% == ".clap" ( + echo copying ARM64EC binary to CLAP Plugins folder ... + if exist %CLAP_ARM64EC_PATH% ( + copy /y %BUILT_BINARY% %CLAP_ARM64EC_PATH% + if exist "%ICUDAT_PATH%" ( + copy /y %ICUDAT_PATH% %CLAP_ARM64EC_PATH% + ) + ) ) ) if %PLATFORM% == "x64" ( + + if exist "%ICUDAT_PATH%" ( + echo copying icudtl.dat file next to built binary: %BUILT_BINARY% + for %%F in (%BUILT_BINARY%) do ( + copy /y %ICUDAT_PATH% "%%~dpF" + ) + ) else ( + echo icudtl.dat not found at %ICUDAT_PATH%, skipping... + ) + if not exist "%ProgramFiles(x86)%" ( echo "This batch script fails on 32 bit windows... edit accordingly" ) if %FORMAT% == ".exe" ( + echo copying exe to build dir: %BUILD_DIR%\%NAME%_%PLATFORM%.exe copy /y %BUILT_BINARY% %BUILD_DIR%\%NAME%_%PLATFORM%.exe + if exist "%ICUDAT_PATH%" ( + echo copying dat file to build dir: %BUILD_DIR% + copy /y %ICUDAT_PATH% %BUILD_DIR% + ) ) if %FORMAT% == ".dll" ( copy /y %BUILT_BINARY% %BUILD_DIR%\%NAME%_%PLATFORM%.dll + if exist "%ICUDAT_PATH%" ( + copy /y %ICUDAT_PATH% %BUILD_DIR% + ) ) - + if %FORMAT% == ".dll" ( if %COPY_VST2% == "1" ( - echo copying 64bit binary to 64bit VST2 Plugins folder ... - copy /y %BUILT_BINARY% %VST2_64_PATH% + echo copying 64bit binary to 64bit VST2 Plugins folder ... + copy /y %BUILT_BINARY% %VST2_X64_PATH% + if exist "%ICUDAT_PATH%" ( + copy /y %ICUDAT_PATH% %VST2_X64_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% copy /y %BUILT_BINARY% %BUILD_DIR%\%NAME%.vst3\Contents\x86_64-win - if exist %VST3_64_PATH% ( + if exist "%ICUDAT_PATH%" ( + copy /y %ICUDAT_PATH% %BUILD_DIR%\%NAME%.vst3\Contents\x86_64-win + ) + if exist %VST3_X64_PATH% ( echo copying VST3 bundle to 64bit VST3 Plugins folder ... - call %CREATE_BUNDLE_SCRIPT% %VST3_64_PATH%\%NAME%.vst3 %VST_ICON% %FORMAT% - xcopy /E /H /Y %BUILD_DIR%\%NAME%.vst3\Contents\* %VST3_64_PATH%\%NAME%.vst3\Contents\ + call %CREATE_BUNDLE_SCRIPT% %VST3_X64_PATH%\%NAME%.vst3 %VST_ICON% %FORMAT% + xcopy /E /H /Y %BUILD_DIR%\%NAME%.vst3\Contents\* %VST3_X64_PATH%\%NAME%.vst3\Contents\ ) ) - + if %FORMAT% == ".aaxplugin" ( echo copying 64bit binary to AAX BUNDLE ... call %CREATE_BUNDLE_SCRIPT% %BUILD_DIR%\%NAME%.aaxplugin %AAX_ICON% %FORMAT% copy /y %BUILT_BINARY% %BUILD_DIR%\%NAME%.aaxplugin\Contents\x64 - echo copying 64bit bundle to 64bit AAX Plugins folder ... + if exist "%ICUDAT_PATH%" ( + copy /y %ICUDAT_PATH% %BUILD_DIR%\%NAME%.aaxplugin\Contents\x64 + ) + echo copying 64bit bundle to 64bit AAX Plugins folder ... 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\ - ) - - if %FORMAT% == ".clap" ( - echo copying binary to output directory ... - copy /y %BUILT_BINARY% %BUILD_DIR%\%NAME%.clap + xcopy /E /H /Y %BUILD_DIR%\%NAME%.aaxplugin\Contents\* %AAX_X64_PATH%\%NAME%.aaxplugin\Contents\ ) if %FORMAT% == ".clap" ( - echo copying binary to CLAP Plugins folder ... - copy /y %BUILT_BINARY% %CLAP_PATH% + echo copying x64 binary to CLAP Plugins folder ... + if exist %CLAP_X64_PATH% ( + copy /y %BUILT_BINARY% %CLAP_X64_PATH% + if exist "%ICUDAT_PATH%" ( + copy /y %ICUDAT_PATH% %CLAP_X64_PATH% + ) + ) ) -) \ No newline at end of file +) diff --git a/common-win.props b/common-win.props index 66697017..0b21ab4c 100644 --- a/common-win.props +++ b/common-win.props @@ -33,18 +33,20 @@ $(IPLUG_DEPS_PATH)\VST3_SDK $(IPLUG_DEPS_PATH)\RTAudio\include $(IPLUG_DEPS_PATH)\AAX_SDK - $(ProgramW6432)\REAPER (x64)\reaper.exe - $(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 - $(CommonProgramW6432)\CLAP + $(ProgramW6432)\REAPER (arm64)\reaper.exe + $(ProgramW6432)\REAPER (x64)\reaper.exe + $(ProgramW6432)\REAPER (arm64)\reaper.exe + $(ProgramW6432)\REAPER (x64)\reaper.exe + $(ProgramW6432)\REAPER (arm64)\reaper.exe + $(ProgramW6432)\REAPER (x64)\reaper.exe + $(LOCALAPPDATA)\Programs\Common\VST3 + $(LOCALAPPDATA)\Programs\Common\VST3 + $(ProgramFiles)\VstPlugins + $(ProgramW6432)\VstPlugins + $(CommonProgramFiles)\Avid\Audio\Plug-Ins + $(CommonProgramW6432)\Avid\Audio\Plug-Ins + $(LOCALAPPDATA)\Programs\Common\CLAP + $(LOCALAPPDATA)\Programs\Common\CLAP $(APPDATA)\REAPER\UserPlugins APP_API;__WINDOWS_DS__;__WINDOWS_MM__;__WINDOWS_ASIO__;IPLUG_EDITOR=1;IPLUG_DSP=1 CLAP_API;IPLUG_EDITOR=1;IPLUG_DSP=1 @@ -64,13 +66,14 @@ 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 - $(SolutionDir)$(SolutionName).RPP + $(SolutionDir)$(SolutionName).RPP + $(SolutionDir)$(SolutionName).RPP + $(SolutionDir)$(SolutionName).RPP + $(SolutionDir)$(SolutionName).RPP + $(SolutionDir)$(SolutionName).RPP + $(SolutionDir)$(SolutionName).RPP 1 - $(IPLUG_DEPS_PATH)/Reaper;$(IPLUG_PATH)\ReaperExt; + $(IPLUG_DEPS_PATH)\REAPER_SDK;$(IPLUG_PATH)\ReaperExt; $(AAX_SDK)\Utilities\PlugIn.ico $(IPLUG2_ROOT)\Scripts\icons\VST_Logo_Steinberg.ico @@ -81,14 +84,11 @@ MultiThreaded $(ALL_DEFS);%(PreprocessorDefinitions) - 4996;4250;4018;4267;4068; + 4996;4250;4018;4267;4068;26451;26812 $(WDL_PATH);$(IPLUG_PATH);$(SolutionDir);%(AdditionalIncludeDirectories) stdcpp17 true - - StreamingSIMDExtensions2 - %(AdditionalDependencies) $(STATIC_LIBS_PATH);$(AAX_SDK)\Libs\$(Configuration);%(AdditionalLibraryDirectories) @@ -192,38 +192,41 @@ $(AAX_SDK) - - $(CLAP_64_HOST_PATH) + + $(CLAP_ARM64EC_HOST_PATH) - - $(VST2_32_HOST_PATH) + + $(CLAP_X64_HOST_PATH) - - $(VST2_64_HOST_PATH) + + $(VST2_ARM64EC_HOST_PATH) - - $(VST3_32_HOST_PATH) + + $(VST2_X64_HOST_PATH) - - $(VST3_64_HOST_PATH) + + $(VST3_ARM64EC_HOST_PATH) - - $(VST3_32_PATH) + + $(VST3_X64_HOST_PATH) - - $(VST3_64_PATH) + + $(VST3_ARM64EC_PATH) - - $(VST2_32_PATH) + + $(VST3_X64_PATH) - - $(VST2_64_PATH) + + $(VST2_ARM64EC_PATH) - - $(AAX_32_PATH) + + $(VST2_X64_PATH) - - $(AAX_64_PATH) + + $(AAX_ARM64EC_PATH) + + + $(AAX_X64_PATH) $(REAPER_EXT_PATH) @@ -282,20 +285,23 @@ $(APP_LIBS) - - $(CLAP_64_COMMAND_ARGS) + + $(CLAP_ARM64EC_COMMAND_ARGS) + + + $(CLAP_X64_COMMAND_ARGS) - - $(VST2_32_COMMAND_ARGS) + + $(VST2_ARM64EC_COMMAND_ARGS) - - $(VST2_64_COMMAND_ARGS) + + $(VST2_X64_COMMAND_ARGS) - - $(VST3_64_COMMAND_ARGS) + + $(VST3_X64_COMMAND_ARGS) - - $(VST3_32_COMMAND_ARGS) + + $(VST3_ARM64EC_COMMAND_ARGS) $(COPY_VST2) @@ -309,8 +315,11 @@ $(VST_ICON) - - $(CLAP_PATH) + + $(CLAP_ARM64EC_PATH) + + + $(CLAP_X64_PATH) diff --git a/iPlug2 b/iPlug2 index 84ceab31..8ee96b36 160000 --- a/iPlug2 +++ b/iPlug2 @@ -1 +1 @@ -Subproject commit 84ceab31d7cb583f861f5d47c0fe5ffbad3b6fe4 +Subproject commit 8ee96b360dbd792d780baabd48dead899835aa26