From 936ca5cec7e4203604f8b669c255c90495ad1e06 Mon Sep 17 00:00:00 2001 From: Holger Vogt Date: Tue, 5 May 2026 15:49:35 +0200 Subject: [PATCH] Update project files: integrate wave compilation including sdnfile.dll and samplerate.dll, make both project files more uniform. --- visualc/vngspice-fftw.vcxproj | 51 ++++++++++++++++++++++------------- visualc/vngspice.vcxproj | 19 ++++++++++--- 2 files changed, 48 insertions(+), 22 deletions(-) diff --git a/visualc/vngspice-fftw.vcxproj b/visualc/vngspice-fftw.vcxproj index 32095d9c1..0e8ee2e87 100644 --- a/visualc/vngspice-fftw.vcxproj +++ b/visualc/vngspice-fftw.vcxproj @@ -305,7 +305,7 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3 Disabled - ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;..\..\fftw-3.3-dll64;%(AdditionalIncludeDirectories) + ..\..\libsamplerate\include;..\..\libsndfile\include;..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;..\..\fftw-3.3-dll64;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;NGDEBUG;CONFIG64;HAVE_LIBFFTW3;%(PreprocessorDefinitions) false @@ -323,7 +323,7 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3 /openmp:llvm %(AdditionalOptions) - psapi.lib;KLU_COMPLEX.lib;$(IntDir)libfftw3-3.lib;%(AdditionalDependencies) + sndfile.lib;samplerate.lib;psapi.lib;KLU_COMPLEX.lib;$(IntDir)libfftw3-3.lib;%(AdditionalDependencies) true Windows 0 @@ -335,10 +335,12 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3 MachineX64 true - KLU\x64\Debug;%(AdditionalLibraryDirectories) + ../../libsamplerate/lib;../../libsndfile/lib;KLU\x64\Debug;%(AdditionalLibraryDirectories) + copy /y "..\..\libsndfile\bin\sndfile.dll" "$(OutDir)" + copy /y "..\..\libsamplerate\bin\samplerate.dll" "$(OutDir)" copy /y "..\..\fftw-3.3-dll64\libfftw3-3.dll" "$(OutDir)" make-install-vngspiced.bat $(OutDir) fftw 64 @@ -358,7 +360,7 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3 true Speed true - ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;..\..\fftw-3.3-dll64;%(AdditionalIncludeDirectories) + ..\..\libsamplerate\include;..\..\libsndfile\include;..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;..\..\fftw-3.3-dll64;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;CONFIG64;HAVE_LIBFFTW3;%(PreprocessorDefinitions) false @@ -376,7 +378,7 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3 /openmp:llvm %(AdditionalOptions) - psapi.lib;KLU_COMPLEX.lib;$(IntDir)libfftw3-3.lib;%(AdditionalDependencies) + sndfile.lib;samplerate.lib;psapi.lib;KLU_COMPLEX.lib;$(IntDir)libfftw3-3.lib;%(AdditionalDependencies) true Windows 0 @@ -393,10 +395,13 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3 MachineX64 true - KLU\x64\Release;%(AdditionalLibraryDirectories) + ../../libsamplerate/lib;../../libsndfile/lib;KLU\x64\Release;%(AdditionalLibraryDirectories) + + copy /y "..\..\libsndfile\bin\sndfile.dll" "$(OutDir)" + copy /y "..\..\libsamplerate\bin\samplerate.dll" "$(OutDir)" copy /y "..\..\fftw-3.3-dll64\libfftw3-3.dll" "$(OutDir)" make-install-vngspice.bat $(OutDir) fftw 64 @@ -511,7 +516,7 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3 Disabled - ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;..\..\fftw-3.3-dll64;%(AdditionalIncludeDirectories) + ..\..\libsamplerate\include;..\..\libsndfile\include;..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;..\..\fftw-3.3-dll64;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;NGDEBUG;CONSOLE;CONFIG64;HAVE_LIBFFTW3;%(PreprocessorDefinitions) false @@ -529,7 +534,7 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3 /openmp:llvm %(AdditionalOptions) - psapi.lib;KLU_COMPLEX.lib;$(IntDir)libfftw3-3.lib;%(AdditionalDependencies) + sndfile.lib;samplerate.lib;psapi.lib;KLU_COMPLEX.lib;$(IntDir)libfftw3-3.lib;%(AdditionalDependencies) true Console 0 @@ -541,10 +546,12 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3 MachineX64 true - KLU\x64\Debug;%(AdditionalLibraryDirectories) + ../../libsamplerate/lib;../../libsndfile/lib;KLU\x64\Debug;%(AdditionalLibraryDirectories) + copy /y "..\..\libsndfile\bin\sndfile.dll" "$(OutDir)" + copy /y "..\..\libsamplerate\bin\samplerate.dll" "$(OutDir)" copy /y "..\..\fftw-3.3-dll64\libfftw3-3.dll" "$(OutDir)" make-install-vngspiced.bat $(OutDir) fftw 64 @@ -564,7 +571,7 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3 true Speed true - ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;..\..\fftw-3.3-dll64;%(AdditionalIncludeDirectories) + ..\..\libsamplerate\include;..\..\libsndfile\include;..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;..\..\fftw-3.3-dll64;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;CONSOLE;CONFIG64;HAVE_LIBFFTW3;%(PreprocessorDefinitions) false @@ -582,7 +589,7 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3 /openmp:llvm %(AdditionalOptions) - psapi.lib;KLU_COMPLEX.lib;$(IntDir)libfftw3-3.lib;%(AdditionalDependencies) + sndfile.lib;samplerate.lib;psapi.lib;KLU_COMPLEX.lib;$(IntDir)libfftw3-3.lib;%(AdditionalDependencies) true Console 0 @@ -597,7 +604,7 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3 MachineX64 true - KLU\x64\Release;%(AdditionalLibraryDirectories) + ../../libsamplerate/lib;../../libsndfile/lib;KLU\x64\Release;%(AdditionalLibraryDirectories) @@ -673,7 +680,7 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3 true Speed true - ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;..\..\fftw-3.3-dll64;%(AdditionalIncludeDirectories) + ..\..\libsamplerate\include;..\..\libsndfile\include;..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;..\..\fftw-3.3-dll64;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;USE_OMP;CONFIG64;HAVE_LIBFFTW3;%(PreprocessorDefinitions) false @@ -693,7 +700,7 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3 /openmp:llvm %(AdditionalOptions) - psapi.lib;KLU_COMPLEX.lib;$(IntDir)libfftw3-3.lib;%(AdditionalDependencies) + sndfile.lib;samplerate.lib;psapi.lib;KLU_COMPLEX.lib;$(IntDir)libfftw3-3.lib;%(AdditionalDependencies) true Windows 0 @@ -710,10 +717,12 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3 MachineX64 true - KLU\x64\Release;%(AdditionalLibraryDirectories) + ../../libsamplerate/lib;../../libsndfile/lib;KLU\x64\Release;%(AdditionalLibraryDirectories) + copy /y "..\..\libsndfile\bin\sndfile.dll" "$(OutDir)" + copy /y "..\..\libsamplerate\bin\samplerate.dll" "$(OutDir)" copy /y "..\..\fftw-3.3-dll64\libfftw3-3.dll" "$(OutDir)" make-install-vngspice.bat $(OutDir) fftw 64 @@ -785,7 +794,7 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3 true Speed true - ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;..\..\fftw-3.3-dll64;%(AdditionalIncludeDirectories) + ..\..\libsamplerate\include;..\..\libsndfile\include;..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;..\..\fftw-3.3-dll64;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;CONSOLE;CONFIG64;USE_OMP;HAVE_LIBFFTW3;%(PreprocessorDefinitions) false @@ -805,7 +814,7 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3 /openmp:llvm %(AdditionalOptions) - psapi.lib;KLU_COMPLEX.lib;$(IntDir)libfftw3-3.lib;%(AdditionalDependencies) + sndfile.lib;samplerate.lib;psapi.lib;KLU_COMPLEX.lib;$(IntDir)libfftw3-3.lib;%(AdditionalDependencies) true Console 0 @@ -820,10 +829,12 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3 MachineX64 true - KLU\x64\Release;%(AdditionalLibraryDirectories) + ../../libsamplerate/lib;../../libsndfile/lib;KLU\x64\Release;%(AdditionalLibraryDirectories) + copy /y "..\..\libsndfile\bin\sndfile.dll" "$(OutDir)" + copy /y "..\..\libsamplerate\bin\samplerate.dll" "$(OutDir)" copy /y "..\..\fftw-3.3-dll64\libfftw3-3.dll" "$(OutDir)" make-install-vngspice.bat $(OutDir) fftw 64 @@ -934,6 +945,7 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3 + @@ -1351,6 +1363,7 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3 + @@ -1563,6 +1576,7 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3 + @@ -2732,6 +2746,7 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3 + diff --git a/visualc/vngspice.vcxproj b/visualc/vngspice.vcxproj index 12cc794b7..399e66524 100644 --- a/visualc/vngspice.vcxproj +++ b/visualc/vngspice.vcxproj @@ -348,6 +348,8 @@ + copy /y "..\..\libsndfile\bin\sndfile.dll" "$(OutDir)" + copy /y "..\..\libsamplerate\bin\samplerate.dll" "$(OutDir)" make-install-vngspiced.bat $(OutDir) 64 @@ -383,7 +385,7 @@ Default true stdcpp14 - %(AdditionalOptions) + /openmp:llvm %(AdditionalOptions) sndfile.lib;samplerate.lib;psapi.lib;KLU_COMPLEX.lib;%(AdditionalDependencies) @@ -407,6 +409,8 @@ + copy /y "..\..\libsndfile\bin\sndfile.dll" "$(OutDir)" + copy /y "..\..\libsamplerate\bin\samplerate.dll" "$(OutDir)" make-install-vngspice.bat $(OutDir) 64 @@ -556,6 +560,8 @@ + copy /y "..\..\libsndfile\bin\sndfile.dll" "$(OutDir)" + copy /y "..\..\libsamplerate\bin\samplerate.dll" "$(OutDir)" make-install-vngspiced.bat $(OutDir) 64 @@ -726,6 +732,8 @@ + copy /y "..\..\libsndfile\bin\sndfile.dll" "$(OutDir)" + copy /y "..\..\libsamplerate\bin\samplerate.dll" "$(OutDir)" make-install-vngspice.bat $(OutDir) 64 @@ -779,7 +787,8 @@ ../../libsamplerate/lib;../../libsndfile/lib;KLU/Release/;%(AdditionalLibraryDirectories) - make-install-vngspice.bat $(OutDir) + + make-install-vngspice.bat $(OutDir) $(ProjectDir)ngspice-x86.exe.manifest @@ -837,6 +846,8 @@ + copy /y "..\..\libsndfile\bin\sndfile.dll" "$(OutDir)" + copy /y "..\..\libsamplerate\bin\samplerate.dll" "$(OutDir)" make-install-vngspice.bat $(OutDir) 64 @@ -869,6 +880,7 @@ + @@ -885,7 +897,6 @@ - @@ -1482,6 +1493,7 @@ + @@ -1498,7 +1510,6 @@ -