3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-10 08:17:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer

Browse source
This commit is contained in:
enricoturri1966 2020-08-27 08:00:45 +02:00
commit 88b6835258
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/slic3r/GUI/MainFrame.cpp
View file

@ -13,7 +13,6 @@
#include <wx/debug.h>
#include <boost/algorithm/string/predicate.hpp>
#include <boost/process/spawn.hpp>
#include "libslic3r/Print.hpp"
#include "libslic3r/Polygon.hpp"
@ -41,6 +40,12 @@
#include <shlobj.h>
#endif // _WIN32
// For starting another PrusaSlicer instance on OSX.
// Fails to compile on Windows on the build server.
#ifdef __APPLE__
#include <boost/process/spawn.hpp>
#endif
namespace Slic3r {
namespace GUI {