diff --git a/.gitignore b/.gitignore index 9abf75075..522ebe2ee 100644 --- a/.gitignore +++ b/.gitignore @@ -437,3 +437,7 @@ Minecraft.Client/Saves/ # Visual Studio Per-User Config *.user /out + +# IDE files +.idea/ +.kate-swp \ No newline at end of file diff --git a/Minecraft.Client/ChatScreen.cpp b/Minecraft.Client/ChatScreen.cpp index 5cd61c66a..a40d5b7e4 100644 --- a/Minecraft.Client/ChatScreen.cpp +++ b/Minecraft.Client/ChatScreen.cpp @@ -2,7 +2,7 @@ #include "ChatScreen.h" #include "ClientConnection.h" #include "Font.h" -#include "MultiplayerLocalPlayer.h" +#include "MultiPlayerLocalPlayer.h" #include "../Minecraft.World/SharedConstants.h" #include "../Minecraft.World/StringHelpers.h" #include "../Minecraft.World/ChatPacket.h" diff --git a/README.md b/README.md index 122157ba8..513457d18 100644 --- a/README.md +++ b/README.md @@ -109,6 +109,19 @@ cmake -S . -B build -G "Visual Studio 17 2022" -A x64 cmake --build build --config Debug --target MinecraftClient ``` +### CMake (Linux Cross-compilation) + +MinecraftConsoles does not support Linux but can cross-compile a Windows build from Linux. + +You will need a Windows x64 MSVC SDK. You can get one from [msvc-wine](https://github.com/mstorsjo/msvc-wine). + +```bash +mkdir build && cd build +cmake .. -B . -G Ninja -DWINDOWS_SDK_PATH= -DCMAKE_TOOLCHAIN_FILE=../cmake/LinuxCrosscompile.cmake -DCMAKE_BUILD_TYPE=Debug +ninja +wine MinecraftClient.exe +``` + For more information, see [COMPILE.md](COMPILE.md). ## Known Issues