From 9dc681b1982cfaf18b6a34df508f18742dbf69ad Mon Sep 17 00:00:00 2001 From: Maciej Suminski Date: Thu, 11 Aug 2016 14:41:04 +0200 Subject: [PATCH] Build fixes (for mathgl2) --- eeschema/CMakeLists.txt | 2 +- eeschema/sim/sim_plot_panel.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt index 2405ec36d2..183f9b1a82 100644 --- a/eeschema/CMakeLists.txt +++ b/eeschema/CMakeLists.txt @@ -249,7 +249,7 @@ set_source_files_properties( ../common/single_top.cpp PROPERTIES ) #if (KICAD_SPICE) - set ( EESCHEMA_LINK_LIBS ${wxWidgets_LIBRARIES} mgl-wx mgl mgl-wx) + set ( EESCHEMA_LINK_LIBS ${wxWidgets_LIBRARIES} mgl2 mgl2-wx) #else() # set ( EESCHEMA_LINK_LIBS ${wxWidgets_LIBRARIES} ) #endif() diff --git a/eeschema/sim/sim_plot_panel.cpp b/eeschema/sim/sim_plot_panel.cpp index 9e74dd34b0..b3e16a8ccf 100644 --- a/eeschema/sim/sim_plot_panel.cpp +++ b/eeschema/sim/sim_plot_panel.cpp @@ -1,5 +1,4 @@ #include "sim_plot_panel.h" -#include static SIM_PLOT_PANEL *panel = NULL;