diff --git a/visualc/make-install-vngspice.bat b/visualc/make-install-vngspice.bat index 5ccbc7063..e199647c2 100644 --- a/visualc/make-install-vngspice.bat +++ b/visualc/make-install-vngspice.bat @@ -32,7 +32,7 @@ goto end :copy2 copy %1\ngspice.exe %dst%\bin\ -copy ..\..\fftw-3.3.5-dll32\libfftw3-3.dll %dst%\bin\ +copy ..\..\fftw-3.3-dll32\libfftw3-3.dll %dst%\bin\ goto end :b64 @@ -62,6 +62,6 @@ goto end :copy2-64 copy %1\ngspice.exe %dst%\bin\ -copy ..\..\fftw-3.3.5-dll64\libfftw3-3.dll %dst%\bin\ +copy ..\..\fftw-3.3-dll64\libfftw3-3.dll %dst%\bin\ :end diff --git a/visualc/vngspice-fftw.vcxproj b/visualc/vngspice-fftw.vcxproj index 6cdcd6c09..d697289c8 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.5-dll32\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib +lib /machine:x86 /def:..\..\fftw-3.3-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.5-dll32;%(AdditionalIncludeDirectories) + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\include;..\src\spicelib\parser;.;..\..\fftw-3.3-dll32;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;NGDEBUG;HAVE_LIBFFTW3;%(PreprocessorDefinitions) false @@ -237,7 +237,7 @@ lib /machine:x86 /def:..\..\fftw-3.3.5-dll32\libfftw3-3.def /out:$(IntDir)libfft - copy /y "..\..\fftw-3.3.5-dll32\libfftw3-3.dll" "$(OutDir)" + copy /y "..\..\fftw-3.3-dll32\libfftw3-3.dll" "$(OutDir)" make-install-vngspiced.bat $(OutDir) fftw @@ -246,14 +246,14 @@ lib /machine:x86 /def:..\..\fftw-3.3.5-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.5-dll32\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib +lib /machine:x86 /def:..\..\fftw-3.3-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.5-dll32;%(AdditionalIncludeDirectories) + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\include;..\src\spicelib\parser;.;..\..\fftw-3.3-dll32;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;HAVE_LIBFFTW3;%(PreprocessorDefinitions) false @@ -287,7 +287,7 @@ lib /machine:x86 /def:..\..\fftw-3.3.5-dll32\libfftw3-3.def /out:$(IntDir)libfft - copy /y "..\..\fftw-3.3.5-dll32\libfftw3-3.dll" "$(OutDir)" + copy /y "..\..\fftw-3.3-dll32\libfftw3-3.dll" "$(OutDir)" make-install-vngspice.bat $(OutDir) fftw @@ -296,14 +296,14 @@ lib /machine:x86 /def:..\..\fftw-3.3.5-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.5-dll64\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib +lib /machine:x64 /def:..\..\fftw-3.3-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.5-dll64;%(AdditionalIncludeDirectories) + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\include;..\src\spicelib\parser;.;..\..\fftw-3.3-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.5-dll64\libfftw3-3.def /out:$(IntDir)libfft - copy /y "..\..\fftw-3.3.5-dll64\libfftw3-3.dll" "$(OutDir)" + copy /y "..\..\fftw-3.3-dll64\libfftw3-3.dll" "$(OutDir)" make-install-vngspiced.bat $(OutDir) fftw 64 @@ -343,7 +343,7 @@ lib /machine:x64 /def:..\..\fftw-3.3.5-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.5-dll64\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib +lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib X64 @@ -353,7 +353,7 @@ lib /machine:x64 /def:..\..\fftw-3.3.5-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.5-dll64;%(AdditionalIncludeDirectories) + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\include;..\src\spicelib\parser;.;..\..\fftw-3.3-dll64;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;CONFIG64;HAVE_LIBFFTW3;%(PreprocessorDefinitions) false @@ -389,7 +389,7 @@ lib /machine:x64 /def:..\..\fftw-3.3.5-dll64\libfftw3-3.def /out:$(IntDir)libfft - copy /y "..\..\fftw-3.3.5-dll64\libfftw3-3.dll" "$(OutDir)" + copy /y "..\..\fftw-3.3-dll64\libfftw3-3.dll" "$(OutDir)" make-install-vngspice.bat $(OutDir) fftw 64 @@ -398,11 +398,11 @@ lib /machine:x64 /def:..\..\fftw-3.3.5-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.5-dll32\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib +lib /machine:x86 /def:..\..\fftw-3.3-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.5-dll32;%(AdditionalIncludeDirectories) + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\include;..\src\spicelib\parser;.;..\..\fftw-3.3-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.5-dll32\libfftw3-3.def /out:$(IntDir)libfft - copy /y "..\..\fftw-3.3.5-dll32\libfftw3-3.dll" "$(OutDir)" + copy /y "..\..\fftw-3.3-dll32\libfftw3-3.dll" "$(OutDir)" make-install-vngspiced.bat $(OutDir) fftw @@ -442,14 +442,14 @@ lib /machine:x86 /def:..\..\fftw-3.3.5-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.5-dll32\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib +lib /machine:x86 /def:..\..\fftw-3.3-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.5-dll32;%(AdditionalIncludeDirectories) + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\include;..\src\spicelib\parser;.;..\..\fftw-3.3-dll32;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;CONSOLE;HAVE_LIBFFTW3;%(PreprocessorDefinitions) false @@ -483,7 +483,7 @@ lib /machine:x86 /def:..\..\fftw-3.3.5-dll32\libfftw3-3.def /out:$(IntDir)libfft - copy /y "..\..\fftw-3.3.5-dll32\libfftw3-3.dll" "$(OutDir)" + copy /y "..\..\fftw-3.3-dll32\libfftw3-3.dll" "$(OutDir)" make-install-vngspice.bat $(OutDir) fftw @@ -492,14 +492,14 @@ lib /machine:x86 /def:..\..\fftw-3.3.5-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.5-dll64\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib +lib /machine:x64 /def:..\..\fftw-3.3-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.5-dll64;%(AdditionalIncludeDirectories) + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\include;..\src\spicelib\parser;.;..\..\fftw-3.3-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.5-dll64\libfftw3-3.def /out:$(IntDir)libfft - copy /y "..\..\fftw-3.3.5-dll64\libfftw3-3.dll" "$(OutDir)" + copy /y "..\..\fftw-3.3-dll64\libfftw3-3.dll" "$(OutDir)" make-install-vngspiced.bat $(OutDir) fftw 64 @@ -539,7 +539,7 @@ lib /machine:x64 /def:..\..\fftw-3.3.5-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.5-dll64\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib +lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib X64 @@ -549,7 +549,7 @@ lib /machine:x64 /def:..\..\fftw-3.3.5-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.5-dll64;%(AdditionalIncludeDirectories) + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\include;..\src\spicelib\parser;.;..\..\fftw-3.3-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.5-dll64\libfftw3-3.def /out:$(IntDir)libfft - copy /y "..\..\fftw-3.3.5-dll64\libfftw3-3.dll" "$(OutDir)" + copy /y "..\..\fftw-3.3-dll64\libfftw3-3.dll" "$(OutDir)" make-install-vngspice.bat $(OutDir) fftw 64 @@ -592,14 +592,14 @@ lib /machine:x64 /def:..\..\fftw-3.3.5-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.5-dll32\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib +lib /machine:x86 /def:..\..\fftw-3.3-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.5-dll32;%(AdditionalIncludeDirectories) + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\include;..\src\spicelib\parser;.;..\..\fftw-3.3-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.5-dll32\libfftw3-3.def /out:$(IntDir)libfft - copy /y "..\..\fftw-3.3.5-dll32\libfftw3-3.dll" "$(OutDir)" + copy /y "..\..\fftw-3.3-dll32\libfftw3-3.dll" "$(OutDir)" make-install-vngspice.bat $(OutDir) fftw @@ -643,7 +643,7 @@ lib /machine:x86 /def:..\..\fftw-3.3.5-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.5-dll64\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib +lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib X64 @@ -653,7 +653,7 @@ lib /machine:x64 /def:..\..\fftw-3.3.5-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.5-dll32;%(AdditionalIncludeDirectories) + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\include;..\src\spicelib\parser;.;..\..\fftw-3.3-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.5-dll64\libfftw3-3.def /out:$(IntDir)libfft - copy /y "..\..\fftw-3.3.5-dll64\libfftw3-3.dll" "$(OutDir)" + copy /y "..\..\fftw-3.3-dll64\libfftw3-3.dll" "$(OutDir)" make-install-vngspice.bat $(OutDir) fftw 64 @@ -699,14 +699,14 @@ lib /machine:x64 /def:..\..\fftw-3.3.5-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.5-dll32\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib +lib /machine:x86 /def:..\..\fftw-3.3-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.5-dll32;%(AdditionalIncludeDirectories) + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\include;..\src\spicelib\parser;.;..\..\fftw-3.3-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.5-dll32\libfftw3-3.def /out:$(IntDir)libfft - copy /y "..\..\fftw-3.3.5-dll32\libfftw3-3.dll" "$(OutDir)" + copy /y "..\..\fftw-3.3-dll32\libfftw3-3.dll" "$(OutDir)" make-install-vngspice.bat $(OutDir) fftw @@ -750,7 +750,7 @@ lib /machine:x86 /def:..\..\fftw-3.3.5-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.5-dll64\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib +lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib X64 @@ -760,7 +760,7 @@ lib /machine:x64 /def:..\..\fftw-3.3.5-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.5-dll64;%(AdditionalIncludeDirectories) + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\include;..\src\spicelib\parser;.;..\..\fftw-3.3-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.5-dll64\libfftw3-3.def /out:$(IntDir)libfft - copy /y "..\..\fftw-3.3.5-dll64\libfftw3-3.dll" "$(OutDir)" + copy /y "..\..\fftw-3.3-dll64\libfftw3-3.dll" "$(OutDir)" make-install-vngspice.bat $(OutDir) fftw 64