From f94e4a908c789808ed708fa84794448b6d3222c4 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 11 Apr 2020 18:18:32 +0200 Subject: [PATCH] - m_png is common. --- src/CMakeLists.txt | 2 +- src/common/console/c_enginecmds.cpp | 6 ++++++ src/{utility => common/textures}/m_png.cpp | 0 src/{utility => common/textures}/m_png.h | 0 4 files changed, 7 insertions(+), 1 deletion(-) rename src/{utility => common/textures}/m_png.cpp (100%) rename src/{utility => common/textures}/m_png.h (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 35ca3014d..cf29d66fa 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1106,6 +1106,7 @@ set (PCH_SOURCES rendering/swrenderer/textures/swcanvastexture.cpp events.cpp common/thirdparty/sfmt/SFMT.cpp + common/textures/m_png.cpp common/console/c_commandline.cpp common/console/c_buttons.cpp common/console/c_bind.cpp @@ -1147,7 +1148,6 @@ set (PCH_SOURCES common/engine/palettecontainer.cpp common/engine/stringtable.cpp - utility/m_png.cpp utility/m_random.cpp utility/nodebuilder/nodebuild.cpp utility/nodebuilder/nodebuild_classify_nosse2.cpp diff --git a/src/common/console/c_enginecmds.cpp b/src/common/console/c_enginecmds.cpp index cf94604a2..0af6f3b56 100644 --- a/src/common/console/c_enginecmds.cpp +++ b/src/common/console/c_enginecmds.cpp @@ -32,6 +32,12 @@ ** */ +#ifndef _WIN32 +#include +#else +#include +#endif + #include #include #include diff --git a/src/utility/m_png.cpp b/src/common/textures/m_png.cpp similarity index 100% rename from src/utility/m_png.cpp rename to src/common/textures/m_png.cpp diff --git a/src/utility/m_png.h b/src/common/textures/m_png.h similarity index 100% rename from src/utility/m_png.h rename to src/common/textures/m_png.h