Merge remote-tracking branch 'origin/main' into networking

Minecraft.World/stdafx.h

@@ -20,13 +20,14 @@ typedef unsigned __int64 __uint64;
 #endif
 
 #ifdef _WINDOWS64
-#define WIN32_LEAN_AND_MEAN             // Exclude rarely-used stuff from Windows headers
-// Windows Header Files:
+#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
+#include <d3d11.h>
+#include <DirectXMath.h>
+using namespace DirectX;
 #include <windows.h>
 #include <malloc.h>
 #include <tchar.h>
-// TODO: reference additional headers your program requires here
-#include <d3d11.h>
+#include "..\Minecraft.Client\Windows64\Windows64Extras\Windows64Stubs.h"
 #endif
 
 #ifdef _DURANGO
@@ -145,8 +146,8 @@ typedef XUID GameSessionUID;
 #include "compression.h"
 #include "PerformanceTimer.h"
 
-
-#if defined(_FINAL_BUILD) && !defined(_WINDOWS64)
+#if !defined(_WINDOWS64)
+#if defined(_FINAL_BUILD)
 #define printf BREAKTHECOMPILE
 #define wprintf BREAKTHECOMPILE
 #undef OutputDebugString
@@ -154,6 +155,7 @@ typedef XUID GameSessionUID;
 #define OutputDebugStringA BREAKTHECOMPILE
 #define OutputDebugStringW BREAKTHECOMPILE
 #endif
+#endif
 
 
 void MemSect(int sect);