From efa1cd3048ea2935523f7165862810e3d3a7bba5 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 28 Apr 2020 23:11:33 +0200 Subject: [PATCH] - moved video files to 'common'. # Conflicts: # source/blood/src/screen.cpp --- source/CMakeLists.txt | 4 ++-- source/blood/src/screen.cpp | 2 +- source/{core => common}/rendering/v_framebuffer.cpp | 0 source/{core => common}/rendering/v_video.cpp | 0 source/{core => common}/rendering/v_video.h | 0 source/duke3d/src/game.cpp | 2 +- source/exhumed/src/init.cpp | 2 +- source/rr/src/game.cpp | 2 +- source/sw/src/game.cpp | 2 +- 9 files changed, 7 insertions(+), 7 deletions(-) rename source/{core => common}/rendering/v_framebuffer.cpp (100%) rename source/{core => common}/rendering/v_video.cpp (100%) rename source/{core => common}/rendering/v_video.h (100%) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 45063ecd6..a325aa021 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -873,6 +873,8 @@ set (PCH_SOURCES common/objects/dobject.cpp common/objects/dobjgc.cpp common/objects/dobjtype.cpp + common/rendering/v_framebuffer.cpp + common/rendering/v_video.cpp common/rendering/r_videoscale.cpp common/rendering/hwrenderer/data/flatvertices.cpp common/rendering/hwrenderer/data/hw_viewpointbuffer.cpp @@ -935,8 +937,6 @@ set (PCH_SOURCES #core/input/i_input.cpp core/input/m_joy.cpp - core/rendering/v_framebuffer.cpp - core/rendering/v_video.cpp core/rendering/gl/renderer/gl_renderer.cpp core/rendering/gl/system/gl_framebuffer.cpp ) diff --git a/source/blood/src/screen.cpp b/source/blood/src/screen.cpp index 7a27f893f..a84b61d91 100644 --- a/source/blood/src/screen.cpp +++ b/source/blood/src/screen.cpp @@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "config.h" #include "resource.h" #include "screen.h" -#include "rendering/v_video.h" +#include "v_video.h" BEGIN_BLD_NS diff --git a/source/core/rendering/v_framebuffer.cpp b/source/common/rendering/v_framebuffer.cpp similarity index 100% rename from source/core/rendering/v_framebuffer.cpp rename to source/common/rendering/v_framebuffer.cpp diff --git a/source/core/rendering/v_video.cpp b/source/common/rendering/v_video.cpp similarity index 100% rename from source/core/rendering/v_video.cpp rename to source/common/rendering/v_video.cpp diff --git a/source/core/rendering/v_video.h b/source/common/rendering/v_video.h similarity index 100% rename from source/core/rendering/v_video.h rename to source/common/rendering/v_video.h diff --git a/source/duke3d/src/game.cpp b/source/duke3d/src/game.cpp index aa4c28deb..ac17e7750 100644 --- a/source/duke3d/src/game.cpp +++ b/source/duke3d/src/game.cpp @@ -50,7 +50,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "statistics.h" #include "menu/menu.h" #include "mapinfo.h" -#include "rendering/v_video.h" +#include "v_video.h" #include "glbackend/glbackend.h" // Uncomment to prevent anything except mirrors from drawing. It is sensible to diff --git a/source/exhumed/src/init.cpp b/source/exhumed/src/init.cpp index 8d20abed1..1f5cb55a9 100644 --- a/source/exhumed/src/init.cpp +++ b/source/exhumed/src/init.cpp @@ -41,7 +41,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "util.h" #include "mapinfo.h" #include "gamecontrol.h" -#include "rendering/v_video.h" +#include "v_video.h" #include #include diff --git a/source/rr/src/game.cpp b/source/rr/src/game.cpp index 7151cbed0..c3475cd29 100644 --- a/source/rr/src/game.cpp +++ b/source/rr/src/game.cpp @@ -47,7 +47,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "statistics.h" #include "c_dispatch.h" #include "mapinfo.h" -#include "rendering/v_video.h" +#include "v_video.h" #include "glbackend/glbackend.h" #include "playmve.h" diff --git a/source/sw/src/game.cpp b/source/sw/src/game.cpp index 3d92d3802..08a212ef2 100644 --- a/source/sw/src/game.cpp +++ b/source/sw/src/game.cpp @@ -98,7 +98,7 @@ Things required to make savegames work: #include "statistics.h" #include "gstrings.h" #include "mapinfo.h" -#include "rendering/v_video.h" +#include "v_video.h" #include "raze_sound.h" #include "secrets.h"