Fixed windows build instructions, and fixed MSVC warning

This commit is contained in:
Yousef Khadadeh 2025-07-08 01:41:05 -05:00
parent d29c912d03
commit 814e20f8a2
3 changed files with 6 additions and 6 deletions

View file

@ -37,10 +37,10 @@ After cloning the repository, `cd` into the repo, then run:
.\conan\export_libs.bat .\conan\export_libs.bat
conan install . --build=missing -pr=conan/profiles/win-x86_64 conan install . --build=missing -pr=conan/profiles/win-x86_64
cd build cd build
source generators/conanbuild.sh .\generators\conanbuild.sh
cmake ../.. -DCMAKE_TOOLCHAIN_FILE=generators/conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Release cmake .. -DCMAKE_TOOLCHAIN_FILE="generators\conan_toolchain.cmake" -DCMAKE_BUILD_TYPE=Release
cmake --build . --config 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. 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.

View file

@ -1223,7 +1223,7 @@ void Toolbar::options_menu() {
if(keybindWaiting.has_value()) { if(keybindWaiting.has_value()) {
main.input.stop_key_input(); main.input.stop_key_input();
if(main.input.lastPressedKeybind) { if(main.input.lastPressedKeybind) {
size_t v = keybindWaiting.value(); unsigned v = keybindWaiting.value();
Vector2ui32 newKey = main.input.lastPressedKeybind.value(); Vector2ui32 newKey = main.input.lastPressedKeybind.value();
main.input.keyAssignments.erase(newKey); main.input.keyAssignments.erase(newKey);
@ -1238,7 +1238,7 @@ void Toolbar::options_menu() {
} }
gui.push_id("keybind entries"); 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); gui.push_id(i);
CLAY({ CLAY({
.layout = { .layout = {

View file

@ -192,7 +192,7 @@ class Toolbar {
}; };
static NativeFilePicker nativeFilePicker; static NativeFilePicker nativeFilePicker;
std::optional<size_t> keybindWaiting; std::optional<unsigned> keybindWaiting;
std::filesystem::path testing; std::filesystem::path testing;