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.

src/OrcaSlicer.cpp

@@ -1,3 +1,25 @@
+#ifdef WIN32
+    // Why?
+    #define _WIN32_WINNT 0x0502
+    // The standard Windows includes.
+    #define WIN32_LEAN_AND_MEAN
+    #ifndef NOMINMAX
+    #define NOMINMAX
+    #endif
+    #include <Windows.h>
+    #include <wchar.h>
+    #include <commctrl.h>
+    #ifdef SLIC3R_GUI
+    extern "C"
+    {
+        // Let the NVIDIA and AMD know we want to use their graphics card
+        // on a dual graphics card system.
+        __declspec(dllexport) DWORD NvOptimusEnablement = 0x00000001;
+        __declspec(dllexport) int AmdPowerXpressRequestHighPerformance = 1;
+    }
+    #endif /* SLIC3R_GUI */
+#endif /* WIN32 */
+
 #include <map>
 #include <vector>
 #include "libslic3r/PrintBase.hpp"
@@ -40,27 +62,6 @@
 #include <cassert>
 #include <boost/filesystem/exception.hpp>
 #include <signal.h>
-#ifdef WIN32
-    // Why?
-    #define _WIN32_WINNT 0x0502
-    // The standard Windows includes.
-    #define WIN32_LEAN_AND_MEAN
-    #ifndef NOMINMAX
-    #define NOMINMAX
-    #endif
-    #include <Windows.h>
-    #include <wchar.h>
-    #include <commctrl.h>
-    #ifdef SLIC3R_GUI
-    extern "C"
-    {
-        // Let the NVIDIA and AMD know we want to use their graphics card
-        // on a dual graphics card system.
-        __declspec(dllexport) DWORD NvOptimusEnablement = 0x00000001;
-        __declspec(dllexport) int AmdPowerXpressRequestHighPerformance = 1;
-    }
-    #endif /* SLIC3R_GUI */
-#endif /* WIN32 */
 
 #include <cstdio>
 #include <string>

src/dev-utils/OrcaSlicer_profile_validator.cpp

@@ -3,6 +3,11 @@
 // several of them transitively include nanosvg.h without the implementation macro, and its include
 // guard would then suppress the implementation if the macro were defined afterwards. Same pattern as
 // the test mains.
+#define NANOSVG_IMPLEMENTATION
+#include "nanosvg/nanosvg.h"
+#define NANOSVGRAST_IMPLEMENTATION
+#include "nanosvg/nanosvgrast.h"
+
 #include <vector>
 #include <boost/filesystem/path.hpp>
 #include <map>
@@ -24,10 +29,6 @@
 #include <boost/program_options/value_semantic.hpp>
 #include <boost/program_options/variables_map.hpp>
 #include <boost/program_options/errors.hpp>
-#define NANOSVG_IMPLEMENTATION
-#include "nanosvg/nanosvg.h"
-#define NANOSVGRAST_IMPLEMENTATION
-#include "nanosvg/nanosvgrast.h"
 
 #include "libslic3r/BoundingBox.hpp"
 #include "libslic3r/GCode.hpp"

tests/fff_print/test_print.cpp

@@ -1,3 +1,13 @@
+#ifdef WIN32
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
+#include <Windows.h>
+#endif
+
 #include <catch2/catch_test_macros.hpp>
 #include <string>
 #include <catch2/generators/catch_generators.hpp>
@@ -11,15 +21,6 @@
 #include "libslic3r/TriangleMesh.hpp"
 #include <catch2/matchers/catch_matchers.hpp>
 #include <catch2/matchers/catch_matchers_floating_point.hpp>
-#ifdef WIN32
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
-#include <Windows.h>
-#endif
 
 #include <catch2/catch_all.hpp>
 

tests/slic3rutils/test_dev_mapping.cpp

@@ -3,11 +3,6 @@
 // makes std::byte a competing candidate (otherwise the Windows COM headers pulled in via
 // DeviceManager.hpp error with an ambiguous `byte`). wx/timer.h must precede DeviceManager.hpp,
 // which includes DeviceErrorDialog.hpp (uses wxTimerEvent) before its own wx/timer.h include.
-#include <catch2/catch_test_macros.hpp>
-#include "slic3r/GUI/DeviceCore/DevDefs.h"
-#include "libslic3r/ProjectTask.hpp"
-#include <vector>
-#include <catch2/catch_message.hpp>
 #ifdef WIN32
     #ifndef WIN32_LEAN_AND_MEAN
         #define WIN32_LEAN_AND_MEAN
@@ -18,6 +13,12 @@
     #include <Windows.h>
 #endif
 
+#include <catch2/catch_test_macros.hpp>
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include "libslic3r/ProjectTask.hpp"
+#include <vector>
+#include <catch2/catch_message.hpp>
+
 #include <catch2/catch_all.hpp>
 
 #include <wx/timer.h>

tests/slic3rutils/test_device_progress.cpp

@@ -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>

tests/slic3rutils/test_filament_bitmap_utils.cpp

@@ -1,11 +1,6 @@
 // recompute_mixed_slot_colors lives in libslic3r_gui; this is the only suite that links it.
 // Same Windows include prologue as test_dev_mapping.cpp (wx pulls in <windows.h>; keep
 // WIN32_LEAN_AND_MEAN / NOMINMAX ahead of the Catch2 headers).
-#include <string>
-#include "libslic3r/Config.hpp"
-#include <vector>
-#include <catch2/catch_test_macros.hpp>
-#include <cstddef>
 #ifdef WIN32
     #ifndef WIN32_LEAN_AND_MEAN
         #define WIN32_LEAN_AND_MEAN
@@ -16,6 +11,12 @@
     #include <Windows.h>
 #endif
 
+#include <string>
+#include "libslic3r/Config.hpp"
+#include <vector>
+#include <catch2/catch_test_macros.hpp>
+#include <cstddef>
+
 #include <catch2/catch_all.hpp>
 
 #include <cmath>

tests/slic3rutils/test_scene_raycaster.cpp

@@ -1,13 +1,4 @@
 // Orca: This suite links libslic3r_gui; navigation raycasts need no wx application or GL context.
-#include <catch2/catch_test_macros.hpp>
-#include "slic3r/GUI/MeshUtils.hpp"
-#include "libslic3r/Point.hpp"
-#include <catch2/matchers/catch_matchers.hpp>
-#include <catch2/matchers/catch_matchers_floating_point.hpp>
-#include <catch2/generators/catch_generators.hpp>
-#include "libslic3r/TriangleMesh.hpp"
-#include "libslic3r/Geometry.hpp"
-#include <catch2/generators/catch_generators_range.hpp>
 #ifdef WIN32
     #ifndef WIN32_LEAN_AND_MEAN
         #define WIN32_LEAN_AND_MEAN
@@ -20,6 +11,16 @@
     #include <CommCtrl.h>
 #endif
 
+#include <catch2/catch_test_macros.hpp>
+#include "slic3r/GUI/MeshUtils.hpp"
+#include "libslic3r/Point.hpp"
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
+#include <catch2/generators/catch_generators.hpp>
+#include "libslic3r/TriangleMesh.hpp"
+#include "libslic3r/Geometry.hpp"
+#include <catch2/generators/catch_generators_range.hpp>
+
 #include <catch2/catch_all.hpp>
 
 #include "slic3r/GUI/Camera.hpp"