Revert "Reorder includes is some simulator files to fix issues on msys2 (no code change)"
This reverts commit 78e45fa1b9
.
Looks like it creates a compil issue on MSVC
This commit is contained in:
parent
7e3964e5cb
commit
7c9f3981ef
|
@ -24,7 +24,6 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "connection_graph.h"
|
#include "connection_graph.h"
|
||||||
#include "sim/sim_model.h"
|
|
||||||
#include <common.h> // for ExpandEnvVarSubstitutions
|
#include <common.h> // for ExpandEnvVarSubstitutions
|
||||||
#include <erc.h>
|
#include <erc.h>
|
||||||
#include <string_utils.h>
|
#include <string_utils.h>
|
||||||
|
@ -42,6 +41,8 @@
|
||||||
#include <drawing_sheet/ds_proxy_view_item.h>
|
#include <drawing_sheet/ds_proxy_view_item.h>
|
||||||
#include <wx/ffile.h>
|
#include <wx/ffile.h>
|
||||||
|
|
||||||
|
#include "sim/sim_model.h"
|
||||||
|
|
||||||
|
|
||||||
/* ERC tests :
|
/* ERC tests :
|
||||||
* 1 - conflicts between connected pins ( example: 2 connected outputs )
|
* 1 - conflicts between connected pins ( example: 2 connected outputs )
|
||||||
|
|
|
@ -27,14 +27,12 @@
|
||||||
#ifndef NGSPICE_H
|
#ifndef NGSPICE_H
|
||||||
#define NGSPICE_H
|
#define NGSPICE_H
|
||||||
|
|
||||||
#include <wx/dynlib.h>
|
#include <sim/spice_simulator.h>
|
||||||
|
|
||||||
// Include simulator headers after wxWidgets headers to avoid conflicts with Windows headers
|
|
||||||
// (especially on msys2)
|
|
||||||
#include "sim/spice_simulator.h"
|
|
||||||
#include <sim/sim_model.h>
|
#include <sim/sim_model.h>
|
||||||
#include <sim/sim_value.h>
|
#include <sim/sim_value.h>
|
||||||
|
|
||||||
|
#include <wx/dynlib.h>
|
||||||
|
|
||||||
#include <ngspice/sharedspice.h>
|
#include <ngspice/sharedspice.h>
|
||||||
|
|
||||||
#include <enum_vector.h>
|
#include <enum_vector.h>
|
||||||
|
|
|
@ -22,15 +22,12 @@
|
||||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <sim/sim_lib_mgr.h>
|
||||||
#include <sch_symbol.h>
|
#include <sch_symbol.h>
|
||||||
#include <pgm_base.h>
|
|
||||||
#include <string>
|
|
||||||
|
|
||||||
// Include simulator headers after wxWidgets headers to avoid conflicts with Windows headers
|
|
||||||
// (especially on msys2)
|
|
||||||
#include <sim/sim_library.h>
|
#include <sim/sim_library.h>
|
||||||
#include <sim/sim_model.h>
|
#include <sim/sim_model.h>
|
||||||
#include <sim/sim_lib_mgr.h>
|
#include <pgm_base.h>
|
||||||
|
#include <string>
|
||||||
|
|
||||||
|
|
||||||
SIM_LIB_MGR::SIM_LIB_MGR( const PROJECT& aPrj ) : m_project( aPrj )
|
SIM_LIB_MGR::SIM_LIB_MGR( const PROJECT& aPrj ) : m_project( aPrj )
|
||||||
|
|
|
@ -22,9 +22,6 @@
|
||||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <lib_symbol.h>
|
|
||||||
#include <confirm.h>
|
|
||||||
|
|
||||||
#include <sim/sim_model.h>
|
#include <sim/sim_model.h>
|
||||||
#include <sim/sim_model_behavioral.h>
|
#include <sim/sim_model_behavioral.h>
|
||||||
#include <sim/sim_model_ideal.h>
|
#include <sim/sim_model_ideal.h>
|
||||||
|
@ -41,6 +38,9 @@
|
||||||
|
|
||||||
#include <sim/sim_library_kibis.h>
|
#include <sim/sim_library_kibis.h>
|
||||||
|
|
||||||
|
#include <lib_symbol.h>
|
||||||
|
#include <confirm.h>
|
||||||
|
|
||||||
#include <boost/algorithm/string/case_conv.hpp>
|
#include <boost/algorithm/string/case_conv.hpp>
|
||||||
#include <boost/algorithm/string/trim.hpp>
|
#include <boost/algorithm/string/trim.hpp>
|
||||||
#include <boost/algorithm/string.hpp>
|
#include <boost/algorithm/string.hpp>
|
||||||
|
|
|
@ -21,15 +21,14 @@
|
||||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <sim/kibis/kibis.h>
|
||||||
|
#include <sim/sim_model_kibis.h>
|
||||||
|
#include <sim/sim_library_kibis.h>
|
||||||
#include <paths.h>
|
#include <paths.h>
|
||||||
#include <fmt/core.h>
|
#include <fmt/core.h>
|
||||||
#include <wx/filename.h>
|
#include <wx/filename.h>
|
||||||
#include <kiway.h>
|
#include <kiway.h>
|
||||||
|
|
||||||
#include <sim/kibis/kibis.h>
|
|
||||||
#include <sim/sim_model_kibis.h>
|
|
||||||
#include <sim/sim_library_kibis.h>
|
|
||||||
|
|
||||||
std::string SPICE_GENERATOR_KIBIS::ModelName( const SPICE_ITEM& aItem ) const
|
std::string SPICE_GENERATOR_KIBIS::ModelName( const SPICE_ITEM& aItem ) const
|
||||||
{
|
{
|
||||||
return fmt::format( "{}.{}", aItem.refName, aItem.baseModelName );
|
return fmt::format( "{}.{}", aItem.refName, aItem.baseModelName );
|
||||||
|
|
|
@ -21,14 +21,12 @@
|
||||||
* or you may write to the Free Software Foundation, Inc.,
|
* or you may write to the Free Software Foundation, Inc.,
|
||||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
#include <confirm.h>
|
|
||||||
|
|
||||||
// Include simulator headers after wxWidgets headers to avoid conflicts with Windows headers
|
|
||||||
// (especially on msys2)
|
|
||||||
#include <sim/sim_model_spice.h>
|
#include <sim/sim_model_spice.h>
|
||||||
#include <sim/sim_model_raw_spice.h>
|
#include <sim/sim_model_raw_spice.h>
|
||||||
#include <sim/spice_model_parser.h>
|
#include <sim/spice_model_parser.h>
|
||||||
#include <sim/sim_library_spice.h>
|
#include <sim/sim_library_spice.h>
|
||||||
|
#include <confirm.h>
|
||||||
|
|
||||||
#include <boost/algorithm/string/trim.hpp>
|
#include <boost/algorithm/string/trim.hpp>
|
||||||
|
|
||||||
|
|
|
@ -26,9 +26,6 @@
|
||||||
|
|
||||||
#include <wx/debug.h>
|
#include <wx/debug.h>
|
||||||
#include <wx/stc/stc.h>
|
#include <wx/stc/stc.h>
|
||||||
// For some obscure reason, needed on msys2 with some wxWidgets versions (3.0) to avoid
|
|
||||||
// undefined symbol at link stage (due to use of #include <pegtl.hpp>)
|
|
||||||
#include <wx/menu.h>
|
|
||||||
|
|
||||||
#include <project/project_file.h>
|
#include <project/project_file.h>
|
||||||
#include <sch_edit_frame.h>
|
#include <sch_edit_frame.h>
|
||||||
|
@ -43,6 +40,12 @@
|
||||||
#include "string_utils.h"
|
#include "string_utils.h"
|
||||||
#include "ngspice_helpers.h"
|
#include "ngspice_helpers.h"
|
||||||
#include <pgm_base.h>
|
#include <pgm_base.h>
|
||||||
|
#include "ngspice.h"
|
||||||
|
#include "sim_plot_colors.h"
|
||||||
|
#include "sim_plot_frame.h"
|
||||||
|
#include "sim_plot_panel.h"
|
||||||
|
#include "spice_simulator.h"
|
||||||
|
#include "spice_reporter.h"
|
||||||
#include <menus_helpers.h>
|
#include <menus_helpers.h>
|
||||||
#include <tool/tool_manager.h>
|
#include <tool/tool_manager.h>
|
||||||
#include <tools/ee_actions.h>
|
#include <tools/ee_actions.h>
|
||||||
|
@ -52,14 +55,6 @@
|
||||||
#include <dialog_shim.h>
|
#include <dialog_shim.h>
|
||||||
#include <wx_filename.h>
|
#include <wx_filename.h>
|
||||||
|
|
||||||
// Include simulator headers after wxWidgets headers to avoid conflicts with Windows headers
|
|
||||||
// (especially on msys2)
|
|
||||||
#include "ngspice.h"
|
|
||||||
#include "sim_plot_colors.h"
|
|
||||||
#include "sim_plot_frame.h"
|
|
||||||
#include "sim_plot_panel.h"
|
|
||||||
#include "spice_simulator.h"
|
|
||||||
#include "spice_reporter.h"
|
|
||||||
|
|
||||||
SIM_PLOT_TYPE operator|( SIM_PLOT_TYPE aFirst, SIM_PLOT_TYPE aSecond )
|
SIM_PLOT_TYPE operator|( SIM_PLOT_TYPE aFirst, SIM_PLOT_TYPE aSecond )
|
||||||
{
|
{
|
||||||
|
|
|
@ -21,17 +21,15 @@
|
||||||
* or you may write to the Free Software Foundation, Inc.,
|
* or you may write to the Free Software Foundation, Inc.,
|
||||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <sim/sim_property.h>
|
||||||
|
#include <sim/sim_value.h>
|
||||||
#include <ki_exception.h>
|
#include <ki_exception.h>
|
||||||
#include <confirm.h>
|
#include <confirm.h>
|
||||||
#include <wx/combo.h>
|
#include <wx/combo.h>
|
||||||
#include <wx/combobox.h>
|
#include <wx/combobox.h>
|
||||||
#include <wx/notebook.h>
|
#include <wx/notebook.h>
|
||||||
|
|
||||||
// Include simulator headers after wxWidgets headers to avoid conflicts with Windows headers
|
|
||||||
// (especially on msys2)
|
|
||||||
#include <sim/sim_property.h>
|
|
||||||
#include <sim/sim_value.h>
|
|
||||||
|
|
||||||
|
|
||||||
wxBEGIN_EVENT_TABLE( SIM_VALIDATOR, wxValidator )
|
wxBEGIN_EVENT_TABLE( SIM_VALIDATOR, wxValidator )
|
||||||
EVT_KEY_DOWN( SIM_VALIDATOR::onKeyDown )
|
EVT_KEY_DOWN( SIM_VALIDATOR::onKeyDown )
|
||||||
|
|
|
@ -25,15 +25,13 @@
|
||||||
#ifndef SIM_PROPERTY_H
|
#ifndef SIM_PROPERTY_H
|
||||||
#define SIM_PROPERTY_H
|
#define SIM_PROPERTY_H
|
||||||
|
|
||||||
|
#include <sim/sim_model.h>
|
||||||
#include <wx/window.h>
|
#include <wx/window.h>
|
||||||
#include <wx/notebook.h>
|
#include <wx/notebook.h>
|
||||||
#include <wx/propgrid/propgrid.h>
|
#include <wx/propgrid/propgrid.h>
|
||||||
#include <wx/propgrid/manager.h>
|
#include <wx/propgrid/manager.h>
|
||||||
#include <wx/propgrid/props.h>
|
#include <wx/propgrid/props.h>
|
||||||
|
|
||||||
// Include this header after wxWidgets headers to avoid conflicts with Windows headers
|
|
||||||
// (especially on msys2)
|
|
||||||
#include <sim/sim_model.h>
|
|
||||||
|
|
||||||
class SIM_VALIDATOR : public wxValidator
|
class SIM_VALIDATOR : public wxValidator
|
||||||
{
|
{
|
||||||
|
|
|
@ -29,11 +29,9 @@
|
||||||
#include <optional>
|
#include <optional>
|
||||||
#include <complex>
|
#include <complex>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
|
||||||
// Include this header after wxWidgets headers to avoid conflicts with Windows headers
|
|
||||||
// (especially on msys2)
|
|
||||||
#include <pegtl.hpp>
|
#include <pegtl.hpp>
|
||||||
|
|
||||||
|
|
||||||
namespace SIM_VALUE_GRAMMAR
|
namespace SIM_VALUE_GRAMMAR
|
||||||
{
|
{
|
||||||
using namespace tao::pegtl;
|
using namespace tao::pegtl;
|
||||||
|
|
|
@ -23,12 +23,10 @@
|
||||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <confirm.h>
|
|
||||||
|
|
||||||
// Include simulator headers after wxWidgets headers to avoid conflicts with Windows headers
|
|
||||||
// (especially on msys2)
|
|
||||||
#include "ngspice.h"
|
#include "ngspice.h"
|
||||||
|
|
||||||
|
#include <confirm.h>
|
||||||
|
|
||||||
std::shared_ptr<SPICE_SIMULATOR> SIMULATOR::CreateInstance( const std::string& )
|
std::shared_ptr<SPICE_SIMULATOR> SIMULATOR::CreateInstance( const std::string& )
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
|
|
|
@ -22,10 +22,11 @@
|
||||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "spice_value.h"
|
||||||
|
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
|
|
||||||
#include <wx/event.h>
|
|
||||||
#include <wx/textentry.h>
|
#include <wx/textentry.h>
|
||||||
#include <wx/numformatter.h>
|
#include <wx/numformatter.h>
|
||||||
#include <confirm.h>
|
#include <confirm.h>
|
||||||
|
@ -33,11 +34,6 @@
|
||||||
#include <ki_exception.h>
|
#include <ki_exception.h>
|
||||||
#include <locale_io.h>
|
#include <locale_io.h>
|
||||||
|
|
||||||
// Include simulator headers after wxWidgets headers to avoid conflicts with Windows headers
|
|
||||||
// (especially on msys2)
|
|
||||||
#include "spice_value.h"
|
|
||||||
|
|
||||||
|
|
||||||
SPICE_VALUE::SPICE_VALUE( const wxString& aString )
|
SPICE_VALUE::SPICE_VALUE( const wxString& aString )
|
||||||
{
|
{
|
||||||
char buf[8] = { 0, };
|
char buf[8] = { 0, };
|
||||||
|
|
Loading…
Reference in New Issue