mirror of
https://github.com/neoStudiosLCE/neoLegacy.git
synced 2026-07-05 16:57:02 +00:00
Merge remote-tracking branch 'origin/main'
This commit is contained in:
commit
63017660a8
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
Loading…
Reference in a new issue