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

Attempt to fix build issue with NGSPICE off.

This commit is contained in:
Jeff Young 2022-12-08 15:20:02 +00:00
parent 107025322c
commit cfbf14ebfd
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
eeschema/netlist_exporters/netlist_exporter_spice.cpp
View File

@ -24,8 +24,8 @@
*/ */
#include <sim/kibis/kibis.h> #include <sim/kibis/kibis.h>
#include "netlist_exporter_spice.h" #include <netlist_exporter_spice.h>
#include "sim/ngspice_circuit_model.h" #include <sim/ngspice_circuit_model.h>
#include <sim/sim_library_spice.h> #include <sim/sim_library_spice.h>
#include <sim/sim_model_raw_spice.h> #include <sim/sim_model_raw_spice.h>
#include <sim/sim_model_ideal.h> #include <sim/sim_model_ideal.h>
@ -538,12 +538,14 @@ void NETLIST_EXPORTER_SPICE::WriteDirectives( OUTPUTFORMATTER& aFormatter,
for( const std::string& directive : m_directives ) for( const std::string& directive : m_directives )
{ {
#ifdef KICAD_SPICE
if( NGSPICE_CIRCUIT_MODEL::IsSimCommand( directive ) ) if( NGSPICE_CIRCUIT_MODEL::IsSimCommand( directive ) )
{ {
if( aNetlistOptions & OPTION_SIM_COMMAND ) if( aNetlistOptions & OPTION_SIM_COMMAND )
aFormatter.Print( 0, "%s\n", directive.c_str() ); aFormatter.Print( 0, "%s\n", directive.c_str() );
} }
else else
#endif
{ {
aFormatter.Print( 0, "%s\n", directive.c_str() ); aFormatter.Print( 0, "%s\n", directive.c_str() );
} }

2
qa/ibis/CMakeLists.txt
View File

@ -31,7 +31,7 @@ add_executable( ibis_proto
qaIbisParser.cpp qaIbisParser.cpp
${CMAKE_SOURCE_DIR}/eeschema/sim/kibis/ibis_parser.cpp ${CMAKE_SOURCE_DIR}/eeschema/sim/kibis/ibis_parser.cpp
${CMAKE_SOURCE_DIR}/eeschema/sim/kibis/kibis.cpp ${CMAKE_SOURCE_DIR}/eeschema/sim/kibis/kibis.cpp
${CMAKE_SOURCE_DIR}/eeschema/sim/ngspice_helpers.cpp ${CMAKE_SOURCE_DIR}/eeschema/sim/ngspice_circuit_model.cpp
${CMAKE_SOURCE_DIR}/eeschema/sim/ngspice.cpp ${CMAKE_SOURCE_DIR}/eeschema/sim/ngspice.cpp
) )