From e8d63f3eb13052ba8d813e6599a50c4eb0b6ecb4 Mon Sep 17 00:00:00 2001
From: Vojtech Kral <vojtech@kral.hk>
Date: Wed, 16 Jan 2019 12:22:17 +0100
Subject: [PATCH] Upgrade Boost to 1.66 on Windows

---
 deps/deps-windows.cmake      | 4 ++--
 src/libslic3r/CMakeLists.txt | 4 ++--
 src/libslic3r/libslic3r.h    | 4 +++-
 src/slic3r/GUI/Tab.cpp       | 2 +-
 xs/CMakeLists.txt            | 2 +-
 xs/main.xs.in                | 2 +-
 xs/src/perlglue.cpp          | 2 +-
 xs/src/xsinit.h              | 9 ++++++++-
 xs/xsp/my.map                | 6 +++---
 xs/xsp/typemap.xspt          | 6 +++---
 10 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/deps/deps-windows.cmake b/deps/deps-windows.cmake
index ec61cb422..44a1843bb 100644
--- a/deps/deps-windows.cmake
+++ b/deps/deps-windows.cmake
@@ -15,8 +15,8 @@ endif ()
 
 ExternalProject_Add(dep_boost
     EXCLUDE_FROM_ALL 1
-    URL "https://dl.bintray.com/boostorg/release/1.63.0/source/boost_1_63_0.tar.gz"
-    URL_HASH SHA256=fe34a4e119798e10b8cc9e565b3b0284e9fd3977ec8a1b19586ad1dec397088b
+    URL "https://dl.bintray.com/boostorg/release/1.66.0/source/boost_1_66_0.tar.gz"
+    URL_HASH SHA256=bd0df411efd9a585e5a2212275f8762079fed8842264954675a4fddc46cfcf60
     BUILD_IN_SOURCE 1
     CONFIGURE_COMMAND bootstrap.bat
     BUILD_COMMAND b2.exe
diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt
index c97d3d972..baf860bd4 100644
--- a/src/libslic3r/CMakeLists.txt
+++ b/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
diff --git a/src/libslic3r/libslic3r.h b/src/libslic3r/libslic3r.h
index f8088faea..19c6d3065 100644
--- a/src/libslic3r/libslic3r.h
+++ b/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"
 
diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp
index 452e3bf20..02366c721 100644
--- a/src/slic3r/GUI/Tab.cpp
+++ b/src/slic3r/GUI/Tab.cpp
@@ -1,4 +1,4 @@
-#include "libslic3r/GCodeSender.hpp"
+// #include "libslic3r/GCodeSender.hpp"
 #include "Tab.hpp"
 #include "PresetBundle.hpp"
 #include "PresetHints.hpp"
diff --git a/xs/CMakeLists.txt b/xs/CMakeLists.txt
index f14499bf9..4696badc4 100644
--- a/xs/CMakeLists.txt
+++ b/xs/CMakeLists.txt
@@ -53,7 +53,7 @@ set(XS_XSP_FILES
     ${XSP_DIR}/Filler.xsp
     ${XSP_DIR}/Flow.xsp
     ${XSP_DIR}/GCode.xsp
-    ${XSP_DIR}/GCodeSender.xsp
+    # ${XSP_DIR}/GCodeSender.xsp
     ${XSP_DIR}/Geometry.xsp
     ${XSP_DIR}/Layer.xsp
     ${XSP_DIR}/Line.xsp
diff --git a/xs/main.xs.in b/xs/main.xs.in
index d2bb2518b..3523d569e 100644
--- a/xs/main.xs.in
+++ b/xs/main.xs.in
@@ -2,7 +2,7 @@
 #include <cstdlib>
 #include <ostream>
 #include <sstream>
-#include <libslic3r/GCodeSender.hpp>
+// #include <libslic3r/GCodeSender.hpp>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/xs/src/perlglue.cpp b/xs/src/perlglue.cpp
index 98a124c3f..bcf84b957 100644
--- a/xs/src/perlglue.cpp
+++ b/xs/src/perlglue.cpp
@@ -16,7 +16,7 @@ REGISTER_CLASS(Flow, "Flow");
 REGISTER_CLASS(CoolingBuffer, "GCode::CoolingBuffer");
 REGISTER_CLASS(GCode, "GCode");
 REGISTER_CLASS(GCodePreviewData, "GCode::PreviewData");
-REGISTER_CLASS(GCodeSender, "GCode::Sender");
+// REGISTER_CLASS(GCodeSender, "GCode::Sender");
 REGISTER_CLASS(Layer, "Layer");
 REGISTER_CLASS(SupportLayer, "Layer::Support");
 REGISTER_CLASS(LayerRegion, "Layer::Region");
diff --git a/xs/src/xsinit.h b/xs/src/xsinit.h
index e36376bd1..506ef0a0b 100644
--- a/xs/src/xsinit.h
+++ b/xs/src/xsinit.h
@@ -37,7 +37,7 @@
 #include <ostream>
 #include <iostream>
 #include <sstream>
-#include <libslic3r.h>
+// #include <libslic3r.h>
 
 #ifdef SLIC3RXS
 extern "C" {
@@ -68,12 +68,19 @@ extern "C" {
     #undef fputc
     #undef fwrite
     #undef fclose
+    #undef sleep
+    #undef test
+    #undef accept
+    #undef wait
 
 	// Breaks compilation with Eigen matrices embedded into Slic3r::Point.
 	#undef malloc
 	#undef realloc
 	#undef free
 	#undef select
+
+    // Because of TBB
+    #define _WIN32_WINNT 0x0502
 #endif /* _MSC_VER */
 #undef Zero
 #undef Packet
diff --git a/xs/xsp/my.map b/xs/xsp/my.map
index 07e4a3799..fd50d2975 100644
--- a/xs/xsp/my.map
+++ b/xs/xsp/my.map
@@ -199,9 +199,9 @@ MotionPlanner*             O_OBJECT_SLIC3R
 Ref<MotionPlanner>         O_OBJECT_SLIC3R_T
 Clone<MotionPlanner>       O_OBJECT_SLIC3R_T
 
-GCodeSender*               O_OBJECT_SLIC3R
-Ref<GCodeSender>           O_OBJECT_SLIC3R_T
-Clone<GCodeSender>         O_OBJECT_SLIC3R_T
+// GCodeSender*               O_OBJECT_SLIC3R
+// Ref<GCodeSender>           O_OBJECT_SLIC3R_T
+// Clone<GCodeSender>         O_OBJECT_SLIC3R_T
 
 BridgeDetector*            O_OBJECT_SLIC3R
 Ref<BridgeDetector>        O_OBJECT_SLIC3R_T
diff --git a/xs/xsp/typemap.xspt b/xs/xsp/typemap.xspt
index 121033db4..7e277703b 100644
--- a/xs/xsp/typemap.xspt
+++ b/xs/xsp/typemap.xspt
@@ -100,9 +100,9 @@
 %typemap{MotionPlanner*};
 %typemap{Ref<MotionPlanner>}{simple};
 %typemap{Clone<MotionPlanner>}{simple};
-%typemap{GCodeSender*};
-%typemap{Ref<GCodeSender>}{simple};
-%typemap{Clone<GCodeSender>}{simple};
+// %typemap{GCodeSender*};
+// %typemap{Ref<GCodeSender>}{simple};
+// %typemap{Clone<GCodeSender>}{simple};
 %typemap{BridgeDetector*};
 %typemap{Ref<BridgeDetector>}{simple};
 %typemap{Clone<BridgeDetector>}{simple};