From 1e4abac579430cb366da7913b17e7f02fc77ea17 Mon Sep 17 00:00:00 2001 From: John Beard Date: Tue, 11 Jun 2019 13:58:36 +0100 Subject: [PATCH] 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. --- kicad/CMakeLists.txt | 1 + pcbnew/exporters/export_vrml.cpp | 1 - pcbnew/router/length_tuner_tool.cpp | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kicad/CMakeLists.txt b/kicad/CMakeLists.txt index 50560a73d2..10fce7fcc8 100644 --- a/kicad/CMakeLists.txt +++ b/kicad/CMakeLists.txt @@ -76,6 +76,7 @@ else() target_link_libraries( kicad common gal + common ${wxWidgets_LIBRARIES} ${GDI_PLUS_LIBRARIES} ) diff --git a/pcbnew/exporters/export_vrml.cpp b/pcbnew/exporters/export_vrml.cpp index 67ab3c28d7..ac23fdf335 100644 --- a/pcbnew/exporters/export_vrml.cpp +++ b/pcbnew/exporters/export_vrml.cpp @@ -47,7 +47,6 @@ #include "streamwrapper.h" #include "vrml_layer.h" #include "pcb_edit_frame.h" -#include "kicad/kicad_manager_frame.h" #include #include diff --git a/pcbnew/router/length_tuner_tool.cpp b/pcbnew/router/length_tuner_tool.cpp index 0fbbbb3bfc..a8b34689e8 100644 --- a/pcbnew/router/length_tuner_tool.cpp +++ b/pcbnew/router/length_tuner_tool.cpp @@ -50,8 +50,8 @@ static TOOL_ACTION ACT_StartTuning( "pcbnew.LengthTuner.StartTuning", _( "New Track" ), _( "Starts laying a new track." ) ); static TOOL_ACTION ACT_EndTuning( "pcbnew.LengthTuner.EndTuning", - AS_CONTEXT, - WXK_END, + AS_CONTEXT, + 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",