diff --git a/docs/BUILDING.md b/docs/BUILDING.md index eabf718..149a565 100644 --- a/docs/BUILDING.md +++ b/docs/BUILDING.md @@ -37,10 +37,10 @@ After cloning the repository, `cd` into the repo, then run: .\conan\export_libs.bat conan install . --build=missing -pr=conan/profiles/win-x86_64 cd build -source generators/conanbuild.sh -cmake ../.. -DCMAKE_TOOLCHAIN_FILE=generators/conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Release +.\generators\conanbuild.sh +cmake .. -DCMAKE_TOOLCHAIN_FILE="generators\conan_toolchain.cmake" -DCMAKE_BUILD_TYPE=Release cmake --build . --config Release -source generators/deactivate_conanbuild.sh +.\generators\deactivate_conanbuild.sh ``` After building the project, you should place the `data` folder located in the root of the repository next to the `infinipaint.exe` executable before running it. diff --git a/src/Toolbar.cpp b/src/Toolbar.cpp index 9f9f45e..d139c3e 100644 --- a/src/Toolbar.cpp +++ b/src/Toolbar.cpp @@ -1223,7 +1223,7 @@ void Toolbar::options_menu() { if(keybindWaiting.has_value()) { main.input.stop_key_input(); if(main.input.lastPressedKeybind) { - size_t v = keybindWaiting.value(); + unsigned v = keybindWaiting.value(); Vector2ui32 newKey = main.input.lastPressedKeybind.value(); main.input.keyAssignments.erase(newKey); @@ -1238,7 +1238,7 @@ void Toolbar::options_menu() { } gui.push_id("keybind entries"); - for(size_t i = 0; i < InputManager::KEY_ASSIGNABLE_COUNT; i++) { + for(unsigned i = 0; i < InputManager::KEY_ASSIGNABLE_COUNT; i++) { gui.push_id(i); CLAY({ .layout = { diff --git a/src/Toolbar.hpp b/src/Toolbar.hpp index 9a4c99e..c6a7b90 100644 --- a/src/Toolbar.hpp +++ b/src/Toolbar.hpp @@ -192,7 +192,7 @@ class Toolbar { }; static NativeFilePicker nativeFilePicker; - std::optional keybindWaiting; + std::optional keybindWaiting; std::filesystem::path testing;