From 6afa73bdcd15af5b91ef90e2b0ecbdb54848b6fc Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Mon, 27 Apr 2020 00:07:17 +0200 Subject: [PATCH] - moved m_bbox to 'common' --- src/CMakeLists.txt | 2 +- src/{ => common}/utility/m_bbox.cpp | 2 -- src/{ => common}/utility/m_bbox.h | 1 - src/rendering/hwrenderer/textures/hw_precache.cpp | 1 + 4 files changed, 2 insertions(+), 4 deletions(-) rename src/{ => common}/utility/m_bbox.cpp (97%) rename src/{ => common}/utility/m_bbox.h (99%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3f1449ddf..9ad52a7bd 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1097,6 +1097,7 @@ set (PCH_SOURCES common/utility/s_playlist.cpp common/utility/zstrformat.cpp common/utility/name.cpp + common/utility/m_bbox.cpp common/thirdparty/md5.cpp common/thirdparty/superfasthash.cpp common/filesystem/filesystem.cpp @@ -1169,7 +1170,6 @@ set (PCH_SOURCES utility/nodebuilder/nodebuild_extract.cpp utility/nodebuilder/nodebuild_gl.cpp utility/nodebuilder/nodebuild_utility.cpp - utility/m_bbox.cpp utility/v_collection.cpp ) diff --git a/src/utility/m_bbox.cpp b/src/common/utility/m_bbox.cpp similarity index 97% rename from src/utility/m_bbox.cpp rename to src/common/utility/m_bbox.cpp index 01fed1624..d62c4ec5f 100644 --- a/src/utility/m_bbox.cpp +++ b/src/common/utility/m_bbox.cpp @@ -25,8 +25,6 @@ //----------------------------------------------------------------------------- #include "m_bbox.h" -#include "p_local.h" -#include "p_maputl.h" //========================================================================== // diff --git a/src/utility/m_bbox.h b/src/common/utility/m_bbox.h similarity index 99% rename from src/utility/m_bbox.h rename to src/common/utility/m_bbox.h index 0d022e597..0286ef230 100644 --- a/src/utility/m_bbox.h +++ b/src/common/utility/m_bbox.h @@ -29,7 +29,6 @@ #include #include "vectors.h" -#include "m_fixed.h" enum { diff --git a/src/rendering/hwrenderer/textures/hw_precache.cpp b/src/rendering/hwrenderer/textures/hw_precache.cpp index e548d667b..4b1dbb15a 100644 --- a/src/rendering/hwrenderer/textures/hw_precache.cpp +++ b/src/rendering/hwrenderer/textures/hw_precache.cpp @@ -37,6 +37,7 @@ #include "v_video.h" #include "v_font.h" #include "texturemanager.h" +#include "r_data/models/modelrenderer.h" EXTERN_CVAR(Bool, gl_precache)