mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-10-19 07:19:18 +02:00
put every include before every import
A header first pulled in through an imported module's global module fragment leaves no include guard in the importing unit - macros do not cross a module boundary - so a later textual include parses it again and MSVC rejects the redefinition. Redoes the betterRenderer sweep with placement that stays out of #if blocks, which is where the previous one dropped <fstream> and broke nvrenderer_d3d12.cpp.
This commit is contained in:
@@ -2,6 +2,15 @@
|
||||
#include "nvrenderer/nvrenderer.h"
|
||||
|
||||
#include "utilities/Globals_macros.h"
|
||||
#include <array>
|
||||
#include <cstddef>
|
||||
#include <cstdint>
|
||||
#include <fstream>
|
||||
#include <ios>
|
||||
#include <memory>
|
||||
#include <sstream>
|
||||
#include <string>
|
||||
#include <utility>
|
||||
import eu07.utilities.globals;
|
||||
import eu07.scripting.pyint;
|
||||
import eu07.application.application;
|
||||
@@ -17,16 +26,6 @@ import eu07.utilities.logs;
|
||||
#define STB_IMAGE_RESIZE2_IMPLEMENTATION
|
||||
#include "stbi/stb_image_resize2.h"
|
||||
import eu07.model.texture;
|
||||
#include <array>
|
||||
#include <cstddef>
|
||||
#include <cstdint>
|
||||
#include <fstream>
|
||||
#include <ios>
|
||||
#include <memory>
|
||||
#include <sstream>
|
||||
#include <string>
|
||||
#include <utility>
|
||||
#include <cstring>
|
||||
#undef STB_IMAGE_RESIZE2_IMPLEMENTATION
|
||||
|
||||
uint64_t NvTexture::s_change_counter = 0;
|
||||
|
||||
Reference in New Issue
Block a user