From 5858f5c4c380bcc5727d776bb34cd1893bd25550 Mon Sep 17 00:00:00 2001 From: Julian Hinxlage Date: Wed, 8 Jan 2020 12:44:35 +0100 Subject: [PATCH] fixed make error with to_string(enum) --- main/main.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/main/main.cpp b/main/main.cpp index d27b25f..cc5f9d6 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -47,7 +47,12 @@ int main() { vkvm::initialize(0); vkvm::setLogLevel(vkvm::DEBUG); - Font font(std::string() + "../res/font" + std::to_string(vkvm::getFont()) + ".bmp", std::string() + "../res/font" + std::to_string(vkvm::getFont()) + ".toml"); + Font font( + std::string() + "../res/font" + + std::to_string(static_cast(vkvm::getFont())) + ".bmp", + std::string() + "../res/font" + + std::to_string(static_cast(vkvm::getFont())) + ".toml"); + std::thread thread(std::bind(threadHandler, font)); vkvm::registerEvent(vkvm::EventType::RenderText, [&font]() { @@ -98,7 +103,11 @@ int main() { }); vkvm::registerEvent(vkvm::EventType::UpdateControlRegisters, [&font]() { - font.load(std::string() + "../res/font" + std::to_string(vkvm::getFont()) + ".bmp", std::string() + "../res/font" + std::to_string(vkvm::getFont()) + ".toml"); + font.load( + std::string() + "../res/font" + + std::to_string(static_cast(vkvm::getFont())) + ".bmp", + std::string() + "../res/font" + + std::to_string(static_cast(vkvm::getFont())) + ".toml"); }); while (true) {