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

Merge branch 'markus_dev' of https://git.code.sf.net/p/ngspice/ngspice into markus_dev

This commit is contained in:
Markus Mueller 2020-04-29 19:04:32 +02:00
parent 2502b57eee 6ca440e584
commit d7295cbe78
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/spicelib/devices/hicum2/hicumL2.cpp
View File

@ -37,6 +37,9 @@ Spice3 Implementation: 2019 Dietmar Warning, Markus Müller, Mario Krattenmacher
*/
#include "cmath"
#ifndef M_PI
#define M_PI 3.1415926535897932384626433832795
#endif
#include <duals/dual>
#include "hicumL2.hpp"
#include <functional>

5
visualc/vngspice.vcxproj
View File

@ -211,7 +211,7 @@
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\include;..\src\spicelib\parser;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\include;..\src\spicelib\parser;.;c:\msys64\home\dwarning\cppduals\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<ExceptionHandling>
@ -1177,6 +1177,7 @@
<ClInclude Include="..\src\spicelib\devices\hicum2\hicum2ext.h" />
<ClInclude Include="..\src\spicelib\devices\hicum2\hicum2init.h" />
<ClInclude Include="..\src\spicelib\devices\hicum2\hicum2itf.h" />
<ClInclude Include="..\src\spicelib\devices\hicum2\hicumL2.hpp" />
<ClInclude Include="..\src\spicelib\devices\hisim2\hisim.h" />
<ClInclude Include="..\src\spicelib\devices\hisim2\hsm2def.h" />
<ClInclude Include="..\src\spicelib\devices\hisim2\hsm2evalenv.h" />
@ -2110,7 +2111,6 @@
<ClCompile Include="..\src\spicelib\devices\hicum2\hicum2conv.c" />
<ClCompile Include="..\src\spicelib\devices\hicum2\hicum2getic.c" />
<ClCompile Include="..\src\spicelib\devices\hicum2\hicum2init.c" />
<ClCompile Include="..\src\spicelib\devices\hicum2\hicum2load.c" />
<ClCompile Include="..\src\spicelib\devices\hicum2\hicum2mask.c" />
<ClCompile Include="..\src\spicelib\devices\hicum2\hicum2mpar.c" />
<ClCompile Include="..\src\spicelib\devices\hicum2\hicum2noise.c" />
@ -2120,6 +2120,7 @@
<ClCompile Include="..\src\spicelib\devices\hicum2\hicum2soachk.c" />
<ClCompile Include="..\src\spicelib\devices\hicum2\hicum2temp.c" />
<ClCompile Include="..\src\spicelib\devices\hicum2\hicum2trunc.c" />
<ClCompile Include="..\src\spicelib\devices\hicum2\hicumL2.cpp" />
<ClCompile Include="..\src\spicelib\devices\hisim2\hsm2.c" />
<ClCompile Include="..\src\spicelib\devices\hisim2\hsm2acld.c" />
<ClCompile Include="..\src\spicelib\devices\hisim2\hsm2ask.c" />