From 383d7f2d73066c1efdca893897b999f2d013fd06 Mon Sep 17 00:00:00 2001 From: enricoturri1966 Date: Thu, 7 May 2020 13:07:56 +0200 Subject: [PATCH] 2nd attempt to fix build on OsX --- src/slic3r/GUI/DoubleSlider.cpp | 5 ++--- src/slic3r/GUI/DoubleSlider.hpp | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/slic3r/GUI/DoubleSlider.cpp b/src/slic3r/GUI/DoubleSlider.cpp index f0940fbfd..4732ff261 100644 --- a/src/slic3r/GUI/DoubleSlider.cpp +++ b/src/slic3r/GUI/DoubleSlider.cpp @@ -1,10 +1,9 @@ -#if ENABLE_GCODE_VIEWER #include "libslic3r/libslic3r.h" -#endif // ENABLE_GCODE_VIEWER -#include "wxExtensions.hpp" #if ENABLE_GCODE_VIEWER +#include "DoubleSlider.hpp" #include "libslic3r/GCode.hpp" #else +#include "wxExtensions.hpp" #include "libslic3r/GCode/PreviewData.hpp" #endif // ENABLE_GCODE_VIEWER #include "GUI.hpp" diff --git a/src/slic3r/GUI/DoubleSlider.hpp b/src/slic3r/GUI/DoubleSlider.hpp index bf8f54d6c..36bff17e9 100644 --- a/src/slic3r/GUI/DoubleSlider.hpp +++ b/src/slic3r/GUI/DoubleSlider.hpp @@ -4,7 +4,9 @@ #include "libslic3r/CustomGCode.hpp" #include "wxExtensions.hpp" +#if !ENABLE_GCODE_VIEWER #include +#endif // !ENABLE_GCODE_VIEWER #include #include #include