haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not include and use sharedspice.h when KICAD_SPICE = OFF

This commit is contained in:
jean-pierre charras 2022-08-04 17:01:29 +02:00
parent d0d19423e0
commit d667d9b464
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
eeschema/sim/ngspice.h
View File

@ -32,7 +32,11 @@
#include <sim/sim_value.h> #include <sim/sim_value.h>
#include <wx/dynlib.h> #include <wx/dynlib.h>
#ifdef KICAD_SPICE
#include <ngspice/sharedspice.h> #include <ngspice/sharedspice.h>
#endif
#include <enum_vector.h> #include <enum_vector.h>
// We have an issue here where NGSPICE incorrectly used bool for years // We have an issue here where NGSPICE incorrectly used bool for years
@ -163,6 +167,7 @@ private:
// Performs DLL initialization, obtains function pointers // Performs DLL initialization, obtains function pointers
void init_dll(); void init_dll();
#ifdef KICAD_SPICE
// ngspice library functions // ngspice library functions
typedef void ( *ngSpice_Init )( SendChar*, SendStat*, ControlledExit*, SendData*, SendInitData*, typedef void ( *ngSpice_Init )( SendChar*, SendStat*, ControlledExit*, SendData*, SendInitData*,
BGThreadRunning*, void* ); BGThreadRunning*, void* );
@ -202,6 +207,7 @@ private:
static int cbBGThreadRunning( NG_BOOL aFinished, int aId, void* aUser ); static int cbBGThreadRunning( NG_BOOL aFinished, int aId, void* aUser );
static int cbControlledExit( int aStatus, NG_BOOL aImmediate, NG_BOOL aExitOnQuit, int aId, static int cbControlledExit( int aStatus, NG_BOOL aImmediate, NG_BOOL aExitOnQuit, int aId,
void* aUser ); void* aUser );
#endif
// Assure ngspice is in a valid state and reinitializes it if need be. // Assure ngspice is in a valid state and reinitializes it if need be.
void validate(); void validate();

2
eeschema/sim/ngspice_models.cpp
View File

@ -23,7 +23,7 @@
*/ */
#include <sim/ngspice.h> #include <sim/ngspice.h>
#include <macros.h>
// This script was originally autogenerated using the a bash script called // This script was originally autogenerated using the a bash script called
// generate_ngspice_models.bash, later heavily modified manually. The script can be found in the // generate_ngspice_models.bash, later heavily modified manually. The script can be found in the