diff --git a/Minecraft.Client/Common/UI/IUIScene_WritingBookMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_WritingBookMenu.cpp index 6d8ad23b..a9045bf7 100644 --- a/Minecraft.Client/Common/UI/IUIScene_WritingBookMenu.cpp +++ b/Minecraft.Client/Common/UI/IUIScene_WritingBookMenu.cpp @@ -2,7 +2,6 @@ #include #include "IUIScene_WritingBookMenu.h" #include "MultiPlayerLocalPlayer.h" -#include "MultiPlayerLocalPlayer.h" #include "Common\UI\UI.h" #include "ClientConnection.h" #include "../Minecraft.World/CustomPayloadPacket.h" diff --git a/Minecraft.World/WritingBookItem.cpp b/Minecraft.World/WritingBookItem.cpp index bafb5bfa..4c4e52b6 100644 --- a/Minecraft.World/WritingBookItem.cpp +++ b/Minecraft.World/WritingBookItem.cpp @@ -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) { diff --git a/Minecraft.World/WrittenBookItem.cpp b/Minecraft.World/WrittenBookItem.cpp index 7545ebf0..8d0cb85f 100644 --- a/Minecraft.World/WrittenBookItem.cpp +++ b/Minecraft.World/WrittenBookItem.cpp @@ -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) { diff --git a/build-linux.sh b/build-linux.sh index d6cd3239..38a8de3a 100755 --- a/build-linux.sh +++ b/build-linux.sh @@ -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 \