From ca8481d9fc01b29a631f604321b83f61aeaefa26 Mon Sep 17 00:00:00 2001
From: dwarning <dwarning>
Date: Tue, 16 Oct 2018 07:53:38 +0200
Subject: [PATCH] skip minor version in fftw path

---
 visualc/.gitignore                 | 3 +++
 visualc/how-to-fftw.txt            | 8 ++++----
 visualc/make-install-vngspiced.bat | 4 ++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/visualc/.gitignore b/visualc/.gitignore
index 5eeb3ac43..fb7ce224f 100644
--- a/visualc/.gitignore
+++ b/visualc/.gitignore
@@ -11,12 +11,15 @@
 /xspice/cmpp/Debug/
 /xspice/cmpp/Release/
 /xspice/cmpp/tmp-bison/
+/xspice/cmpp/x64/
 /xspice/icm/
 /xspice/intermediate/
 
+/x64/
 /vngspice/
 /vngspice-fftw/
 /sharedspice/
 
 /.vs/
 *.vc.db
+spinit
diff --git a/visualc/how-to-fftw.txt b/visualc/how-to-fftw.txt
index 2295c435b..59cbd1363 100644
--- a/visualc/how-to-fftw.txt
+++ b/visualc/how-to-fftw.txt
@@ -1,11 +1,11 @@
-../../fftw-3.3.5-dll32 and ../../fftw-3.3.5-dll64
+../../fftw-3.3-dll32 and ../../fftw-3.3-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.5-dll32
+More precisely (here in case of the 32 bit version 3.3.5),
+ - you have to create the directory ../../fftw-3.3-dll32
     (which is side by side and thus outside of the ngspice source tree)
  - you have to fetch fftw-3.3.5-dll32.zip and deploy it there
  - you have to unpack this .zip there
@@ -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.5-dll32 fftw-3.3.5-dll64 ; do
+       for i in fftw-3.3-dll32 fftw-3.3-dll64 ; do
            dst=../../$i
            mkdir -p $dst
            (cd $dst && wget $url/$i.zip && unzip $i.zip)
diff --git a/visualc/make-install-vngspiced.bat b/visualc/make-install-vngspiced.bat
index 35f4f8fea..2697a5d6f 100644
--- a/visualc/make-install-vngspiced.bat
+++ b/visualc/make-install-vngspiced.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