From 319e5c9e75407dd2c99317b4999d6da527efd0f0 Mon Sep 17 00:00:00 2001
From: dwarning <dwarning>
Date: Sun, 2 Mar 2025 10:01:34 +0100
Subject: [PATCH] reintroduce libfftw3-3.lib generation from .def file

---
 visualc/PropertySheet.props |  7 +------
 visualc/vngspice.vcxproj    | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/visualc/PropertySheet.props b/visualc/PropertySheet.props
index a20117801..5e5d252ad 100644
--- a/visualc/PropertySheet.props
+++ b/visualc/PropertySheet.props
@@ -18,14 +18,9 @@
     </ClCompile>
 
     <Link>
-      <!-- Extend library path -->
-      <AdditionalLibraryDirectories Condition="'$(FFTWFOLDER)'=='1'">
-        $(ProjectDir)..\..\fftw-3.3-dll64;%(AdditionalLibraryDirectories)
-      </AdditionalLibraryDirectories>
-
       <!-- Insert additional library -->
       <AdditionalDependencies Condition="'$(FFTWFOLDER)'=='1'">
-        libfftw3-3.lib;%(AdditionalDependencies)
+        $(IntDir)libfftw3-3.lib;%(AdditionalDependencies)
       </AdditionalDependencies>
     </Link>
 
diff --git a/visualc/vngspice.vcxproj b/visualc/vngspice.vcxproj
index 0b3ca2cad..d81bd3074 100644
--- a/visualc/vngspice.vcxproj
+++ b/visualc/vngspice.vcxproj
@@ -124,6 +124,9 @@
     <PreBuildEvent>
       <Message>force recompilation of conf.c with current date</Message>
       <Command>if exist $(IntDir)conf.obj del $(IntDir)conf.obj</Command>
+      <!-- Check, if FFTW-Folder exist -->
+      <Command Condition="Exists('$(ProjectDir)..\..\fftw-3.3-dll64')">
+        lib /machine:x64 /def:..\..\fftw-3.3-dll32\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib</Command>
     </PreBuildEvent>
     <Midl>
       <TargetEnvironment>X64</TargetEnvironment>
@@ -179,6 +182,9 @@
     <PreBuildEvent>
       <Message>force recompilation of conf.c with current date</Message>
       <Command>if exist $(IntDir)conf.obj del $(IntDir)conf.obj</Command>
+      <!-- Check, if FFTW-Folder exist -->
+      <Command Condition="Exists('$(ProjectDir)..\..\fftw-3.3-dll64')">
+        lib /machine:x64 /def:..\..\fftw-3.3-dll32\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib</Command>
     </PreBuildEvent>
     <Midl>
       <TargetEnvironment>X64</TargetEnvironment>
@@ -242,6 +248,9 @@
     <PreBuildEvent>
       <Message>force recompilation of conf.c with current date</Message>
       <Command>if exist $(IntDir)conf.obj del $(IntDir)conf.obj</Command>
+      <!-- Check, if FFTW-Folder exist -->
+      <Command Condition="Exists('$(ProjectDir)..\..\fftw-3.3-dll64')">
+        lib /machine:x64 /def:..\..\fftw-3.3-dll32\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib</Command>
     </PreBuildEvent>
     <Midl>
       <TargetEnvironment>X64</TargetEnvironment>
@@ -297,6 +306,9 @@
     <PreBuildEvent>
       <Message>force recompilation of conf.c with current date</Message>
       <Command>if exist $(IntDir)conf.obj del $(IntDir)conf.obj</Command>
+      <!-- Check, if FFTW-Folder exist -->
+      <Command Condition="Exists('$(ProjectDir)..\..\fftw-3.3-dll64')">
+        lib /machine:x64 /def:..\..\fftw-3.3-dll32\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib</Command>
     </PreBuildEvent>
     <Midl>
       <TargetEnvironment>X64</TargetEnvironment>
@@ -358,6 +370,9 @@
     <PreBuildEvent>
       <Message>force recompilation of conf.c with current date</Message>
       <Command>if exist $(IntDir)conf.obj del $(IntDir)conf.obj</Command>
+      <!-- Check, if FFTW-Folder exist -->
+      <Command Condition="Exists('$(ProjectDir)..\..\fftw-3.3-dll64')">
+        lib /machine:x64 /def:..\..\fftw-3.3-dll32\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib</Command>
     </PreBuildEvent>
     <Midl>
       <TargetEnvironment>X64</TargetEnvironment>
@@ -423,6 +438,9 @@
     <PreBuildEvent>
       <Message>force recompilation of conf.c with current date</Message>
       <Command>if exist $(IntDir)conf.obj del $(IntDir)conf.obj</Command>
+      <!-- Check, if FFTW-Folder exist -->
+      <Command Condition="Exists('$(ProjectDir)..\..\fftw-3.3-dll64')">
+        lib /machine:x64 /def:..\..\fftw-3.3-dll32\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib</Command>
     </PreBuildEvent>
     <Midl>
       <TargetEnvironment>X64</TargetEnvironment>