3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade Boost to 1.66 on Windows

Browse Source
This commit is contained in:
Vojtech Kral 2019-01-16 12:22:17 +01:00
parent 7b449a5361
commit e8d63f3eb1
10 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deps/deps-windows.cmake vendored
View File

@ -15,8 +15,8 @@ endif ()
ExternalProject_Add(dep_boost ExternalProject_Add(dep_boost
EXCLUDE_FROM_ALL 1 EXCLUDE_FROM_ALL 1
URL "https://dl.bintray.com/boostorg/release/1.63.0/source/boost_1_63_0.tar.gz" URL "https://dl.bintray.com/boostorg/release/1.66.0/source/boost_1_66_0.tar.gz"
URL_HASH SHA256=fe34a4e119798e10b8cc9e565b3b0284e9fd3977ec8a1b19586ad1dec397088b URL_HASH SHA256=bd0df411efd9a585e5a2212275f8762079fed8842264954675a4fddc46cfcf60
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
CONFIGURE_COMMAND bootstrap.bat CONFIGURE_COMMAND bootstrap.bat
BUILD_COMMAND b2.exe BUILD_COMMAND b2.exe

4
src/libslic3r/CMakeLists.txt
View File

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

4
src/libslic3r/libslic3r.h
View File

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

2
src/slic3r/GUI/Tab.cpp
View File

@ -1,4 +1,4 @@
#include "libslic3r/GCodeSender.hpp" // #include "libslic3r/GCodeSender.hpp"
#include "Tab.hpp" #include "Tab.hpp"
#include "PresetBundle.hpp" #include "PresetBundle.hpp"
#include "PresetHints.hpp" #include "PresetHints.hpp"

2
xs/CMakeLists.txt
View File

@ -53,7 +53,7 @@ set(XS_XSP_FILES
${XSP_DIR}/Filler.xsp ${XSP_DIR}/Filler.xsp
${XSP_DIR}/Flow.xsp ${XSP_DIR}/Flow.xsp
${XSP_DIR}/GCode.xsp ${XSP_DIR}/GCode.xsp
${XSP_DIR}/GCodeSender.xsp # ${XSP_DIR}/GCodeSender.xsp
${XSP_DIR}/Geometry.xsp ${XSP_DIR}/Geometry.xsp
${XSP_DIR}/Layer.xsp ${XSP_DIR}/Layer.xsp
${XSP_DIR}/Line.xsp ${XSP_DIR}/Line.xsp

2
xs/main.xs.in
View File

@ -2,7 +2,7 @@
#include <cstdlib> #include <cstdlib>
#include <ostream> #include <ostream>
#include <sstream> #include <sstream>
#include <libslic3r/GCodeSender.hpp> // #include <libslic3r/GCodeSender.hpp>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

2
xs/src/perlglue.cpp
View File

@ -16,7 +16,7 @@ REGISTER_CLASS(Flow, "Flow");
REGISTER_CLASS(CoolingBuffer, "GCode::CoolingBuffer"); REGISTER_CLASS(CoolingBuffer, "GCode::CoolingBuffer");
REGISTER_CLASS(GCode, "GCode"); REGISTER_CLASS(GCode, "GCode");
REGISTER_CLASS(GCodePreviewData, "GCode::PreviewData"); REGISTER_CLASS(GCodePreviewData, "GCode::PreviewData");
REGISTER_CLASS(GCodeSender, "GCode::Sender"); // REGISTER_CLASS(GCodeSender, "GCode::Sender");
REGISTER_CLASS(Layer, "Layer"); REGISTER_CLASS(Layer, "Layer");
REGISTER_CLASS(SupportLayer, "Layer::Support"); REGISTER_CLASS(SupportLayer, "Layer::Support");
REGISTER_CLASS(LayerRegion, "Layer::Region"); REGISTER_CLASS(LayerRegion, "Layer::Region");

9
xs/src/xsinit.h
View File

@ -37,7 +37,7 @@
#include <ostream> #include <ostream>
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
#include <libslic3r.h> // #include <libslic3r.h>
#ifdef SLIC3RXS #ifdef SLIC3RXS
extern "C" { extern "C" {
@ -68,12 +68,19 @@ extern "C" {
#undef fputc #undef fputc
#undef fwrite #undef fwrite
#undef fclose #undef fclose
#undef sleep
#undef test
#undef accept
#undef wait
// Breaks compilation with Eigen matrices embedded into Slic3r::Point. // Breaks compilation with Eigen matrices embedded into Slic3r::Point.
#undef malloc #undef malloc
#undef realloc #undef realloc
#undef free #undef free
#undef select #undef select
// Because of TBB
#define _WIN32_WINNT 0x0502
#endif /* _MSC_VER */ #endif /* _MSC_VER */
#undef Zero #undef Zero
#undef Packet #undef Packet

6
xs/xsp/my.map
View File

@ -199,9 +199,9 @@ MotionPlanner* O_OBJECT_SLIC3R
Ref<MotionPlanner> O_OBJECT_SLIC3R_T Ref<MotionPlanner> O_OBJECT_SLIC3R_T
Clone<MotionPlanner> O_OBJECT_SLIC3R_T Clone<MotionPlanner> O_OBJECT_SLIC3R_T
GCodeSender* O_OBJECT_SLIC3R // GCodeSender* O_OBJECT_SLIC3R
Ref<GCodeSender> O_OBJECT_SLIC3R_T // Ref<GCodeSender> O_OBJECT_SLIC3R_T
Clone<GCodeSender> O_OBJECT_SLIC3R_T // Clone<GCodeSender> O_OBJECT_SLIC3R_T
BridgeDetector* O_OBJECT_SLIC3R BridgeDetector* O_OBJECT_SLIC3R
Ref<BridgeDetector> O_OBJECT_SLIC3R_T Ref<BridgeDetector> O_OBJECT_SLIC3R_T

6
xs/xsp/typemap.xspt
View File

@ -100,9 +100,9 @@
%typemap{MotionPlanner*}; %typemap{MotionPlanner*};
%typemap{Ref<MotionPlanner>}{simple}; %typemap{Ref<MotionPlanner>}{simple};
%typemap{Clone<MotionPlanner>}{simple}; %typemap{Clone<MotionPlanner>}{simple};
%typemap{GCodeSender*}; // %typemap{GCodeSender*};
%typemap{Ref<GCodeSender>}{simple}; // %typemap{Ref<GCodeSender>}{simple};
%typemap{Clone<GCodeSender>}{simple}; // %typemap{Clone<GCodeSender>}{simple};
%typemap{BridgeDetector*}; %typemap{BridgeDetector*};
%typemap{Ref<BridgeDetector>}{simple}; %typemap{Ref<BridgeDetector>}{simple};
%typemap{Clone<BridgeDetector>}{simple}; %typemap{Clone<BridgeDetector>}{simple};