diff --git a/visualc/KLU/KLU_COMPLEX.vcxproj b/visualc/KLU/KLU_COMPLEX.vcxproj index 7e871a87e..e4222f58e 100644 --- a/visualc/KLU/KLU_COMPLEX.vcxproj +++ b/visualc/KLU/KLU_COMPLEX.vcxproj @@ -1,6 +1,14 @@  + + Debug-fftw + Win32 + + + Debug-fftw + x64 + Debug Win32 @@ -9,6 +17,14 @@ Debug x64 + + ReleaseOMP-fftw + Win32 + + + ReleaseOMP-fftw + x64 + Release Win32 @@ -28,44 +44,80 @@ StaticLibrary v142 + + StaticLibrary + v142 + StaticLibrary v142 + + StaticLibrary + v142 + StaticLibrary v143 + + StaticLibrary + v143 + StaticLibrary v143 + + StaticLibrary + v143 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 Debug\ + Debug\ Debug\ + Debug\ Release\ + Release\ Release\ + Release\ $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ @@ -83,6 +135,22 @@ true + + + Disabled + $(ProjectDir)..\src\include\;$(ProjectDir)..\..\src\include\;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;SIMULATOR;NGDEBUG;XSPICE;KLU;COMPLEX;%(PreprocessorDefinitions) + true + Default + MultiThreadedDebug + + + Level4 + EditAndContinue + CompileAsC + true + + Full @@ -101,6 +169,24 @@ CompileAsC + + + Full + Speed + true + $(ProjectDir)..\src\include\;$(ProjectDir)..\..\src\include\;%(AdditionalIncludeDirectories) + WIN32;_LIB;COMPLEX;%(PreprocessorDefinitions) + + + MultiThreaded + true + + + Level3 + ProgramDatabase + CompileAsC + + X64 @@ -119,6 +205,24 @@ CompileAsC + + + X64 + + + Disabled + $(ProjectDir)..\src\include\;$(ProjectDir)..\..\src\include\;%(AdditionalIncludeDirectories) + _DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;SIMULATOR;NGDEBUG;XSPICE;KLU;COMPLEX;%(PreprocessorDefinitions) + true + Default + MultiThreadedDebug + + + Level4 + ProgramDatabase + CompileAsC + + X64 @@ -140,6 +244,27 @@ CompileAsC + + + X64 + + + Full + Speed + true + $(ProjectDir)..\src\include\;$(ProjectDir)..\..\src\include\;%(AdditionalIncludeDirectories) + _LIB;COMPLEX;%(PreprocessorDefinitions) + + + MultiThreaded + true + + + Level3 + ProgramDatabase + CompileAsC + + diff --git a/visualc/sharedspice.sln b/visualc/sharedspice.sln index b63b8234c..3969057dd 100644 --- a/visualc/sharedspice.sln +++ b/visualc/sharedspice.sln @@ -14,16 +14,24 @@ Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 + Debug-fftw|x64 = Debug-fftw|x64 + Debug-fftw|x86 = Debug-fftw|x86 Release|x64 = Release|x64 Release|x86 = Release|x86 ReleaseOMP|x64 = ReleaseOMP|x64 ReleaseOMP|x86 = ReleaseOMP|x86 + ReleaseOMP-fftw|x64 = ReleaseOMP-fftw|x64 + ReleaseOMP-fftw|x86 = ReleaseOMP-fftw|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.Debug|x64.ActiveCfg = Debug|x64 {83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.Debug|x64.Build.0 = Debug|x64 {83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.Debug|x86.ActiveCfg = Debug|Win32 {83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.Debug|x86.Build.0 = Debug|Win32 + {83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.Debug-fftw|x64.ActiveCfg = Debug-fftw|x64 + {83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.Debug-fftw|x64.Build.0 = Debug-fftw|x64 + {83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.Debug-fftw|x86.ActiveCfg = Debug-fftw|Win32 + {83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.Debug-fftw|x86.Build.0 = Debug-fftw|Win32 {83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.Release|x64.ActiveCfg = Release|x64 {83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.Release|x64.Build.0 = Release|x64 {83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.Release|x86.ActiveCfg = Release|Win32 @@ -32,10 +40,18 @@ Global {83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.ReleaseOMP|x64.Build.0 = ReleaseOMP|x64 {83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.ReleaseOMP|x86.ActiveCfg = ReleaseOMP|Win32 {83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.ReleaseOMP|x86.Build.0 = ReleaseOMP|Win32 + {83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.ReleaseOMP-fftw|x64.ActiveCfg = ReleaseOMP-fftw|x64 + {83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.ReleaseOMP-fftw|x64.Build.0 = ReleaseOMP-fftw|x64 + {83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.ReleaseOMP-fftw|x86.ActiveCfg = ReleaseOMP-fftw|Win32 + {83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.ReleaseOMP-fftw|x86.Build.0 = ReleaseOMP-fftw|Win32 {B8DD41C5-70C6-4183-9018-C4B518E8D36A}.Debug|x64.ActiveCfg = Debug|x64 {B8DD41C5-70C6-4183-9018-C4B518E8D36A}.Debug|x64.Build.0 = Debug|x64 {B8DD41C5-70C6-4183-9018-C4B518E8D36A}.Debug|x86.ActiveCfg = Debug|Win32 {B8DD41C5-70C6-4183-9018-C4B518E8D36A}.Debug|x86.Build.0 = Debug|Win32 + {B8DD41C5-70C6-4183-9018-C4B518E8D36A}.Debug-fftw|x64.ActiveCfg = Debug-fftw|x64 + {B8DD41C5-70C6-4183-9018-C4B518E8D36A}.Debug-fftw|x64.Build.0 = Debug-fftw|x64 + {B8DD41C5-70C6-4183-9018-C4B518E8D36A}.Debug-fftw|x86.ActiveCfg = Debug-fftw|Win32 + {B8DD41C5-70C6-4183-9018-C4B518E8D36A}.Debug-fftw|x86.Build.0 = Debug-fftw|Win32 {B8DD41C5-70C6-4183-9018-C4B518E8D36A}.Release|x64.ActiveCfg = Release|x64 {B8DD41C5-70C6-4183-9018-C4B518E8D36A}.Release|x64.Build.0 = Release|x64 {B8DD41C5-70C6-4183-9018-C4B518E8D36A}.Release|x86.ActiveCfg = Release|Win32 @@ -44,6 +60,10 @@ Global {B8DD41C5-70C6-4183-9018-C4B518E8D36A}.ReleaseOMP|x64.Build.0 = Release|x64 {B8DD41C5-70C6-4183-9018-C4B518E8D36A}.ReleaseOMP|x86.ActiveCfg = Release|Win32 {B8DD41C5-70C6-4183-9018-C4B518E8D36A}.ReleaseOMP|x86.Build.0 = Release|Win32 + {B8DD41C5-70C6-4183-9018-C4B518E8D36A}.ReleaseOMP-fftw|x64.ActiveCfg = ReleaseOMP-fftw|x64 + {B8DD41C5-70C6-4183-9018-C4B518E8D36A}.ReleaseOMP-fftw|x64.Build.0 = ReleaseOMP-fftw|x64 + {B8DD41C5-70C6-4183-9018-C4B518E8D36A}.ReleaseOMP-fftw|x86.ActiveCfg = ReleaseOMP-fftw|Win32 + {B8DD41C5-70C6-4183-9018-C4B518E8D36A}.ReleaseOMP-fftw|x86.Build.0 = ReleaseOMP-fftw|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/visualc/sharedspice.vcxproj b/visualc/sharedspice.vcxproj index cf35c3d7a..bce301c2a 100644 --- a/visualc/sharedspice.vcxproj +++ b/visualc/sharedspice.vcxproj @@ -1,10 +1,26 @@  + + Debug-fftw + Win32 + + + Debug-fftw + x64 + Debug Win32 + + ReleaseOMP-fftw + Win32 + + + ReleaseOMP-fftw + x64 + Release Win32 @@ -35,6 +51,10 @@ DynamicLibrary v143 + + DynamicLibrary + v143 + DynamicLibrary v143 @@ -43,6 +63,10 @@ DynamicLibrary v143 + + DynamicLibrary + v143 + DynamicLibrary v143 @@ -51,31 +75,51 @@ DynamicLibrary v143 + + DynamicLibrary + v143 + DynamicLibrary v143 + + DynamicLibrary + v143 + + + + + + + + + + + + + <_ProjectFileVersion>14.0.23107.0 @@ -86,21 +130,33 @@ + + + + + + + + + + + + force recompilation of conf.c with actual date @@ -145,6 +201,56 @@ KLU/Debug/;%(AdditionalLibraryDirectories) + + + force recompilation of conf.c with actual date + if exist $(IntDir)conf.obj del $(IntDir)conf.obj + + + + + + + + + Disabled + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;..\src\spicelib\parser;src\include;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;SHARED_MODULE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;%(PreprocessorDefinitions) + false + false + false + + + EnableFastChecks + MultiThreadedDebug + false + + + Level4 + ProgramDatabase + Default + true + stdcpp14 + + + psapi.lib;KLU_COMPLEX.lib;%(AdditionalDependencies) + true + false + Windows + 0 + 0 + 0 + 0 + + + false + + + MachineX86 + true + KLU/Debug/;%(AdditionalLibraryDirectories) + + force recompilation of conf.c with actual date @@ -230,6 +336,48 @@ KLU\x64\Debug;%(AdditionalLibraryDirectories) + + + force recompilation of conf.c with current date + if exist $(IntDir)conf.obj del $(IntDir)conf.obj +lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib + + + Disabled + ..\src\maths\poly;..\src\osdi;..\src\frontend;..\src\spicelib\devices;tmp-bison;..\src\spicelib\parser;src\include;..\src\include;..\src\include\cppduals;.;..\..\fftw-3.3-dll64;%(AdditionalIncludeDirectories) + HAVE_LIBFFTW3;_CRT_SECURE_NO_DEPRECATE;SIMULATOR;SHARED_MODULE;CONFIG64;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;%(PreprocessorDefinitions) + false + false + false + + + EnableFastChecks + MultiThreadedDebug + false + + + Level4 + ProgramDatabase + Default + true + stdcpp14 + /openmp:llvm %(AdditionalOptions) + + + psapi.lib;KLU_COMPLEX.lib;$(IntDir)libfftw3-3.lib;%(AdditionalDependencies) + true + false + Windows + 0 + 0 + 4194304 + 1048576 + false + + + KLU\x64\Debug;%(AdditionalLibraryDirectories) + + force recompilation of conf.c with current date @@ -319,6 +467,50 @@ KLU/Release/;%(AdditionalLibraryDirectories) + + + force recompilation of conf.c with actual date + if exist $(IntDir)conf.obj del $(IntDir)conf.obj + + + Full + Speed + true + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;..\src\spicelib\parser;src\include;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;SHARED_MODULE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);USE_OMP;%(PreprocessorDefinitions) + false + + + MultiThreaded + false + true + + + Level4 + ProgramDatabase + Default + true + stdcpp14 + + + psapi.lib;KLU_COMPLEX.lib;%(AdditionalDependencies) + true + Windows + 0 + 0 + 0 + 0 + true + true + UseLinkTimeCodeGeneration + false + + + MachineX86 + true + KLU/Release/;%(AdditionalLibraryDirectories) + + force recompilation of conf.c with current date @@ -370,6 +562,58 @@ KLU\x64\Release;%(AdditionalLibraryDirectories) + + + force recompilation of conf.c with current date + if exist $(IntDir)conf.obj del $(IntDir)conf.obj +lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib + + + + + + + + + Full + Speed + true + ..\src\maths\poly;..\src\osdi;..\src\frontend;..\src\spicelib\devices;tmp-bison;..\src\spicelib\parser;src\include;..\src\include;..\src\include\cppduals;.;..\..\fftw-3.3-dll64;%(AdditionalIncludeDirectories) + HAVE_LIBFFTW3;_CRT_SECURE_NO_DEPRECATE;SIMULATOR;SHARED_MODULE;CONFIG64;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);USE_OMP;%(PreprocessorDefinitions) + false + + + MultiThreaded + false + + + + + Level4 + ProgramDatabase + Default + true + stdcpp14 + /openmp:llvm %(AdditionalOptions) + + + psapi.lib;KLU_COMPLEX.lib;$(IntDir)libfftw3-3.lib;%(AdditionalDependencies) + true + Windows + 0 + 0 + 4194304 + 1048576 + true + true + UseLinkTimeCodeGeneration + false + + + true + KLU\x64\Release;%(AdditionalLibraryDirectories) + +