17
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-10-17 09:49:19 +02:00

parse windows.h before any import reaches betterRenderer

Six module interfaces carry windows.h in their fragment, and a fragment's
include guard does not cross the boundary, so a unit that imported first
and included the SDK afterwards parsed it twice: clang reports it as
conflicting redeclarations of BroadcastSystemMessageEx and mismatched
uuids all through the SDK. Same shape as the basic_filebuf failure, one
level further out - the header arrives through d3d12.h, not directly.

Thirty units get a guarded windows.h ahead of everything; on Linux it is
a no-op. Vendored single-header libraries are left alone, and the block
goes after a BOM rather than before it.
This commit is contained in:
maj00r
2026-09-10 15:40:52 +02:00
parent eff5ce687f
commit 61b3ec6f3f
30 changed files with 93 additions and 3 deletions

View File

@@ -1,3 +1,6 @@
#ifdef _WIN32
#include <windows.h> // before any import: its guard must be set here
#endif
#include <memory>
#include "nvrenderer/nvrenderer.h"

View File

@@ -1,4 +1,7 @@
#pragma once
#ifdef _WIN32
#include <windows.h> // before any import: its guard must be set here
#endif
//STL includes required by EU07 includes
#include <array>

View File

@@ -1,4 +1,7 @@
#pragma once
#ifdef _WIN32
#include <windows.h> // before any import: its guard must be set here
#endif
#include <array>
#include <memory>

View File

@@ -1,4 +1,7 @@
#pragma once
#ifdef _WIN32
#include <windows.h> // before any import: its guard must be set here
#endif
#include <cstddef>
#include <cstdint>

View File

@@ -1,4 +1,7 @@
#pragma once
#ifdef _WIN32
#include <windows.h> // before any import: its guard must be set here
#endif
#include <vector>
#include <nvrhi/nvrhi.h>

View File

@@ -1,4 +1,7 @@
#pragma once
#ifdef _WIN32
#include <windows.h> // before any import: its guard must be set here
#endif
#include <cstdint>
#include <nvrhi/nvrhi.h>

View File

@@ -1,3 +1,6 @@
#ifdef _WIN32
#include <windows.h> // before any import: its guard must be set here
#endif
#include <cstddef>
#include <cstdint>
#include <map>

View File

@@ -1,3 +1,6 @@
#ifdef _WIN32
#include <windows.h> // before any import: its guard must be set here
#endif
#include <queue>
#include "fsr.h"

View File

@@ -1,4 +1,7 @@
#pragma once
#ifdef _WIN32
#include <windows.h> // before any import: its guard must be set here
#endif
#include <cstddef>
#include <string>

View File

@@ -1,3 +1,6 @@
#ifdef _WIN32
#include <windows.h> // before any import: its guard must be set here
#endif
#include <chrono>
#include "gbufferblitpass.h"

View File

@@ -1,3 +1,6 @@
#ifdef _WIN32
#include <windows.h> // before any import: its guard must be set here
#endif
#include <cstdint>
#include "gbufferlighting.h"

View File

@@ -1,4 +1,7 @@
#pragma once
#ifdef _WIN32
#include <windows.h> // before any import: its guard must be set here
#endif
#include <cstddef>
#include <cstdint>

View File

@@ -1,3 +1,6 @@
#ifdef _WIN32
#include <windows.h> // before any import: its guard must be set here
#endif
#include <filesystem>
#include <memory>
#include <optional>

View File

@@ -1,4 +1,7 @@
#pragma once
#ifdef _WIN32
#include <windows.h> // before any import: its guard must be set here
#endif
#include <memory>
#include <optional>

View File

@@ -1,4 +1,7 @@
#pragma once
#ifdef _WIN32
#include <windows.h> // before any import: its guard must be set here
#endif
#include <cstdint>
#include <functional>

View File

@@ -1,3 +1,6 @@
#ifdef _WIN32
#include <windows.h> // before any import: its guard must be set here
#endif
#include <array>
#include <cstddef>
#include <memory>

View File

@@ -1,4 +1,7 @@
#include <array>
#ifdef _WIN32
#include <windows.h> // before any import: its guard must be set here
#endif
#include <array>
#include <cstddef>
#include <cstdint>
#include <functional>

View File

@@ -1,3 +1,6 @@
#ifdef _WIN32
#include <windows.h> // before any import: its guard must be set here
#endif
#include <fstream>
#include <ios>
#include <memory>

View File

@@ -1,3 +1,6 @@
#ifdef _WIN32
#include <windows.h> // before any import: its guard must be set here
#endif
#include <cstddef>
#include <cstdint>
#include <iostream>

View File

@@ -1,3 +1,6 @@
#ifdef _WIN32
#include <windows.h> // before any import: its guard must be set here
#endif
#include <cstddef>
#include <string>
#include <unordered_map>

View File

@@ -1,4 +1,7 @@
#include <array>
#ifdef _WIN32
#include <windows.h> // before any import: its guard must be set here
#endif
#include <array>
#include <cstddef>
#include <cstdint>
#include <fstream>

View File

@@ -1,4 +1,7 @@
#pragma once
#ifdef _WIN32
#include <windows.h> // before any import: its guard must be set here
#endif
#include <bitset>
#include <cstddef>

View File

@@ -1,3 +1,6 @@
#ifdef _WIN32
#include <windows.h> // before any import: its guard must be set here
#endif
#include <cstddef>
#include <cstdint>
#include <memory>

View File

@@ -1,3 +1,6 @@
#ifdef _WIN32
#include <windows.h> // before any import: its guard must be set here
#endif
#include <array>
#include <cstddef>
#include <limits>

View File

@@ -1,4 +1,7 @@
#pragma once
#ifdef _WIN32
#include <windows.h> // before any import: its guard must be set here
#endif
#include <memory>

View File

@@ -1,3 +1,6 @@
#ifdef _WIN32
#include <windows.h> // before any import: its guard must be set here
#endif
#include <array>
#include <limits>
#include <memory>

View File

@@ -1,3 +1,6 @@
#ifdef _WIN32
#include <windows.h> // before any import: its guard must be set here
#endif
#include <array>
#include <cstddef>
#include "ssao.h"

View File

@@ -1,4 +1,7 @@
#pragma once
#ifdef _WIN32
#include <windows.h> // before any import: its guard must be set here
#endif
#include <array>
#include <cstddef>

View File

@@ -1,4 +1,7 @@
#pragma once
#ifdef _WIN32
#include <windows.h> // before any import: its guard must be set here
#endif
#include <array>

View File

@@ -1,4 +1,7 @@
#include <cstddef>
#ifdef _WIN32
#include <windows.h> // before any import: its guard must be set here
#endif
#include <cstddef>
#include <cstdint>
#include <functional>
#include <limits>