Remove preprocessor flag XSPICE from MS project file, add it to config.h

instead.
Add OSDI-specific files to project.
This commit is contained in:
Holger Vogt 2022-11-12 23:12:25 +01:00
parent 71a2a3103b
commit 4ee150ed8d
2 changed files with 20 additions and 7 deletions

View File

@ -29,7 +29,7 @@
/********* Don't change entries found below ***************************/
/* The xspice enhancements */
//#define XSPICE 1
#define XSPICE 1
/* The OSDI enhancements */
#define OSDI 1

View File

@ -310,8 +310,8 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;CONFIG64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\src\maths\poly;..\src\osdi;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;SIMULATOR;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;CONFIG64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<ExceptionHandling>
</ExceptionHandling>
@ -363,7 +363,7 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<WholeProgramOptimization>true</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);CONFIG64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;SIMULATOR;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);CONFIG64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<ExceptionHandling>
</ExceptionHandling>
@ -511,7 +511,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;CONSOLE;CONFIG64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;SIMULATOR;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;CONSOLE;CONFIG64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<ExceptionHandling>
</ExceptionHandling>
@ -563,7 +563,7 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<WholeProgramOptimization>true</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);CONSOLE;CONFIG64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;SIMULATOR;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);CONSOLE;CONFIG64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<ExceptionHandling>
</ExceptionHandling>
@ -669,7 +669,7 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<WholeProgramOptimization>true</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);USE_OMP;CONFIG64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;SIMULATOR;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);USE_OMP;CONFIG64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<ExceptionHandling>
</ExceptionHandling>
@ -1090,6 +1090,9 @@
<ClInclude Include="..\src\misc\printnum.h" />
<ClInclude Include="..\src\misc\tilde.h" />
<ClInclude Include="..\src\misc\util.h" />
<ClInclude Include="..\src\osdi\osdi.h" />
<ClInclude Include="..\src\osdi\osdidefs.h" />
<ClInclude Include="..\src\osdi\osdiext.h" />
<ClInclude Include="..\src\spicelib\analysis\analysis.h" />
<ClInclude Include="..\src\spicelib\devices\asrc\asrcdefs.h" />
<ClInclude Include="..\src\spicelib\devices\asrc\asrcext.h" />
@ -1628,6 +1631,15 @@
<ClCompile Include="..\src\misc\util.c" />
<ClCompile Include="..\src\misc\wlist.c" />
<ClCompile Include="..\src\ngspice.c" />
<ClCompile Include="..\src\osdi\osdiacld.c" />
<ClCompile Include="..\src\osdi\osdicallbacks.c" />
<ClCompile Include="..\src\osdi\osdiinit.c" />
<ClCompile Include="..\src\osdi\osdiload.c" />
<ClCompile Include="..\src\osdi\osdiparam.c" />
<ClCompile Include="..\src\osdi\osdipzld.c" />
<ClCompile Include="..\src\osdi\osdiregistry.c" />
<ClCompile Include="..\src\osdi\osdisetup.c" />
<ClCompile Include="..\src\osdi\osditrunc.c" />
<ClCompile Include="..\src\spicelib\analysis\acan.c" />
<ClCompile Include="..\src\spicelib\analysis\acaskq.c" />
<ClCompile Include="..\src\spicelib\analysis\acsetp.c" />
@ -2625,6 +2637,7 @@
<ClCompile Include="..\src\spicelib\devices\vsrc\vsrctemp.c" />
<ClCompile Include="..\src\spicelib\parser\ifeval.c" />
<ClCompile Include="..\src\spicelib\parser\ifnewuid.c" />
<ClCompile Include="..\src\spicelib\parser\inp2a.c" />
<ClCompile Include="..\src\spicelib\parser\inp2b.c" />
<ClCompile Include="..\src\spicelib\parser\inp2c.c" />
<ClCompile Include="..\src\spicelib\parser\inp2d.c" />