Merged with dev

2018-09-12 11:59:02 +02:00
parent 41ce69f327 a97df55592
commit 0235f1a821
1491 changed files with 514153 additions and 29226 deletions
--- a/xs/src/slic3r/GUI/BackgroundSlicingProcess.cpp
+++ b/xs/src/slic3r/GUI/BackgroundSlicingProcess.cpp
@@ -1,11 +1,12 @@
 #include "BackgroundSlicingProcess.hpp"
 #include "GUI.hpp"

-#include "../../libslic3r/Print.hpp"
-
 #include <wx/event.h>
 #include <wx/panel.h>

+// Print now includes tbb, and tbb includes Windows. This breaks compilation of wxWidgets if included before wx.
+#include "../../libslic3r/Print.hpp"
+
 //#undef NDEBUG
 #include <cassert>
 #include <stdexcept>