- moved video files to 'common'.

# Conflicts:
#	source/blood/src/screen.cpp

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
 )

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
 

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

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 <stdio.h>
 #include <string.h>
 

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"
 

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"