DaemonSourceGenerator: do not copy the embedded files in the map

Author: illwieckz

cmake/DaemonSourceGenerator.cmake

@@ -110,22 +110,20 @@ macro(daemon_embed_files basename slug format targetname)
 		)
 
 		string(APPEND embed_map_text
-			"\t{ \"${filename}\", "
-			"std::string(reinterpret_cast<const char *>( ${filename_symbol} ), "
-			"sizeof( ${filename_symbol} )) },\n"
+			"\t{ \"${filename}\", { ${filename_symbol}, sizeof( ${filename_symbol}) - 1 } },\n"
 		)
 	endforeach()
 
 	string(APPEND embed_CPP_text
 		"\n"
-		"const std::unordered_map<std::string, std::string> FileMap\n{\n"
+		"const embeddedFileMap_t FileMap\n{\n"
 		"${embed_map_text}"
 		"};\n"
 		"}"
 	)
 
 	string(APPEND embed_H_text
-		"extern const std::unordered_map<std::string, std::string> FileMap;\n"
+		"extern const embeddedFileMap_t FileMap;\n"
 		"};\n"
 	)
 

cmake/EmbedText.cmake

@@ -10,13 +10,16 @@ file(READ ${INPUT_FILE} contents HEX)
 
 if ("${FILE_FORMAT}" STREQUAL "TEXT")
 	# Strip \r for consistency.
-	string(REGEX REPLACE "(0d)?(..)" "0x\\2," contents "${contents}")
+	string(REGEX REPLACE "(0d)?(..)" "0x\\2," contents "${contents}") 
 elseif("${FILE_FORMAT}" STREQUAL "BINARY")
 	string(REGEX REPLACE "(..)" "0x\\1," contents "${contents}")
 else()
 	message(FATAL_ERROR "Unknown file format: ${FILE_FORMAT}")
 endif()
 
+# Add null terminator.
+string(REGEX REPLACE ",$" ",0x00," contents "${contents}") 
+
 # Split long lines.
 string(REGEX REPLACE
 	"(0x..,0x..,0x..,0x..,0x..,0x..,0x..,0x..,0x..,0x..,0x..,0x..,0x..,0x..,0x..,)" "\\1\n"
@@ -26,7 +29,7 @@ string(REGEX REPLACE
 string(REGEX REPLACE ",$" ",\n" contents "${contents}")
 
 file(WRITE ${OUTPUT_FILE}
-	"const unsigned char ${VARIABLE_NAME}[] =\n"
+	"constexpr unsigned char ${VARIABLE_NAME}[] =\n"
 	"{\n"
 	"${contents}"
 	"};\n"

src/common/Common.h

@@ -48,6 +48,7 @@ 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

@@ -0,0 +1,7 @@
+struct embeddedFileMapEntry_t
+{
+	const unsigned char* data;
+	size_t size;
+};
+
+using embeddedFileMap_t = std::unordered_map<std::string, const embeddedFileMapEntry_t>;

src/engine/renderer/gl_shader.cpp

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