From d6e7833681b982222b87b84f9a858615192c3487 Mon Sep 17 00:00:00 2001 From: dwarning Date: Wed, 22 Aug 2018 18:53:07 +0200 Subject: [PATCH] update fftw3 to version 3.3.5 under windows --- visualc/how-to-fftw.txt | 8 ++-- visualc/make-install-vngspice.bat | 4 +- visualc/make-install-vngspiced.bat | 4 +- visualc/vngspice-fftw.vcxproj | 72 +++++++++++++++--------------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/visualc/how-to-fftw.txt b/visualc/how-to-fftw.txt index 1ee41813e..2295c435b 100644 --- a/visualc/how-to-fftw.txt +++ b/visualc/how-to-fftw.txt @@ -1,13 +1,13 @@ -../../fftw-3.3.4-dll32 and ../../fftw-3.3.4-dll64 +../../fftw-3.3.5-dll32 and ../../fftw-3.3.5-dll64 are the places to deploy the appropriate 32/64 bit version of the fftw3 libraries under VC++ which can be found here: http://www.fftw.org/install/windows.html More precisely (here in case of the 32 bit version), - - you have to create the directory ../../fftw-3.3.4-dll32 + - you have to create the directory ../../fftw-3.3.5-dll32 (which is side by side and thus outside of the ngspice source tree) - - you have to fetch fftw-3.3.4-dll32.zip and deploy it there + - you have to fetch fftw-3.3.5-dll32.zip and deploy it there - you have to unpack this .zip there At least you need to unpack these three files @@ -25,7 +25,7 @@ to a place which is in your PATH environment. (compile "url=ftp://ftp.fftw.org/pub/fftw - for i in fftw-3.3.4-dll32 fftw-3.3.4-dll64 ; do + for i in fftw-3.3.5-dll32 fftw-3.3.5-dll64 ; do dst=../../$i mkdir -p $dst (cd $dst && wget $url/$i.zip && unzip $i.zip) diff --git a/visualc/make-install-vngspice.bat b/visualc/make-install-vngspice.bat index c232de528..daa6bab39 100644 --- a/visualc/make-install-vngspice.bat +++ b/visualc/make-install-vngspice.bat @@ -31,7 +31,7 @@ goto end :copy2 copy %1\ngspice.exe %dst%\bin\ -copy ..\..\fftw-3.3.4-dll32\libfftw3-3.dll %dst%\bin\ +copy ..\..\fftw-3.3.5-dll32\libfftw3-3.dll %dst%\bin\ goto end :b64 @@ -60,6 +60,6 @@ goto end :copy2-64 copy %1\ngspice.exe %dst%\bin\ -copy ..\..\fftw-3.3.4-dll64\libfftw3-3.dll %dst%\bin\ +copy ..\..\fftw-3.3.5-dll64\libfftw3-3.dll %dst%\bin\ :end diff --git a/visualc/make-install-vngspiced.bat b/visualc/make-install-vngspiced.bat index f455c5f6b..a164f34f9 100644 --- a/visualc/make-install-vngspiced.bat +++ b/visualc/make-install-vngspiced.bat @@ -31,7 +31,7 @@ goto end :copy2 copy %1\ngspice.exe %dst%\bin\ -copy ..\..\fftw-3.3.4-dll32\libfftw3-3.dll %dst%\bin\ +copy ..\..\fftw-3.3.5-dll32\libfftw3-3.dll %dst%\bin\ goto end :b64 @@ -60,6 +60,6 @@ goto end :copy2-64 copy %1\ngspice.exe %dst%\bin\ -copy ..\..\fftw-3.3.4-dll64\libfftw3-3.dll %dst%\bin\ +copy ..\..\fftw-3.3.5-dll64\libfftw3-3.dll %dst%\bin\ :end diff --git a/visualc/vngspice-fftw.vcxproj b/visualc/vngspice-fftw.vcxproj index 10a572126..6cdcd6c09 100644 --- a/visualc/vngspice-fftw.vcxproj +++ b/visualc/vngspice-fftw.vcxproj @@ -202,11 +202,11 @@ force recompilation of conf.c with actual date if exist $(IntDir)conf.obj del $(IntDir)conf.obj -lib /machine:x86 /def:..\..\fftw-3.3.4-dll32\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib +lib /machine:x86 /def:..\..\fftw-3.3.5-dll32\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib Disabled - ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\include;..\src\spicelib\parser;.;..\..\fftw-3.3.4-dll32;%(AdditionalIncludeDirectories) + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\include;..\src\spicelib\parser;.;..\..\fftw-3.3.5-dll32;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;NGDEBUG;HAVE_LIBFFTW3;%(PreprocessorDefinitions) false @@ -237,7 +237,7 @@ lib /machine:x86 /def:..\..\fftw-3.3.4-dll32\libfftw3-3.def /out:$(IntDir)libfft - copy /y "..\..\fftw-3.3.4-dll32\libfftw3-3.dll" "$(OutDir)" + copy /y "..\..\fftw-3.3.5-dll32\libfftw3-3.dll" "$(OutDir)" make-install-vngspiced.bat $(OutDir) fftw @@ -246,14 +246,14 @@ lib /machine:x86 /def:..\..\fftw-3.3.4-dll32\libfftw3-3.def /out:$(IntDir)libfft force recompilation of conf.c with actual date if exist $(IntDir)conf.obj del $(IntDir)conf.obj -lib /machine:x86 /def:..\..\fftw-3.3.4-dll32\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib +lib /machine:x86 /def:..\..\fftw-3.3.5-dll32\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib MaxSpeed true Speed true - ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\include;..\src\spicelib\parser;.;..\..\fftw-3.3.4-dll32;%(AdditionalIncludeDirectories) + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\include;..\src\spicelib\parser;.;..\..\fftw-3.3.5-dll32;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;HAVE_LIBFFTW3;%(PreprocessorDefinitions) false @@ -287,7 +287,7 @@ lib /machine:x86 /def:..\..\fftw-3.3.4-dll32\libfftw3-3.def /out:$(IntDir)libfft - copy /y "..\..\fftw-3.3.4-dll32\libfftw3-3.dll" "$(OutDir)" + copy /y "..\..\fftw-3.3.5-dll32\libfftw3-3.dll" "$(OutDir)" make-install-vngspice.bat $(OutDir) fftw @@ -296,14 +296,14 @@ lib /machine:x86 /def:..\..\fftw-3.3.4-dll32\libfftw3-3.def /out:$(IntDir)libfft force recompilation of conf.c with actual date if exist $(IntDir)conf.obj del $(IntDir)conf.obj -lib /machine:x64 /def:..\..\fftw-3.3.4-dll64\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib +lib /machine:x64 /def:..\..\fftw-3.3.5-dll64\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib X64 Disabled - ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\include;..\src\spicelib\parser;.;..\..\fftw-3.3.4-dll64;%(AdditionalIncludeDirectories) + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\include;..\src\spicelib\parser;.;..\..\fftw-3.3.5-dll64;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;NGDEBUG;CONFIG64;HAVE_LIBFFTW3;%(PreprocessorDefinitions) false @@ -334,7 +334,7 @@ lib /machine:x64 /def:..\..\fftw-3.3.4-dll64\libfftw3-3.def /out:$(IntDir)libfft - copy /y "..\..\fftw-3.3.4-dll64\libfftw3-3.dll" "$(OutDir)" + copy /y "..\..\fftw-3.3.5-dll64\libfftw3-3.dll" "$(OutDir)" make-install-vngspiced.bat $(OutDir) fftw 64 @@ -343,7 +343,7 @@ lib /machine:x64 /def:..\..\fftw-3.3.4-dll64\libfftw3-3.def /out:$(IntDir)libfft force recompilation of conf.c with actual date if exist $(IntDir)conf.obj del $(IntDir)conf.obj -lib /machine:x64 /def:..\..\fftw-3.3.4-dll64\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib +lib /machine:x64 /def:..\..\fftw-3.3.5-dll64\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib X64 @@ -353,7 +353,7 @@ lib /machine:x64 /def:..\..\fftw-3.3.4-dll64\libfftw3-3.def /out:$(IntDir)libfft true Speed true - ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\include;..\src\spicelib\parser;.;..\..\fftw-3.3.4-dll64;%(AdditionalIncludeDirectories) + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\include;..\src\spicelib\parser;.;..\..\fftw-3.3.5-dll64;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;CONFIG64;HAVE_LIBFFTW3;%(PreprocessorDefinitions) false @@ -389,7 +389,7 @@ lib /machine:x64 /def:..\..\fftw-3.3.4-dll64\libfftw3-3.def /out:$(IntDir)libfft - copy /y "..\..\fftw-3.3.4-dll64\libfftw3-3.dll" "$(OutDir)" + copy /y "..\..\fftw-3.3.5-dll64\libfftw3-3.dll" "$(OutDir)" make-install-vngspice.bat $(OutDir) fftw 64 @@ -398,11 +398,11 @@ lib /machine:x64 /def:..\..\fftw-3.3.4-dll64\libfftw3-3.def /out:$(IntDir)libfft force recompilation of conf.c with actual date if exist $(IntDir)conf.obj del $(IntDir)conf.obj -lib /machine:x86 /def:..\..\fftw-3.3.4-dll32\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib +lib /machine:x86 /def:..\..\fftw-3.3.5-dll32\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib Disabled - ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\include;..\src\spicelib\parser;.;..\..\fftw-3.3.4-dll32;%(AdditionalIncludeDirectories) + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\include;..\src\spicelib\parser;.;..\..\fftw-3.3.5-dll32;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;NGDEBUG;CONSOLE;HAVE_LIBFFTW3;%(PreprocessorDefinitions) false @@ -433,7 +433,7 @@ lib /machine:x86 /def:..\..\fftw-3.3.4-dll32\libfftw3-3.def /out:$(IntDir)libfft - copy /y "..\..\fftw-3.3.4-dll32\libfftw3-3.dll" "$(OutDir)" + copy /y "..\..\fftw-3.3.5-dll32\libfftw3-3.dll" "$(OutDir)" make-install-vngspiced.bat $(OutDir) fftw @@ -442,14 +442,14 @@ lib /machine:x86 /def:..\..\fftw-3.3.4-dll32\libfftw3-3.def /out:$(IntDir)libfft force recompilation of conf.c with actual date if exist $(IntDir)conf.obj del $(IntDir)conf.obj -lib /machine:x86 /def:..\..\fftw-3.3.4-dll32\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib +lib /machine:x86 /def:..\..\fftw-3.3.5-dll32\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib MaxSpeed true Speed true - ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\include;..\src\spicelib\parser;.;..\..\fftw-3.3.4-dll32;%(AdditionalIncludeDirectories) + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\include;..\src\spicelib\parser;.;..\..\fftw-3.3.5-dll32;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;CONSOLE;HAVE_LIBFFTW3;%(PreprocessorDefinitions) false @@ -483,7 +483,7 @@ lib /machine:x86 /def:..\..\fftw-3.3.4-dll32\libfftw3-3.def /out:$(IntDir)libfft - copy /y "..\..\fftw-3.3.4-dll32\libfftw3-3.dll" "$(OutDir)" + copy /y "..\..\fftw-3.3.5-dll32\libfftw3-3.dll" "$(OutDir)" make-install-vngspice.bat $(OutDir) fftw @@ -492,14 +492,14 @@ lib /machine:x86 /def:..\..\fftw-3.3.4-dll32\libfftw3-3.def /out:$(IntDir)libfft force recompilation of conf.c with actual date if exist $(IntDir)conf.obj del $(IntDir)conf.obj -lib /machine:x64 /def:..\..\fftw-3.3.4-dll64\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib +lib /machine:x64 /def:..\..\fftw-3.3.5-dll64\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib X64 Disabled - ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\include;..\src\spicelib\parser;.;..\..\fftw-3.3.4-dll64;%(AdditionalIncludeDirectories) + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\include;..\src\spicelib\parser;.;..\..\fftw-3.3.5-dll64;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;NGDEBUG;CONSOLE;CONFIG64;HAVE_LIBFFTW3;%(PreprocessorDefinitions) false @@ -530,7 +530,7 @@ lib /machine:x64 /def:..\..\fftw-3.3.4-dll64\libfftw3-3.def /out:$(IntDir)libfft - copy /y "..\..\fftw-3.3.4-dll64\libfftw3-3.dll" "$(OutDir)" + copy /y "..\..\fftw-3.3.5-dll64\libfftw3-3.dll" "$(OutDir)" make-install-vngspiced.bat $(OutDir) fftw 64 @@ -539,7 +539,7 @@ lib /machine:x64 /def:..\..\fftw-3.3.4-dll64\libfftw3-3.def /out:$(IntDir)libfft force recompilation of conf.c with actual date if exist $(IntDir)conf.obj del $(IntDir)conf.obj -lib /machine:x64 /def:..\..\fftw-3.3.4-dll64\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib +lib /machine:x64 /def:..\..\fftw-3.3.5-dll64\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib X64 @@ -549,7 +549,7 @@ lib /machine:x64 /def:..\..\fftw-3.3.4-dll64\libfftw3-3.def /out:$(IntDir)libfft true Speed true - ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\include;..\src\spicelib\parser;.;..\..\fftw-3.3.4-dll64;%(AdditionalIncludeDirectories) + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\include;..\src\spicelib\parser;.;..\..\fftw-3.3.5-dll64;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;CONSOLE;CONFIG64;HAVE_LIBFFTW3;%(PreprocessorDefinitions) false @@ -583,7 +583,7 @@ lib /machine:x64 /def:..\..\fftw-3.3.4-dll64\libfftw3-3.def /out:$(IntDir)libfft - copy /y "..\..\fftw-3.3.4-dll64\libfftw3-3.dll" "$(OutDir)" + copy /y "..\..\fftw-3.3.5-dll64\libfftw3-3.dll" "$(OutDir)" make-install-vngspice.bat $(OutDir) fftw 64 @@ -592,14 +592,14 @@ lib /machine:x64 /def:..\..\fftw-3.3.4-dll64\libfftw3-3.def /out:$(IntDir)libfft force recompilation of conf.c with actual date if exist $(IntDir)conf.obj del $(IntDir)conf.obj -lib /machine:x86 /def:..\..\fftw-3.3.4-dll32\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib +lib /machine:x86 /def:..\..\fftw-3.3.5-dll32\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib MaxSpeed true Speed true - ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\include;..\src\spicelib\parser;.;..\..\fftw-3.3.4-dll32;%(AdditionalIncludeDirectories) + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\include;..\src\spicelib\parser;.;..\..\fftw-3.3.5-dll32;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;USE_OMP;HAVE_LIBFFTW3;%(PreprocessorDefinitions) false @@ -634,7 +634,7 @@ lib /machine:x86 /def:..\..\fftw-3.3.4-dll32\libfftw3-3.def /out:$(IntDir)libfft - copy /y "..\..\fftw-3.3.4-dll32\libfftw3-3.dll" "$(OutDir)" + copy /y "..\..\fftw-3.3.5-dll32\libfftw3-3.dll" "$(OutDir)" make-install-vngspice.bat $(OutDir) fftw @@ -643,7 +643,7 @@ lib /machine:x86 /def:..\..\fftw-3.3.4-dll32\libfftw3-3.def /out:$(IntDir)libfft force recompilation of conf.c with actual date if exist $(IntDir)conf.obj del $(IntDir)conf.obj -lib /machine:x64 /def:..\..\fftw-3.3.4-dll64\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib +lib /machine:x64 /def:..\..\fftw-3.3.5-dll64\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib X64 @@ -653,7 +653,7 @@ lib /machine:x64 /def:..\..\fftw-3.3.4-dll64\libfftw3-3.def /out:$(IntDir)libfft true Speed true - ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\include;..\src\spicelib\parser;.;..\..\fftw-3.3.4-dll32;%(AdditionalIncludeDirectories) + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\include;..\src\spicelib\parser;.;..\..\fftw-3.3.5-dll32;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;USE_OMP;CONFIG64;HAVE_LIBFFTW3;%(PreprocessorDefinitions) false @@ -690,7 +690,7 @@ lib /machine:x64 /def:..\..\fftw-3.3.4-dll64\libfftw3-3.def /out:$(IntDir)libfft - copy /y "..\..\fftw-3.3.4-dll64\libfftw3-3.dll" "$(OutDir)" + copy /y "..\..\fftw-3.3.5-dll64\libfftw3-3.dll" "$(OutDir)" make-install-vngspice.bat $(OutDir) fftw 64 @@ -699,14 +699,14 @@ lib /machine:x64 /def:..\..\fftw-3.3.4-dll64\libfftw3-3.def /out:$(IntDir)libfft force recompilation of conf.c with actual date if exist $(IntDir)conf.obj del $(IntDir)conf.obj -lib /machine:x86 /def:..\..\fftw-3.3.4-dll32\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib +lib /machine:x86 /def:..\..\fftw-3.3.5-dll32\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib MaxSpeed true Speed true - ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\include;..\src\spicelib\parser;.;..\..\fftw-3.3.4-dll32;%(AdditionalIncludeDirectories) + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\include;..\src\spicelib\parser;.;..\..\fftw-3.3.5-dll32;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;CONSOLE;USE_OMP;HAVE_LIBFFTW3;%(PreprocessorDefinitions) false @@ -741,7 +741,7 @@ lib /machine:x86 /def:..\..\fftw-3.3.4-dll32\libfftw3-3.def /out:$(IntDir)libfft - copy /y "..\..\fftw-3.3.4-dll32\libfftw3-3.dll" "$(OutDir)" + copy /y "..\..\fftw-3.3.5-dll32\libfftw3-3.dll" "$(OutDir)" make-install-vngspice.bat $(OutDir) fftw @@ -750,7 +750,7 @@ lib /machine:x86 /def:..\..\fftw-3.3.4-dll32\libfftw3-3.def /out:$(IntDir)libfft force recompilation of conf.c with actual date if exist $(IntDir)conf.obj del $(IntDir)conf.obj -lib /machine:x64 /def:..\..\fftw-3.3.4-dll64\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib +lib /machine:x64 /def:..\..\fftw-3.3.5-dll64\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib X64 @@ -760,7 +760,7 @@ lib /machine:x64 /def:..\..\fftw-3.3.4-dll64\libfftw3-3.def /out:$(IntDir)libfft true Speed true - ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\include;..\src\spicelib\parser;.;..\..\fftw-3.3.4-dll64;%(AdditionalIncludeDirectories) + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\include;..\src\spicelib\parser;.;..\..\fftw-3.3.5-dll64;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;CONSOLE;CONFIG64;USE_OMP;HAVE_LIBFFTW3;%(PreprocessorDefinitions) false @@ -795,7 +795,7 @@ lib /machine:x64 /def:..\..\fftw-3.3.4-dll64\libfftw3-3.def /out:$(IntDir)libfft - copy /y "..\..\fftw-3.3.4-dll64\libfftw3-3.dll" "$(OutDir)" + copy /y "..\..\fftw-3.3.5-dll64\libfftw3-3.dll" "$(OutDir)" make-install-vngspice.bat $(OutDir) fftw 64