DaemonFileEmbedder: make it fully standalone, do not expose unsigned char

Author: illwieckz

cmake/DaemonFileEmbedder.cmake

@@ -29,10 +29,15 @@ string(REGEX REPLACE
 
 # A bit more of beautification.
 string(REGEX REPLACE ",$" ",\n" contents "${contents}")
+set(DATA_VARIABLE_NAME "data_${VARIABLE_NAME}")
 
 file(WRITE ${OUTPUT_FILE}
-	"constexpr unsigned char ${VARIABLE_NAME}[] =\n"
+	"constexpr unsigned char ${DATA_VARIABLE_NAME}[] =\n"
 	"{\n"
 	"${contents}"
 	"};\n"
+	"const embeddedFileMapEntry_t ${VARIABLE_NAME} = {\n"
+	"reinterpret_cast<const char*>( ${DATA_VARIABLE_NAME} ),\n"
+	"sizeof( ${DATA_VARIABLE_NAME} ) - 1\n"
+	"};\n"
 )

cmake/DaemonSourceGenerator.cmake

@@ -82,14 +82,36 @@ macro(daemon_embed_files basename dir list format targetname)
 		set_property(TARGET "${targetname}" APPEND PROPERTY SOURCES "${embed_${kind}_src_file}")
 	endforeach()
 
+	if (NOT DAEMON_EMBEDDED_FILE_HEADER)
+		set(DAEMON_EMBEDDED_FILE_HEADER "${DAEMON_EMBEDDED_SUBDIR}}/DaemonEmbeddedFile.h")
+
+		string(APPEND embed_header_text
+			"#ifndef DAEMON_EMBEDDED_FILE_H_\n"
+			"#define DAEMON_EMBEDDED_FILE_H_\n"
+			"#include <string>\n"
+			"\n"
+			"struct embeddedFileMapEntry_t\n"
+			"{\n"
+			"	const char* data;\n"
+			"	size_t size;\n"
+			"};\n"
+			"\n"
+			"using embeddedFileMap_t = std::unordered_map<std::string, const embeddedFileMapEntry_t>;\n"
+			"#endif // DAEMON_EMBEDDED_FILE_H_\n"
+		)
+
+		set(embed_header_file "${DAEMON_GENERATED_DIR}/${DAEMON_EMBEDDED_FILE_HEADER}")
+		file(GENERATE OUTPUT "${embed_header_file}" CONTENT "${embed_header_text}")
+	endif()
+
 	string(APPEND embed_CPP_text
 		"#include \"${embed_H_file}\"\n"
 		"\n"
 		"namespace ${basename} {\n"
 	)
 
 	string(APPEND embed_H_text
-		"#include \"common/Common.h\"\n"
+		"#include \"${DAEMON_EMBEDDED_FILE_HEADER}\"\n"
 		"\n"
 		"namespace ${basename} {\n"
 	)
@@ -123,11 +145,11 @@ macro(daemon_embed_files basename dir list format targetname)
 		)
 
 		string(APPEND embed_H_text
-			"extern const unsigned char ${filename_symbol}[];\n"
+			"extern const embeddedFileMapEntry_t ${filename_symbol};\n"
 		)
 
 		string(APPEND embed_map_text
-			"\t{ \"${filename}\", { ${filename_symbol}, sizeof( ${filename_symbol}) - 1 } },\n"
+			"\t{ \"${filename}\", ${filename_symbol} },\n"
 		)
 	endforeach()
 

src/common/Common.h

@@ -48,7 +48,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "Color.h"
 #include "Serialize.h"
 #include "DisjointSets.h"
-#include "EmbeddedFile.h"
 
 using Math::Vec2;
 using Math::Vec3;

src/common/EmbeddedFile.h

@@ -94,7 +94,7 @@ namespace // Implementation details
 	{
 		auto it = EngineShaders::FileMap.find(filename);
 		if (it != EngineShaders::FileMap.end())
-			return (const char*) it->second.data;
+			return it->second.data;
 		return nullptr;
 	}