mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-04 06:11:02 +00:00
Keep Windows Setup Ahead of the Added libslic3r Includes
Print.cpp and Thread.cpp open with a _WIN32 block that has to come first; without the precompiled header, Print.cpp otherwise reaches windows.h through OCCT with NONLS defined and boost/regex fails. OpenVDBUtils.cpp and SLA/SupportTreeBuilder.cpp had includes inside #ifndef NOMINMAX, which libslic3r defines on Windows, so those were skipped there. .clang-tidy also ignores the MSVC STL and UCRT internals, Boost.Multiprecision's fwd.hpp and CPython's Windows include directory.
This commit is contained in:
@@ -1,5 +1,7 @@
|
||||
#ifndef NOMINMAX
|
||||
#define NOMINMAX
|
||||
#endif
|
||||
|
||||
#include <cstddef>
|
||||
#include <openvdb/Types.h>
|
||||
#include <Eigen/Core>
|
||||
@@ -12,7 +14,6 @@
|
||||
#include "libslic3r.h"
|
||||
#include <utility>
|
||||
#include <openvdb/Metadata.h>
|
||||
#endif
|
||||
#include "OpenVDBUtils.hpp"
|
||||
|
||||
#ifdef _MSC_VER
|
||||
|
||||
@@ -1,3 +1,9 @@
|
||||
#ifdef _WIN32
|
||||
// Keep this first. A header below reaches boost/regex, whose w32_regex_traits
|
||||
// needs the Win32 types declared already.
|
||||
#include <Windows.h>
|
||||
#endif
|
||||
|
||||
#include "PrintBase.hpp"
|
||||
#include <utility>
|
||||
#include <string>
|
||||
@@ -47,11 +53,6 @@
|
||||
#include <boost/thread/lock_types.hpp>
|
||||
#include <iterator>
|
||||
#include "TriangleMesh.hpp"
|
||||
#ifdef _WIN32
|
||||
// Keep this first. A header below reaches boost/regex, whose w32_regex_traits
|
||||
// needs the Win32 types declared already.
|
||||
#include <Windows.h>
|
||||
#endif
|
||||
#include "Config.hpp"
|
||||
#include "Exception.hpp"
|
||||
#include "Print.hpp"
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
#ifndef NOMINMAX
|
||||
#define NOMINMAX
|
||||
#endif
|
||||
|
||||
#include "libslic3r/SLA/SpatIndex.hpp"
|
||||
#include "libslic3r/ExPolygon.hpp"
|
||||
#include "libslic3r/SLA/Pad.hpp"
|
||||
@@ -14,7 +16,6 @@
|
||||
#include <algorithm>
|
||||
#include "libslic3r/BoundingBox.hpp"
|
||||
#include "libslic3r/SLA/SupportTree.hpp"
|
||||
#endif
|
||||
|
||||
#include <libslic3r/SLA/SupportTreeBuilder.hpp>
|
||||
#include <libslic3r/SLA/SupportTreeBuildsteps.hpp>
|
||||
|
||||
@@ -1,10 +1,3 @@
|
||||
#include <optional>
|
||||
#include <string>
|
||||
#include <cstddef>
|
||||
#include <cassert>
|
||||
#include <sstream>
|
||||
#include <locale.h>
|
||||
#include <clocale>
|
||||
#ifdef _WIN32
|
||||
#include <windows.h>
|
||||
#include <boost/nowide/convert.hpp>
|
||||
@@ -13,6 +6,14 @@
|
||||
#include <pthread.h>
|
||||
#endif
|
||||
|
||||
#include <optional>
|
||||
#include <string>
|
||||
#include <cstddef>
|
||||
#include <cassert>
|
||||
#include <sstream>
|
||||
#include <locale.h>
|
||||
#include <clocale>
|
||||
|
||||
#include <atomic>
|
||||
#include <condition_variable>
|
||||
#include <mutex>
|
||||
|
||||
Reference in New Issue
Block a user