diff options
| author | Vojtech Kral <vojtech@kral.hk> | 2019-01-16 14:22:17 +0300 |
|---|---|---|
| committer | Vojtech Kral <vojtech@kral.hk> | 2019-01-16 17:14:18 +0300 |
| commit | e8d63f3eb13052ba8d813e6599a50c4eb0b6ecb4 (patch) | |
| tree | 08d337be9163970a224ace3c640d4d9dea9d6d01 /xs | |
| parent | 7b449a53618c226e7098cf017e6a59293ec5880d (diff) | |
Upgrade Boost to 1.66 on Windows
Diffstat (limited to 'xs')
| -rw-r--r-- | xs/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | xs/main.xs.in | 2 | ||||
| -rw-r--r-- | xs/src/perlglue.cpp | 2 | ||||
| -rw-r--r-- | xs/src/xsinit.h | 9 | ||||
| -rw-r--r-- | xs/xsp/my.map | 6 | ||||
| -rw-r--r-- | xs/xsp/typemap.xspt | 6 |
6 files changed, 17 insertions, 10 deletions
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}; |