Merge remote-tracking branch 'origin/main'

This commit is contained in:
piebot 2026-04-05 18:37:24 +03:00
commit 63017660a8
4 changed files with 3 additions and 4 deletions

View file

@ -2,7 +2,6 @@
#include <vector>
#include "IUIScene_WritingBookMenu.h"
#include "MultiPlayerLocalPlayer.h"
#include "MultiPlayerLocalPlayer.h"
#include "Common\UI\UI.h"
#include "ClientConnection.h"
#include "../Minecraft.World/CustomPayloadPacket.h"

View file

@ -4,7 +4,7 @@
#include "ItemInstance.h"
#include "WritingBookItem.h"
#include "../Minecraft.Client/Minecraft.h"
#include "../Minecraft.Client/MultiplayerLocalPlayer.h"
#include "../Minecraft.Client/MultiPlayerLocalPlayer.h"
WritingBookItem::WritingBookItem(int id) : Item(id)
{

View file

@ -2,7 +2,7 @@
#include "HtmlString.h"
#include "WrittenBook.h"
#include "../Minecraft.Client/Minecraft.h"
#include "../Minecraft.Client/MultiplayerLocalPlayer.h"
#include "../Minecraft.Client/MultiPlayerLocalPlayer.h"
WrittenBookItem::WrittenBookItem(int id) : Item(id)
{

View file

@ -78,7 +78,7 @@ do_cmake_configure() {
local winsdk="$XWIN_CACHE/splat"
local toolchain
toolchain="$(write_toolchain)"
local c_flags="/MT -fms-compatibility -fms-extensions --target=x86_64-pc-windows-msvc \
local c_flags="/MT -Wno-non-pod-varargs -fms-compatibility -fms-extensions --target=x86_64-pc-windows-msvc \
-imsvc $winsdk/crt/include \
-imsvc $winsdk/sdk/include/ucrt \
-imsvc $winsdk/sdk/include/um \