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

sim: Modifications to compile the simulator on OSX.

This commit is contained in:
Johannes Maibaum 2016-08-11 14:42:15 +02:00 committed by Maciej Suminski
parent c9a1b45666
commit c78462c4f5
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eeschema/sim/ngspice.cpp
View File

@ -37,6 +37,8 @@ NGSPICE::NGSPICE()
{ {
#ifdef __WINDOWS__ #ifdef __WINDOWS__
m_dll = new wxDynamicLibrary( "libngspice-0.dll" ); m_dll = new wxDynamicLibrary( "libngspice-0.dll" );
#elif __APPLE__
m_dll = new wxDynamicLibrary( "libngspice.dylib" );
#else #else
m_dll = new wxDynamicLibrary( "libngspice.so" ); m_dll = new wxDynamicLibrary( "libngspice.so" );
#endif #endif

4
eeschema/sim/sim_plot_panel.cpp
View File

@ -332,8 +332,8 @@ bool CURSOR::Inside( wxPoint& aPoint )
if( !m_window ) if( !m_window )
return false; return false;
return ( std::abs( aPoint.x - m_window->x2p( m_trace->x2s( m_coords.x ) ) ) <= DRAG_MARGIN ) return ( std::abs( (double) aPoint.x - m_window->x2p( m_trace->x2s( m_coords.x ) ) ) <= DRAG_MARGIN )
|| ( std::abs( aPoint.y - m_window->y2p( m_trace->y2s( m_coords.y ) ) ) <= DRAG_MARGIN ); || ( std::abs( (double) aPoint.y - m_window->y2p( m_trace->y2s( m_coords.y ) ) ) <= DRAG_MARGIN );
} }

2
eeschema/sim/simulate.cpp
View File

@ -93,7 +93,7 @@ static const unsigned char cursor_tune_mask[] = {
0x3c, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00,
0x0e, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00 }; 0x0e, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00 };
#ifdef __WXMSW__ #if defined(__WXMSW__) or defined(__WXMAC__)
struct SIM_CURSORS_INIT struct SIM_CURSORS_INIT
{ {
public: public: