- moved video files to 'common'.

# Conflicts:
#	source/blood/src/screen.cpp
This commit is contained in:
Christoph Oelckers 2020-04-28 23:11:33 +02:00
parent 1e2a3da5fd
commit efa1cd3048
9 changed files with 7 additions and 7 deletions

View file

@ -873,6 +873,8 @@ set (PCH_SOURCES
common/objects/dobject.cpp common/objects/dobject.cpp
common/objects/dobjgc.cpp common/objects/dobjgc.cpp
common/objects/dobjtype.cpp common/objects/dobjtype.cpp
common/rendering/v_framebuffer.cpp
common/rendering/v_video.cpp
common/rendering/r_videoscale.cpp common/rendering/r_videoscale.cpp
common/rendering/hwrenderer/data/flatvertices.cpp common/rendering/hwrenderer/data/flatvertices.cpp
common/rendering/hwrenderer/data/hw_viewpointbuffer.cpp common/rendering/hwrenderer/data/hw_viewpointbuffer.cpp
@ -935,8 +937,6 @@ set (PCH_SOURCES
#core/input/i_input.cpp #core/input/i_input.cpp
core/input/m_joy.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/renderer/gl_renderer.cpp
core/rendering/gl/system/gl_framebuffer.cpp core/rendering/gl/system/gl_framebuffer.cpp
) )

View file

@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "config.h" #include "config.h"
#include "resource.h" #include "resource.h"
#include "screen.h" #include "screen.h"
#include "rendering/v_video.h" #include "v_video.h"
BEGIN_BLD_NS BEGIN_BLD_NS

View file

@ -50,7 +50,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "statistics.h" #include "statistics.h"
#include "menu/menu.h" #include "menu/menu.h"
#include "mapinfo.h" #include "mapinfo.h"
#include "rendering/v_video.h" #include "v_video.h"
#include "glbackend/glbackend.h" #include "glbackend/glbackend.h"
// Uncomment to prevent anything except mirrors from drawing. It is sensible to // Uncomment to prevent anything except mirrors from drawing. It is sensible to

View file

@ -41,7 +41,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "util.h" #include "util.h"
#include "mapinfo.h" #include "mapinfo.h"
#include "gamecontrol.h" #include "gamecontrol.h"
#include "rendering/v_video.h" #include "v_video.h"
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>

View file

@ -47,7 +47,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "statistics.h" #include "statistics.h"
#include "c_dispatch.h" #include "c_dispatch.h"
#include "mapinfo.h" #include "mapinfo.h"
#include "rendering/v_video.h" #include "v_video.h"
#include "glbackend/glbackend.h" #include "glbackend/glbackend.h"
#include "playmve.h" #include "playmve.h"

View file

@ -98,7 +98,7 @@ Things required to make savegames work:
#include "statistics.h" #include "statistics.h"
#include "gstrings.h" #include "gstrings.h"
#include "mapinfo.h" #include "mapinfo.h"
#include "rendering/v_video.h" #include "v_video.h"
#include "raze_sound.h" #include "raze_sound.h"
#include "secrets.h" #include "secrets.h"