From 6adfeecd6c748fa7b80c6c166f677c9dc3e18c30 Mon Sep 17 00:00:00 2001 From: JustDoom <61824552+JustDoom@users.noreply.github.com> Date: Thu, 28 Mar 2024 12:38:03 +1000 Subject: [PATCH] Please work with windows building again --- .github/workflows/build.yml | 1 + src/main.cpp | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8db14d7..559e7f7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -70,6 +70,7 @@ jobs: run: | mkdir -p ~/.ssh echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa + echo "StrictHostKeyChecking no" > ~/.ssh/config chmod 600 ~/.ssh/id_rsa ssh-keyscan github.com >> ~/.ssh/known_hosts git submodule update --init --recursive diff --git a/src/main.cpp b/src/main.cpp index 6eb81e7..a6f2304 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -39,7 +39,9 @@ int launch(const std::string& rom, const std::string& executable) { sf::RenderWindow window(sf::VideoMode(renderer.getColumns() * renderer.getScale(), renderer.getRows() * renderer.getScale()), "8ChocChip - CHIP-8 Emulator", sf::Style::Titlebar | sf::Style::Close); - // TODO: Add icon - window.setIcon(); + sf::Image icon; + icon.loadFromFile("../assets/icon.png"); + window.setIcon(64, 64, icon.getPixelsPtr()); sf::Clock clock;