Fix multiple compilation issues on Linux
* Circular gal<->common dependency bites again. Add 'common' again to the 'kicad' target's link libraries. libgal.a depends on SHAPE_POLY_SET in common, but common depends on gal. This is not a real fix, but it unsticks Linux compilations. Fixing the circular dep is an existing bug: https://bugs.launchpad.net/kicad/+bug/1832229 * Missing LEGACY_HK_NAME for ACT_EndTuning: this was probably accidentally allowed on some other platform due to different wxString constructors. On Linux/GCC, it breaks. * Unused include from /kicad in export_vrml.cpp. This is not findable on Linux, as pcbnew does not include the right dirs for this to be found. But it's not used, so just remove it.
This commit is contained in:
parent
b9e07f2a70
commit
1e4abac579
|
@ -76,6 +76,7 @@ else()
|
|||
target_link_libraries( kicad
|
||||
common
|
||||
gal
|
||||
common
|
||||
${wxWidgets_LIBRARIES}
|
||||
${GDI_PLUS_LIBRARIES}
|
||||
)
|
||||
|
|
|
@ -47,7 +47,6 @@
|
|||
#include "streamwrapper.h"
|
||||
#include "vrml_layer.h"
|
||||
#include "pcb_edit_frame.h"
|
||||
#include "kicad/kicad_manager_frame.h"
|
||||
|
||||
#include <convert_basic_shapes_to_polygon.h>
|
||||
#include <geometry/geometry_utils.h>
|
||||
|
|
|
@ -51,7 +51,7 @@ static TOOL_ACTION ACT_StartTuning( "pcbnew.LengthTuner.StartTuning",
|
|||
|
||||
static TOOL_ACTION ACT_EndTuning( "pcbnew.LengthTuner.EndTuning",
|
||||
AS_CONTEXT,
|
||||
WXK_END,
|
||||
WXK_END, LEGACY_HK_NAME( "Stop laying the current track." ),
|
||||
_( "End Track" ), _( "Stops laying the current meander." ) );
|
||||
|
||||
static TOOL_ACTION ACT_Settings( "pcbnew.LengthTuner.Settings",
|
||||
|
|
Loading…
Reference in New Issue