diff --git a/visualc/.gitignore b/visualc/.gitignore index 403ede463..d98130eb9 100644 --- a/visualc/.gitignore +++ b/visualc/.gitignore @@ -11,7 +11,7 @@ !/.gitignore !/how-to-ngspice-vstudio.txt -!/visualc/fftw3/fftw-*/README-ngspice.txt +!/how-to-fftw.txt !/*.c !/*.h diff --git a/visualc/fftw3/fftw-3.3.3-dll32/README-ngspice.txt b/visualc/fftw3/fftw-3.3.3-dll32/README-ngspice.txt deleted file mode 100644 index f70a97e4e..000000000 --- a/visualc/fftw3/fftw-3.3.3-dll32/README-ngspice.txt +++ /dev/null @@ -1,17 +0,0 @@ -This is the place to deploy the 32 bit version of the -fftw3 library under VC++ which can be found here: - - http://www.fftw.org/install/windows.html - -More precisely, these are the files (e.g. version 3.3) - fftw-3.3.3-dll32.zip -which you will have to install here. - -At least you need the three files -fftw3.h -libfftw3-3.dll -libfftw3-3.def - -If you need to distribute ngspice.exe to another directory, -copy libfftw3-3.dll into the same directory or to a place -which is in your PATH environment. diff --git a/visualc/fftw3/fftw-3.3.3-dll64/README-ngspice.txt b/visualc/fftw3/fftw-3.3.3-dll64/README-ngspice.txt deleted file mode 100644 index 4bd6c8ad0..000000000 --- a/visualc/fftw3/fftw-3.3.3-dll64/README-ngspice.txt +++ /dev/null @@ -1,17 +0,0 @@ -This is the place to deploy the 64 bit version of the -fftw3 library under VC++ which can be found here: - - http://www.fftw.org/install/windows.html - -More precisely, these are the files (e.g. version 3.3) - fftw-3.3.3-dll64.zip -which you will have to install here. - -At least you need the three files -fftw3.h -libfftw3-3.dll -libfftw3-3.def - -If you need to distribute ngspice.exe to another directory, -copy libfftw3-3.dll into the same directory or to a place -which is in your PATH environment. diff --git a/visualc/how-to-fftw.txt b/visualc/how-to-fftw.txt new file mode 100644 index 000000000..d6e6bd413 --- /dev/null +++ b/visualc/how-to-fftw.txt @@ -0,0 +1,31 @@ +../../fftw-3.3.4-dll32 is the place to deploy the 32 bit version +of the fftw3 library under VC++ which can be found here: + + http://www.fftw.org/install/windows.html + +More precisely, + - you have to create the directory ../../fftw-3.3.4-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 unpack this .zip there + +At least you need to unpack these three files + fftw3.h + libfftw3-3.dll + libfftw3-3.def + +Then use vngspice-fftw.vcxproj to compile ngspice + +If you need to distribute ngspice.exe to another directory, +copy libfftw3-3.dll into the same directory or 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 + dst=../../$i + mkdir -p $dst + (cd $dst && wget $url/$i.zip && unzip $i.zip) + done") diff --git a/visualc/vngspice_fftw.vcxproj b/visualc/vngspice_fftw.vcxproj index 8aa8b6c43..37b6563a9 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:fftw3\fftw-3.3.3-dll32\libfftw3-3.def /out:fftw3\fftw-3.3.3-dll32\libfftw3-3.lib +lib /machine:x86 /def:..\..\fftw-3.3.4-dll32\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib Disabled - ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;include;..\src\include;..\src\spicelib\parser;.;fftw3\fftw-3.3.3-dll32;%(AdditionalIncludeDirectories) + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;include;..\src\include;..\src\spicelib\parser;.;..\..\fftw-3.3.4-dll32;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;NGDEBUG;HAVE_LIBFFTW3;%(PreprocessorDefinitions) false @@ -222,8 +222,7 @@ lib /machine:x86 /def:fftw3\fftw-3.3.3-dll32\libfftw3-3.def /out:fftw3\fftw-3.3. true - psapi.lib;libfftw3-3.lib;%(AdditionalDependencies) - fftw3\fftw-3.3.3-dll32;%(AdditionalLibraryDirectories) + psapi.lib;$(IntDir)libfftw3-3.lib;%(AdditionalDependencies) true Windows 0 @@ -236,21 +235,21 @@ lib /machine:x86 /def:fftw3\fftw-3.3.3-dll32\libfftw3-3.def /out:fftw3\fftw-3.3. MachineX86 - copy /y "fftw3\fftw-3.3.3-dll32\libfftw3-3.dll" "$(OutDir)libfftw3-3.dll" + copy /y "..\..\fftw-3.3.4-dll32\libfftw3-3.dll" "$(OutDir)" force recompilation of conf.c with actual date if exist $(IntDir)conf.obj del $(IntDir)conf.obj -lib /machine:x86 /def:fftw3\fftw-3.3.3-dll32\libfftw3-3.def /out:fftw3\fftw-3.3.3-dll32\libfftw3-3.lib +lib /machine:x86 /def:..\..\fftw-3.3.4-dll32\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib MaxSpeed true Speed true - ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;include;..\src\include;..\src\spicelib\parser;.;fftw3\fftw-3.3.3-dll32;%(AdditionalIncludeDirectories) + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;include;..\src\include;..\src\spicelib\parser;.;..\..\fftw-3.3.4-dll32;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;HAVE_LIBFFTW3;%(PreprocessorDefinitions) false @@ -266,8 +265,7 @@ lib /machine:x86 /def:fftw3\fftw-3.3.3-dll32\libfftw3-3.def /out:fftw3\fftw-3.3. true - psapi.lib;libfftw3-3.lib;%(AdditionalDependencies) - fftw3\fftw-3.3.3-dll32;%(AdditionalLibraryDirectories) + psapi.lib;$(IntDir)libfftw3-3.lib;%(AdditionalDependencies) false Windows 0 @@ -283,21 +281,21 @@ lib /machine:x86 /def:fftw3\fftw-3.3.3-dll32\libfftw3-3.def /out:fftw3\fftw-3.3. MachineX86 - copy /y "fftw3\fftw-3.3.3-dll32\libfftw3-3.dll" "$(OutDir)libfftw3-3.dll" + copy /y "..\..\fftw-3.3.4-dll32\libfftw3-3.dll" "$(OutDir)" force recompilation of conf.c with actual date if exist $(IntDir)conf.obj del $(IntDir)conf.obj -lib /machine:x64 /def:fftw3\fftw-3.3.3-dll64\libfftw3-3.def /out:fftw3\fftw-3.3.3-dll64\libfftw3-3.lib +lib /machine:x64 /def:..\..\fftw-3.3.4-dll64\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib X64 Disabled - ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;include;..\src\include;..\src\spicelib\parser;.;fftw3\fftw-3.3.3-dll64;%(AdditionalIncludeDirectories) + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;include;..\src\include;..\src\spicelib\parser;.;..\..\fftw-3.3.4-dll64;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;NGDEBUG;CONFIG64;HAVE_LIBFFTW3;%(PreprocessorDefinitions) false @@ -313,8 +311,7 @@ lib /machine:x64 /def:fftw3\fftw-3.3.3-dll64\libfftw3-3.def /out:fftw3\fftw-3.3. true - psapi.lib;libfftw3-3.lib;%(AdditionalDependencies) - fftw3\fftw-3.3.3-dll64;%(AdditionalLibraryDirectories) + psapi.lib;$(IntDir)libfftw3-3.lib;%(AdditionalDependencies) true Windows 0 @@ -327,14 +324,14 @@ lib /machine:x64 /def:fftw3\fftw-3.3.3-dll64\libfftw3-3.def /out:fftw3\fftw-3.3. MachineX64 - copy /y "fftw3\fftw-3.3.3-dll64\libfftw3-3.dll" "$(OutDir)libfftw3-3.dll" + copy /y "..\..\fftw-3.3.4-dll64\libfftw3-3.dll" "$(OutDir)" force recompilation of conf.c with actual date if exist $(IntDir)conf.obj del $(IntDir)conf.obj -lib /machine:x64 /def:fftw3\fftw-3.3.3-dll64\libfftw3-3.def /out:fftw3\fftw-3.3.3-dll64\libfftw3-3.lib +lib /machine:x64 /def:..\..\fftw-3.3.4-dll64\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib X64 @@ -344,7 +341,7 @@ lib /machine:x64 /def:fftw3\fftw-3.3.3-dll64\libfftw3-3.def /out:fftw3\fftw-3.3. true Speed true - ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;include;..\src\include;..\src\spicelib\parser;.;fftw3\fftw-3.3.3-dll64;%(AdditionalIncludeDirectories) + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;include;..\src\include;..\src\spicelib\parser;.;..\..\fftw-3.3.4-dll64;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;CONFIG64;HAVE_LIBFFTW3;%(PreprocessorDefinitions) false @@ -360,8 +357,7 @@ lib /machine:x64 /def:fftw3\fftw-3.3.3-dll64\libfftw3-3.def /out:fftw3\fftw-3.3. true - psapi.lib;libfftw3-3.lib;%(AdditionalDependencies) - fftw3\fftw-3.3.3-dll64;%(AdditionalLibraryDirectories) + psapi.lib;$(IntDir)libfftw3-3.lib;%(AdditionalDependencies) false Windows 0 @@ -379,18 +375,18 @@ lib /machine:x64 /def:fftw3\fftw-3.3.3-dll64\libfftw3-3.def /out:fftw3\fftw-3.3. MachineX64 - copy /y "fftw3\fftw-3.3.3-dll64\libfftw3-3.dll" "$(OutDir)libfftw3-3.dll" + copy /y "..\..\fftw-3.3.4-dll64\libfftw3-3.dll" "$(OutDir)" force recompilation of conf.c with actual date if exist $(IntDir)conf.obj del $(IntDir)conf.obj -lib /machine:x86 /def:fftw3\fftw-3.3.3-dll32\libfftw3-3.def /out:fftw3\fftw-3.3.3-dll32\libfftw3-3.lib +lib /machine:x86 /def:..\..\fftw-3.3.4-dll32\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib Disabled - ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;include;..\src\include;..\src\spicelib\parser;.;fftw3\fftw-3.3.3-dll32;%(AdditionalIncludeDirectories) + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;include;..\src\include;..\src\spicelib\parser;.;..\..\fftw-3.3.4-dll32;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;NGDEBUG;CONSOLE;HAVE_LIBFFTW3;%(PreprocessorDefinitions) false @@ -406,8 +402,7 @@ lib /machine:x86 /def:fftw3\fftw-3.3.3-dll32\libfftw3-3.def /out:fftw3\fftw-3.3. true - psapi.lib;libfftw3-3.lib;%(AdditionalDependencies) - fftw3\fftw-3.3.3-dll32;%(AdditionalLibraryDirectories) + psapi.lib;$(IntDir)libfftw3-3.lib;%(AdditionalDependencies) true Console 0 @@ -420,21 +415,21 @@ lib /machine:x86 /def:fftw3\fftw-3.3.3-dll32\libfftw3-3.def /out:fftw3\fftw-3.3. MachineX86 - copy /y "fftw3\fftw-3.3.3-dll32\libfftw3-3.dll" "$(OutDir)libfftw3-3.dll" + copy /y "..\..\fftw-3.3.4-dll32\libfftw3-3.dll" "$(OutDir)" force recompilation of conf.c with actual date if exist $(IntDir)conf.obj del $(IntDir)conf.obj -lib /machine:x86 /def:fftw3\fftw-3.3.3-dll32\libfftw3-3.def /out:fftw3\fftw-3.3.3-dll32\libfftw3-3.lib +lib /machine:x86 /def:..\..\fftw-3.3.4-dll32\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib MaxSpeed true Speed true - ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;include;..\src\include;..\src\spicelib\parser;.;fftw3\fftw-3.3.3-dll32;%(AdditionalIncludeDirectories) + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;include;..\src\include;..\src\spicelib\parser;.;..\..\fftw-3.3.4-dll32;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;CONSOLE;HAVE_LIBFFTW3;%(PreprocessorDefinitions) false @@ -450,8 +445,7 @@ lib /machine:x86 /def:fftw3\fftw-3.3.3-dll32\libfftw3-3.def /out:fftw3\fftw-3.3. true - psapi.lib;libfftw3-3.lib;%(AdditionalDependencies) - fftw3\fftw-3.3.3-dll32;%(AdditionalLibraryDirectories) + psapi.lib;$(IntDir)libfftw3-3.lib;%(AdditionalDependencies) false Console 0 @@ -467,21 +461,21 @@ lib /machine:x86 /def:fftw3\fftw-3.3.3-dll32\libfftw3-3.def /out:fftw3\fftw-3.3. MachineX86 - copy /y "fftw3\fftw-3.3.3-dll32\libfftw3-3.dll" "$(OutDir)libfftw3-3.dll" + copy /y "..\..\fftw-3.3.4-dll32\libfftw3-3.dll" "$(OutDir)" force recompilation of conf.c with actual date if exist $(IntDir)conf.obj del $(IntDir)conf.obj -lib /machine:x64 /def:fftw3\fftw-3.3.3-dll64\libfftw3-3.def /out:fftw3\fftw-3.3.3-dll64\libfftw3-3.lib +lib /machine:x64 /def:..\..\fftw-3.3.4-dll64\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib X64 Disabled - ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;include;..\src\include;..\src\spicelib\parser;.;fftw3\fftw-3.3.3-dll64;%(AdditionalIncludeDirectories) + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;include;..\src\include;..\src\spicelib\parser;.;..\..\fftw-3.3.4-dll64;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;NGDEBUG;CONSOLE;CONFIG64;HAVE_LIBFFTW3;%(PreprocessorDefinitions) false @@ -497,8 +491,7 @@ lib /machine:x64 /def:fftw3\fftw-3.3.3-dll64\libfftw3-3.def /out:fftw3\fftw-3.3. true - psapi.lib;libfftw3-3.lib;%(AdditionalDependencies) - fftw3\fftw-3.3.3-dll64;%(AdditionalLibraryDirectories) + psapi.lib;$(IntDir)libfftw3-3.lib;%(AdditionalDependencies) true Console 0 @@ -511,14 +504,14 @@ lib /machine:x64 /def:fftw3\fftw-3.3.3-dll64\libfftw3-3.def /out:fftw3\fftw-3.3. MachineX64 - copy /y "fftw3\fftw-3.3.3-dll64\libfftw3-3.dll" "$(OutDir)libfftw3-3.dll" + copy /y "..\..\fftw-3.3.4-dll64\libfftw3-3.dll" "$(OutDir)" force recompilation of conf.c with actual date if exist $(IntDir)conf.obj del $(IntDir)conf.obj -lib /machine:x64 /def:fftw3\fftw-3.3.3-dll64\libfftw3-3.def /out:fftw3\fftw-3.3.3-dll64\libfftw3-3.lib +lib /machine:x64 /def:..\..\fftw-3.3.4-dll64\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib X64 @@ -528,7 +521,7 @@ lib /machine:x64 /def:fftw3\fftw-3.3.3-dll64\libfftw3-3.def /out:fftw3\fftw-3.3. true Speed true - ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;include;..\src\include;..\src\spicelib\parser;.;fftw3\fftw-3.3.3-dll64;%(AdditionalIncludeDirectories) + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;include;..\src\include;..\src\spicelib\parser;.;..\..\fftw-3.3.4-dll64;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;CONSOLE;CONFIG64;HAVE_LIBFFTW3;%(PreprocessorDefinitions) false @@ -544,8 +537,7 @@ lib /machine:x64 /def:fftw3\fftw-3.3.3-dll64\libfftw3-3.def /out:fftw3\fftw-3.3. true - psapi.lib;libfftw3-3.lib;%(AdditionalDependencies) - fftw3\fftw-3.3.3-dll64;%(AdditionalLibraryDirectories) + psapi.lib;$(IntDir)libfftw3-3.lib;%(AdditionalDependencies) false Console 0 @@ -561,21 +553,21 @@ lib /machine:x64 /def:fftw3\fftw-3.3.3-dll64\libfftw3-3.def /out:fftw3\fftw-3.3. MachineX64 - copy /y "fftw3\fftw-3.3.3-dll64\libfftw3-3.dll" "$(OutDir)libfftw3-3.dll" + copy /y "..\..\fftw-3.3.4-dll64\libfftw3-3.dll" "$(OutDir)" force recompilation of conf.c with actual date if exist $(IntDir)conf.obj del $(IntDir)conf.obj -lib /machine:x86 /def:fftw3\fftw-3.3.3-dll32\libfftw3-3.def /out:fftw3\fftw-3.3.3-dll32\libfftw3-3.lib +lib /machine:x86 /def:..\..\fftw-3.3.4-dll32\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib MaxSpeed true Speed true - ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;include;..\src\include;..\src\spicelib\parser;.;fftw3\fftw-3.3.3-dll32;%(AdditionalIncludeDirectories) + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;include;..\src\include;..\src\spicelib\parser;.;..\..\fftw-3.3.4-dll32;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;USE_OMP;HAVE_LIBFFTW3;%(PreprocessorDefinitions) false @@ -592,8 +584,7 @@ lib /machine:x86 /def:fftw3\fftw-3.3.3-dll32\libfftw3-3.def /out:fftw3\fftw-3.3. true - psapi.lib;libfftw3-3.lib;%(AdditionalDependencies) - fftw3\fftw-3.3.3-dll32;%(AdditionalLibraryDirectories) + psapi.lib;$(IntDir)libfftw3-3.lib;%(AdditionalDependencies) false Windows 0 @@ -609,14 +600,14 @@ lib /machine:x86 /def:fftw3\fftw-3.3.3-dll32\libfftw3-3.def /out:fftw3\fftw-3.3. MachineX86 - copy /y "fftw3\fftw-3.3.3-dll32\libfftw3-3.dll" "$(OutDir)libfftw3-3.dll" + copy /y "..\..\fftw-3.3.4-dll32\libfftw3-3.dll" "$(OutDir)" force recompilation of conf.c with actual date if exist $(IntDir)conf.obj del $(IntDir)conf.obj -lib /machine:x64 /def:fftw3\fftw-3.3.3-dll64\libfftw3-3.def /out:fftw3\fftw-3.3.3-dll64\libfftw3-3.lib +lib /machine:x64 /def:..\..\fftw-3.3.4-dll64\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib X64 @@ -626,7 +617,7 @@ lib /machine:x64 /def:fftw3\fftw-3.3.3-dll64\libfftw3-3.def /out:fftw3\fftw-3.3. true Speed true - ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;include;..\src\include;..\src\spicelib\parser;.;fftw3\fftw-3.3.3-dll32;%(AdditionalIncludeDirectories) + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;include;..\src\include;..\src\spicelib\parser;.;..\..\fftw-3.3.4-dll32;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;USE_OMP;CONFIG64;HAVE_LIBFFTW3;%(PreprocessorDefinitions) false @@ -643,8 +634,7 @@ lib /machine:x64 /def:fftw3\fftw-3.3.3-dll64\libfftw3-3.def /out:fftw3\fftw-3.3. true - psapi.lib;libfftw3-3.lib;%(AdditionalDependencies) - fftw3\fftw-3.3.3-dll64;%(AdditionalLibraryDirectories) + psapi.lib;$(IntDir)libfftw3-3.lib;%(AdditionalDependencies) false Windows 0 @@ -662,21 +652,21 @@ lib /machine:x64 /def:fftw3\fftw-3.3.3-dll64\libfftw3-3.def /out:fftw3\fftw-3.3. MachineX64 - copy /y "fftw3\fftw-3.3.3-dll64\libfftw3-3.dll" "$(OutDir)libfftw3-3.dll" + copy /y "..\..\fftw-3.3.4-dll64\libfftw3-3.dll" "$(OutDir)" force recompilation of conf.c with actual date if exist $(IntDir)conf.obj del $(IntDir)conf.obj -lib /machine:x86 /def:fftw3\fftw-3.3.3-dll32\libfftw3-3.def /out:fftw3\fftw-3.3.3-dll32\libfftw3-3.lib +lib /machine:x86 /def:..\..\fftw-3.3.4-dll32\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib MaxSpeed true Speed true - ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;include;..\src\include;..\src\spicelib\parser;.;fftw3\fftw-3.3.3-dll32;%(AdditionalIncludeDirectories) + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;include;..\src\include;..\src\spicelib\parser;.;..\..\fftw-3.3.4-dll32;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;CONSOLE;USE_OMP;HAVE_LIBFFTW3;%(PreprocessorDefinitions) false @@ -693,8 +683,7 @@ lib /machine:x86 /def:fftw3\fftw-3.3.3-dll32\libfftw3-3.def /out:fftw3\fftw-3.3. true - psapi.lib;libfftw3-3.lib;%(AdditionalDependencies) - fftw3\fftw-3.3.3-dll32;%(AdditionalLibraryDirectories) + psapi.lib;$(IntDir)libfftw3-3.lib;%(AdditionalDependencies) false Console 0 @@ -710,14 +699,14 @@ lib /machine:x86 /def:fftw3\fftw-3.3.3-dll32\libfftw3-3.def /out:fftw3\fftw-3.3. MachineX86 - copy /y "fftw3\fftw-3.3.3-dll32\libfftw3-3.dll" "$(OutDir)libfftw3-3.dll" + copy /y "..\..\fftw-3.3.4-dll32\libfftw3-3.dll" "$(OutDir)" force recompilation of conf.c with actual date if exist $(IntDir)conf.obj del $(IntDir)conf.obj -lib /machine:x64 /def:fftw3\fftw-3.3.3-dll64\libfftw3-3.def /out:fftw3\fftw-3.3.3-dll64\libfftw3-3.lib +lib /machine:x64 /def:..\..\fftw-3.3.4-dll64\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib X64 @@ -727,7 +716,7 @@ lib /machine:x64 /def:fftw3\fftw-3.3.3-dll64\libfftw3-3.def /out:fftw3\fftw-3.3. true Speed true - ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;include;..\src\include;..\src\spicelib\parser;.;fftw3\fftw-3.3.3-dll64;%(AdditionalIncludeDirectories) + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;include;..\src\include;..\src\spicelib\parser;.;..\..\fftw-3.3.4-dll64;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;CONSOLE;CONFIG64;USE_OMP;HAVE_LIBFFTW3;%(PreprocessorDefinitions) false @@ -744,8 +733,7 @@ lib /machine:x64 /def:fftw3\fftw-3.3.3-dll64\libfftw3-3.def /out:fftw3\fftw-3.3. true - psapi.lib;libfftw3-3.lib;%(AdditionalDependencies) - fftw3\fftw-3.3.3-dll64;%(AdditionalLibraryDirectories) + psapi.lib;$(IntDir)libfftw3-3.lib;%(AdditionalDependencies) false Console 0 @@ -761,7 +749,7 @@ lib /machine:x64 /def:fftw3\fftw-3.3.3-dll64\libfftw3-3.def /out:fftw3\fftw-3.3. MachineX64 - copy /y "fftw3\fftw-3.3.3-dll64\libfftw3-3.dll" "$(OutDir)libfftw3-3.dll" + copy /y "..\..\fftw-3.3.4-dll64\libfftw3-3.dll" "$(OutDir)"