Merge remote-tracking branch 'origin/master' into tm_colldetection_upgr

src/libslic3r/CMakeLists.txt

@@ -88,8 +88,8 @@ add_library(libslic3r STATIC
     GCode.hpp
     GCodeReader.cpp
     GCodeReader.hpp
-    GCodeSender.cpp
-    GCodeSender.hpp
+    # GCodeSender.cpp
+    # GCodeSender.hpp
     GCodeTimeEstimator.cpp
     GCodeTimeEstimator.hpp
     GCodeWriter.cpp

src/libslic3r/libslic3r.h

@@ -4,6 +4,8 @@
 #include "libslic3r_version.h"
 
 // this needs to be included early for MSVC (listing it in Build.PL is not enough)
+#include <memory>
+#include <algorithm>
 #include <ostream>
 #include <iostream>
 #include <math.h>
@@ -13,7 +15,7 @@
 #include <stdint.h>
 #include <stdarg.h>
 #include <vector>
-#include <boost/thread.hpp>
+#include <cassert>
 
 #include "Technologies.hpp"