mirror of
https://github.com/tildearrow/furnace.git
synced 2025-01-05 07:01:21 +00:00
don't compile icon.c under Windows either
MSVC weirds out
This commit is contained in:
parent
1e0131cdac
commit
b66918bf62
2 changed files with 6 additions and 3 deletions
|
@ -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)
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue