luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

reintroduce libfftw3-3.lib generation from .def file

This commit is contained in:
dwarning 2025-03-02 10:01:34 +01:00
parent b52cfb3a66
commit 319e5c9e75
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
visualc/PropertySheet.props
View File

@ -18,14 +18,9 @@
</ClCompile> </ClCompile>
<Link> <Link>
<!-- Extend library path -->
<AdditionalLibraryDirectories Condition="'$(FFTWFOLDER)'=='1'">
$(ProjectDir)..\..\fftw-3.3-dll64;%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
<!-- Insert additional library --> <!-- Insert additional library -->
<AdditionalDependencies Condition="'$(FFTWFOLDER)'=='1'"> <AdditionalDependencies Condition="'$(FFTWFOLDER)'=='1'">
libfftw3-3.lib;%(AdditionalDependencies) $(IntDir)libfftw3-3.lib;%(AdditionalDependencies)
</AdditionalDependencies> </AdditionalDependencies>
</Link> </Link>

18
visualc/vngspice.vcxproj
View File

@ -124,6 +124,9 @@
<PreBuildEvent> <PreBuildEvent>
<Message>force recompilation of conf.c with current date</Message> <Message>force recompilation of conf.c with current date</Message>
<Command>if exist $(IntDir)conf.obj del $(IntDir)conf.obj</Command> <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> </PreBuildEvent>
<Midl> <Midl>
<TargetEnvironment>X64</TargetEnvironment> <TargetEnvironment>X64</TargetEnvironment>
@ -179,6 +182,9 @@
<PreBuildEvent> <PreBuildEvent>
<Message>force recompilation of conf.c with current date</Message> <Message>force recompilation of conf.c with current date</Message>
<Command>if exist $(IntDir)conf.obj del $(IntDir)conf.obj</Command> <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> </PreBuildEvent>
<Midl> <Midl>
<TargetEnvironment>X64</TargetEnvironment> <TargetEnvironment>X64</TargetEnvironment>
@ -242,6 +248,9 @@
<PreBuildEvent> <PreBuildEvent>
<Message>force recompilation of conf.c with current date</Message> <Message>force recompilation of conf.c with current date</Message>
<Command>if exist $(IntDir)conf.obj del $(IntDir)conf.obj</Command> <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> </PreBuildEvent>
<Midl> <Midl>
<TargetEnvironment>X64</TargetEnvironment> <TargetEnvironment>X64</TargetEnvironment>
@ -297,6 +306,9 @@
<PreBuildEvent> <PreBuildEvent>
<Message>force recompilation of conf.c with current date</Message> <Message>force recompilation of conf.c with current date</Message>
<Command>if exist $(IntDir)conf.obj del $(IntDir)conf.obj</Command> <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> </PreBuildEvent>
<Midl> <Midl>
<TargetEnvironment>X64</TargetEnvironment> <TargetEnvironment>X64</TargetEnvironment>
@ -358,6 +370,9 @@
<PreBuildEvent> <PreBuildEvent>
<Message>force recompilation of conf.c with current date</Message> <Message>force recompilation of conf.c with current date</Message>
<Command>if exist $(IntDir)conf.obj del $(IntDir)conf.obj</Command> <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> </PreBuildEvent>
<Midl> <Midl>
<TargetEnvironment>X64</TargetEnvironment> <TargetEnvironment>X64</TargetEnvironment>
@ -423,6 +438,9 @@
<PreBuildEvent> <PreBuildEvent>
<Message>force recompilation of conf.c with current date</Message> <Message>force recompilation of conf.c with current date</Message>
<Command>if exist $(IntDir)conf.obj del $(IntDir)conf.obj</Command> <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> </PreBuildEvent>
<Midl> <Midl>
<TargetEnvironment>X64</TargetEnvironment> <TargetEnvironment>X64</TargetEnvironment>