Keep Windows and nanosvg Setup Ahead of the Added Includes

OrcaSlicer.cpp and several tests set _WIN32_WINNT, WIN32_LEAN_AND_MEAN or NOMINMAX before including Windows.h, and the profile validator defines NANOSVG_IMPLEMENTATION before any libslic3r header. The added includes had landed above those blocks, which broke the Windows build.
This commit is contained in:
Hanif Koh
2026-10-02 16:52:28 +08:00
parent 28dc67e382
commit 7e996ecf66
7 changed files with 62 additions and 55 deletions
+3 -2
View File
@@ -2,8 +2,6 @@
// ambiguity in the Windows COM headers.
// why: wx/timer.h must precede DeviceManager.hpp because
// DeviceErrorDialog.hpp uses wxTimerEvent.
#include <catch2/catch_test_macros.hpp>
#include "libslic3r/ProjectTask.hpp"
#ifdef WIN32
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
@@ -14,6 +12,9 @@
#include <Windows.h>
#endif
#include <catch2/catch_test_macros.hpp>
#include "libslic3r/ProjectTask.hpp"
#include <catch2/catch_all.hpp>
#include <stdexcept>