backups/MinecraftConsoles
2
0
Fork 1
mirror of https://github.com/smartcmd/MinecraftConsoles.git synced 2026-08-20 09:57:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Stop including multiple windows headers when we use pch

Browse source
This commit is contained in:
Racc 2026-03-16 12:24:35 +00:00
parent 982b4e348f
commit 652c01e25c
7 changed files with 4 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.cpp
View file

@ -18,8 +18,6 @@
#endif #endif
#ifdef _WINDOWS64 #ifdef _WINDOWS64
#include <windows.h>
#include "Xbox\Resource.h" #include "Xbox\Resource.h"
#endif #endif

5
Minecraft.Client/Durango/Iggy/gdraw/gdraw_d3d11.cpp
View file

@ -26,15 +26,10 @@
#define GDRAW_ASSERTS #define GDRAW_ASSERTS
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#endif
// We temporarily disable this warning for the shared interface portions // We temporarily disable this warning for the shared interface portions
#pragma warning (push) #pragma warning (push)
#pragma warning (disable: 4201) // nonstandard extension used : nameless struct/union #pragma warning (disable: 4201) // nonstandard extension used : nameless struct/union
#include <windows.h>
#include <d3d11_x.h> // 4J changed to use monolithic version #include <d3d11_x.h> // 4J changed to use monolithic version
#include "gdraw.h" #include "gdraw.h"
#include "iggy.h" #include "iggy.h"

5
Minecraft.Client/Windows64/Iggy/gdraw/gdraw_d3d11.cpp
View file

@ -26,15 +26,10 @@
#define GDRAW_ASSERTS #define GDRAW_ASSERTS
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#endif
// We temporarily disable this warning for the shared interface portions // We temporarily disable this warning for the shared interface portions
#pragma warning (push) #pragma warning (push)
#pragma warning (disable: 4201) // nonstandard extension used : nameless struct/union #pragma warning (disable: 4201) // nonstandard extension used : nameless struct/union
#include <windows.h>
#include <d3d11.h> #include <d3d11.h>
#include "gdraw.h" #include "gdraw.h"
#include "iggy.h" #include "iggy.h"

2
Minecraft.Client/Windows64/KeyboardMouseInput.h
View file

@ -2,8 +2,6 @@
#ifdef _WINDOWS64 #ifdef _WINDOWS64
#include <windows.h>
class KeyboardMouseInput class KeyboardMouseInput
{ {
public: public:

2
Minecraft.Client/stdafx.h
View file

@ -23,6 +23,7 @@
#ifdef _WINDOWS64 #ifdef _WINDOWS64
#define _HAS_STD_BYTE 0 // solve (std::)'byte' ambiguity with windows headers #define _HAS_STD_BYTE 0 // solve (std::)'byte' ambiguity with windows headers
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
#define NOMINMAX // Exclude min/max macros from Windows headers
// Windows Header Files: // Windows Header Files:
#include <malloc.h> #include <malloc.h>
#include <tchar.h> #include <tchar.h>
@ -139,6 +140,7 @@ typedef XUID GameSessionUID;
#include <sstream> #include <sstream>
#include <iostream> #include <iostream>
#include <exception> #include <exception>
#include <mutex>
#include <assert.h> #include <assert.h>

2
Minecraft.World/stdafx.h
View file

@ -7,6 +7,7 @@
#ifdef _WINDOWS64 #ifdef _WINDOWS64
#define _HAS_STD_BYTE 0 // solve (std::)'byte' ambiguity with windows headers #define _HAS_STD_BYTE 0 // solve (std::)'byte' ambiguity with windows headers
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
#define NOMINMAX // Exclude min/max macros from Windows headers
// Windows Header Files: // Windows Header Files:
#include <windows.h> #include <windows.h>
#include <malloc.h> #include <malloc.h>
@ -105,6 +106,7 @@ typedef XUID GameSessionUID;
#include <sstream> #include <sstream>
#include <iostream> #include <iostream>
#include <exception> #include <exception>
#include <array>
#ifndef __PS3__ // the PS3 lib assert is rubbish, and aborts the code, we define our own in PS3Types.h #ifndef __PS3__ // the PS3 lib assert is rubbish, and aborts the code, we define our own in PS3Types.h
#include <assert.h> #include <assert.h>

4
include/lce_filesystem/lce_filesystem.cpp
View file

@ -1,10 +1,6 @@
#include "stdafx.h" #include "stdafx.h"
#include "lce_filesystem.h" #include "lce_filesystem.h"
#ifdef _WINDOWS64
#include <windows.h>
#endif // TODO: More os' filesystem handling for when the project moves away from only Windows
#include <stdio.h> #include <stdio.h>
bool FileOrDirectoryExists(const char* path) bool FileOrDirectoryExists(const char* path)