unify(video): Move Video files to Core (#1410)

Author: xezon

Core/GameEngine/CMakeLists.txt

@@ -224,11 +224,11 @@ set(GAMEENGINE_SRC
 #    Include/GameClient/Statistics.h
 #    Include/GameClient/TerrainRoads.h
 #    Include/GameClient/TerrainVisual.h
-#    Include/GameClient/VideoPlayer.h
+    Include/GameClient/VideoPlayer.h
 #    Include/GameClient/View.h
 #    Include/GameClient/Water.h
 #    Include/GameClient/WindowLayout.h
-#    Include/GameClient/WindowVideoManager.h
+    Include/GameClient/WindowVideoManager.h
 #    Include/GameClient/WindowXlat.h
 #    Include/GameClient/WinInstanceData.h
 #    Include/GameLogic/AI.h
@@ -597,7 +597,7 @@ set(GAMEENGINE_SRC
 #    Source/Common/INI/INITerrainBridge.cpp
 #    Source/Common/INI/INITerrainRoad.cpp
 #    Source/Common/INI/INIUpgrade.cpp
-#    Source/Common/INI/INIVideo.cpp
+    Source/Common/INI/INIVideo.cpp
 #    Source/Common/INI/INIWater.cpp
 #    Source/Common/INI/INIWeapon.cpp
 #    Source/Common/INI/INIWebpageURL.cpp
@@ -791,7 +791,7 @@ set(GAMEENGINE_SRC
 #    Source/GameClient/GUI/Shell/Shell.cpp
 #    Source/GameClient/GUI/Shell/ShellMenuScheme.cpp
 #    Source/GameClient/GUI/WindowLayout.cpp
-#    Source/GameClient/GUI/WindowVideoManager.cpp
+    Source/GameClient/GUI/WindowVideoManager.cpp
 #    Source/GameClient/GUI/WinInstanceData.cpp
 #    Source/GameClient/InGameUI.cpp
 #    Source/GameClient/Input/Keyboard.cpp
@@ -823,8 +823,8 @@ set(GAMEENGINE_SRC
 #    Source/GameClient/System/Smudge.cpp
 #    Source/GameClient/Terrain/TerrainRoads.cpp
 #    Source/GameClient/Terrain/TerrainVisual.cpp
-#    Source/GameClient/VideoPlayer.cpp
-#    Source/GameClient/VideoStream.cpp
+    Source/GameClient/VideoPlayer.cpp
+    Source/GameClient/VideoStream.cpp
 #    Source/GameClient/View.cpp
 #    Source/GameClient/Water.cpp
 #    Source/GameLogic/AI/AI.cpp

GeneralsMD/Code/GameEngine/Include/GameClient/VideoPlayer.h renamed to Core/GameEngine/Include/GameClient/VideoPlayer.h

@@ -1,6 +1,6 @@
 set(GAMEENGINEDEVICE_SRC
     Include/MilesAudioDevice/MilesAudioManager.h
-#    Include/VideoDevice/Bink/BinkVideoPlayer.h
+    Include/VideoDevice/Bink/BinkVideoPlayer.h
 #    Include/W3DDevice/Common/W3DConvert.h
 #    Include/W3DDevice/Common/W3DFunctionLexicon.h
 #    Include/W3DDevice/Common/W3DModuleFactory.h
@@ -70,7 +70,7 @@ set(GAMEENGINEDEVICE_SRC
 #    Include/W3DDevice/GameClient/W3DTerrainTracks.h
 #    Include/W3DDevice/GameClient/W3DTerrainVisual.h
 #    Include/W3DDevice/GameClient/W3DTreeBuffer.h
-#    Include/W3DDevice/GameClient/W3DVideoBuffer.h
+    Include/W3DDevice/GameClient/W3DVideoBuffer.h
 #    Include/W3DDevice/GameClient/W3DView.h
 #    Include/W3DDevice/GameClient/W3DVolumetricShadow.h
 #    Include/W3DDevice/GameClient/W3DWater.h
@@ -91,7 +91,7 @@ set(GAMEENGINEDEVICE_SRC
 #    Include/Win32Device/GameClient/Win32DIMouse.h
 #    Include/Win32Device/GameClient/Win32Mouse.h
     Source/MilesAudioDevice/MilesAudioManager.cpp
-#    Source/VideoDevice/Bink/BinkVideoPlayer.cpp
+    Source/VideoDevice/Bink/BinkVideoPlayer.cpp
 #    Source/W3DDevice/Common/System/W3DFunctionLexicon.cpp
 #    Source/W3DDevice/Common/System/W3DRadar.cpp
 #    Source/W3DDevice/Common/Thing/W3DModuleFactory.cpp
@@ -172,7 +172,7 @@ set(GAMEENGINEDEVICE_SRC
 #    Source/W3DDevice/GameClient/W3DTerrainTracks.cpp
 #    Source/W3DDevice/GameClient/W3DTerrainVisual.cpp
 #    Source/W3DDevice/GameClient/W3DTreeBuffer.cpp
-#    Source/W3DDevice/GameClient/W3DVideoBuffer.cpp
+    Source/W3DDevice/GameClient/W3DVideoBuffer.cpp
 #    Source/W3DDevice/GameClient/W3DView.cpp
 #    Source/W3DDevice/GameClient/W3dWaypointBuffer.cpp
 #    Source/W3DDevice/GameClient/W3DWebBrowser.cpp
@@ -229,20 +229,19 @@ target_link_libraries(corei_gameenginedevice_public INTERFACE
     milesstub
 )
 
-#if(RTS_BUILD_OPTION_FFMPEG)
-#    find_package(FFMPEG REQUIRED)
-#
-#    if(FFMPEG_FOUND)
-#        target_sources(z_gameenginedevice PRIVATE
-#            Include/VideoDevice/FFmpeg/FFmpegFile.h
-#            Include/VideoDevice/FFmpeg/FFmpegVideoPlayer.h
-#            Source/VideoDevice/FFmpeg/FFmpegFile.cpp
-#            Source/VideoDevice/FFmpeg/FFmpegVideoPlayer.cpp
-#        )
-#
-#        target_include_directories(z_gameenginedevice PRIVATE ${FFMPEG_INCLUDE_DIRS})
-#        target_link_directories(z_gameenginedevice PRIVATE ${FFMPEG_LIBRARY_DIRS})
-#        target_link_libraries(z_gameenginedevice PRIVATE ${FFMPEG_LIBRARIES})
-#        target_compile_definitions(z_gameenginedevice PUBLIC RTS_HAS_FFMPEG)
-#    endif()
-#endif()
+if(RTS_BUILD_OPTION_FFMPEG)
+    find_package(FFMPEG REQUIRED)
+
+    if(FFMPEG_FOUND)
+        target_sources(corei_gameenginedevice_private INTERFACE
+            Include/VideoDevice/FFmpeg/FFmpegFile.h
+            Include/VideoDevice/FFmpeg/FFmpegVideoPlayer.h
+            Source/VideoDevice/FFmpeg/FFmpegFile.cpp
+            Source/VideoDevice/FFmpeg/FFmpegVideoPlayer.cpp
+        )
+        target_include_directories(corei_gameenginedevice_private INTERFACE ${FFMPEG_INCLUDE_DIRS})
+        target_link_directories(corei_gameenginedevice_private INTERFACE ${FFMPEG_LIBRARY_DIRS})
+        target_link_libraries(corei_gameenginedevice_private INTERFACE ${FFMPEG_LIBRARIES})
+        target_compile_definitions(corei_gameenginedevice_public INTERFACE RTS_HAS_FFMPEG)
+    endif()
+endif()