engine: embed media files

Author: illwieckz

CMakeLists.txt

@@ -1010,6 +1010,9 @@ if (NOT NACL)
             Tests ${ENGINETESTLIST}
         )
     endif()
+
+    # Generate media include files.
+    daemon_embed_files("EngineMedia" "MEDIA" "BINARY" "engine-lib")
 endif()
 
 if (BUILD_CLIENT)
@@ -1039,6 +1042,9 @@ if (BUILD_CLIENT)
 
     # Generate GLSL include files.
     daemon_embed_files("EngineShaders" "GLSL" "TEXT" "client-objects")
+
+    # Generate media include files.
+    daemon_embed_files("EngineMedia" "MEDIA" "BINARY" "client-objects")
 endif()
 
 if (BUILD_SERVER)

src.cmake

@@ -86,6 +86,13 @@ else()
     include (${ENGINE_DIR}/renderer/src.cmake)
 endif()
 
+set(MEDIA_EMBED_DIR ${ENGINE_DIR}/media)
+set(MEDIA_EMBED_LIST
+	gfx/2d/bigchars.png
+	scripts/engine.shader
+	sound/null.wav
+)
+
 set(GLSL_EMBED_DIR "${ENGINE_DIR}/renderer/glsl_source")
 set(GLSL_EMBED_LIST
     # Common shader libraries
@@ -167,6 +174,8 @@ set(SERVERLIST
 )
 
 set(ENGINELIST
+    ${DAEMON_EMBEDDED_DIR}/EngineMedia.cpp
+    ${DAEMON_EMBEDDED_DIR}/EngineMedia.h
     ${ENGINE_DIR}/framework/Application.cpp
     ${ENGINE_DIR}/framework/Application.h
     ${ENGINE_DIR}/framework/ApplicationInternals.h
@@ -271,6 +280,8 @@ set(CLIENTBASELIST
 )
 
 set(CLIENTLIST
+    ${DAEMON_EMBEDDED_DIR}/EngineMedia.cpp
+    ${DAEMON_EMBEDDED_DIR}/EngineMedia.h
     ${ENGINE_DIR}/audio/ALObjects.cpp
     ${ENGINE_DIR}/audio/ALObjects.h
     ${ENGINE_DIR}/audio/Audio.cpp

pkg/daemon_src.dpkdir/gfx/2d/bigchars.png renamed to src/engine/media/gfx/2d/bigchars.png

@@ -27,6 +27,10 @@ along with Daemon Source Code.  If not, see <http://www.gnu.org/licenses/>.
 #include "qcommon.h"
 #include "common/Defs.h"
 
+#if defined(BUILD_GRAPHICAL_CLIENT) || defined(BUILD_TTY_CLIENT)
+#include "DaemonEmbeddedFiles/EngineMedia.h"
+#endif
+
 extern Log::Logger fsLogs;
 
 // There must be some limit for the APIs in this file since they use 'int' for lengths which can be overflowed by large files.
@@ -667,6 +671,10 @@ void FS_LoadBasePak()
 {
 	FS::AddBuiltinPak("daemon", ENGINE_VERSION, engineBasePak);
 
+#if defined(BUILD_GRAPHICAL_CLIENT) || defined(BUILD_TTY_CLIENT)
+	FS::AddBuiltinPak("daemon-client", ENGINE_VERSION, EngineMedia::FileMap);
+#endif
+
 	Cmd::Args extrapaks(fs_extrapaks.Get());
 	for (auto& x: extrapaks) {
 		if (!FS_LoadPak(x)) {