From b66918bf6284df351f4a5ad38e7bbc06fdbb2dea Mon Sep 17 00:00:00 2001 From: tildearrow Date: Thu, 20 Jan 2022 01:46:03 -0500 Subject: [PATCH] don't compile icon.c under Windows either MSVC weirds out --- CMakeLists.txt | 5 ++++- src/gui/gui.cpp | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8cd8efe6..8f56e612 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -157,7 +157,6 @@ extern/imgui/backends/imgui_impl_sdl.cpp extern/imgui/misc/cpp/imgui_stdlib.cpp extern/igfd/ImGuiFileDialog.cpp -src/gui/icon.c src/gui/plot_nolerp.cpp src/gui/font_exo.cpp src/gui/font_liberationSans.cpp @@ -171,6 +170,10 @@ src/gui/font_icon.cpp src/gui/fonts.cpp src/gui/gui.cpp) +if (NOT WIN32 AND NOT APPLE) + list(APPEND GUI_SOURCES src/gui/icon.c) +endif() + if (WIN32) list(APPEND ENGINE_SOURCES src/utfutils.cpp) list(APPEND ENGINE_SOURCES src/engine/winStuff.cpp) diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index dea5275a..ca89348c 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -3746,7 +3746,7 @@ bool FurnaceGUI::init() { workingDir=e->getConfString("lastDir",getHomeDir()); syncSettings(); -#ifndef __APPLE__ +#if !(defined(__APPLE__) || defined(_WIN32)) unsigned char* furIcon=getFurnaceIcon(); SDL_Surface* icon=SDL_CreateRGBSurfaceFrom(furIcon,256,256,32,256*4,0xff,0xff00,0xff0000,0xff000000); #endif @@ -3762,7 +3762,7 @@ bool FurnaceGUI::init() { if (dpiScale<1) dpiScale=1; if (dpiScale!=1) SDL_SetWindowSize(sdlWin,scrW*dpiScale,scrH*dpiScale); -#ifndef __APPLE__ +#if !(defined(__APPLE__) || defined(_WIN32)) if (icon!=NULL) { SDL_SetWindowIcon(sdlWin,icon); SDL_FreeSurface(icon);