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

Fix a compil warning issue (mingw specific) 

also avoid to include wx/wx.h in kicad_cli.cpp, it is compil time consuming.
This commit is contained in:
jean-pierre charras 2023-03-22 08:49:26 +01:00
parent e0e2bcf20a
commit 65eb84265b
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kicad/kicad_cli.cpp
View File

@ -25,10 +25,9 @@
#include <wx/filename.h> #include <wx/filename.h>
#include <wx/log.h> #include <wx/log.h>
#include <wx/app.h>
#include <wx/stdpaths.h> #include <wx/stdpaths.h>
#include <wx/msgdlg.h> #include <wx/msgdlg.h>
#include <wx/wx.h> #include <wx/wxcrtvararg.h> //for wxPrintf
#include <kiway.h> #include <kiway.h>
#include <macros.h> #include <macros.h>
@ -75,6 +74,10 @@
#include "cli/exit_codes.h" #include "cli/exit_codes.h"
#include "cli/cli_names.h" #include "cli/cli_names.h"
// Add this header after all others, to avoid a collision name in a Windows header
// on mingw.
#include <wx/app.h>
// a dummy to quiet linking with EDA_BASE_FRAME::config(); // a dummy to quiet linking with EDA_BASE_FRAME::config();
#include <kiface_base.h> #include <kiface_base.h>
KIFACE_BASE& Kiface() KIFACE_BASE& Kiface()

2
pcbnew/exporters/step/exporter_step.cpp
View File

@ -123,7 +123,7 @@ EXPORTER_STEP::EXPORTER_STEP( BOARD* aBoard, const EXPORTER_STEP_PARAMS& aParams
m_solderMaskColor = COLOR4D( 0.08, 0.20, 0.14, 0.83 ); m_solderMaskColor = COLOR4D( 0.08, 0.20, 0.14, 0.83 );
m_copperColor = COLOR4D( 0.7, 0.61, 0.0, 1.0 ); m_copperColor = COLOR4D( 0.7, 0.61, 0.0, 1.0 );
// Init m_pcbName to the board short filename (no path, no ext) // Init m_pcbBaseName to the board short filename (no path, no ext)
// m_pcbName is used later to identify items in step file // m_pcbName is used later to identify items in step file
wxFileName fn( aBoard->GetFileName() ); wxFileName fn( aBoard->GetFileName() );
m_pcbBaseName = fn.GetName(); m_pcbBaseName = fn.GetName();