EmbedText make possible to chose between TEXT and BINARY formats when embedding files

Author: illwieckz

CMakeLists.txt

@@ -1038,7 +1038,7 @@ if (BUILD_CLIENT)
     )
 
     # Generate GLSL include files.
-    daemon_embed_files("EngineShaders" "GLSL" "client-objects")
+    daemon_embed_files("EngineShaders" "GLSL" "TEXT" "client-objects")
 endif()
 
 if (BUILD_SERVER)

cmake/DaemonSourceGenerator.cmake

@@ -79,6 +79,7 @@ macro(daemon_embed_files BASENAME SLUG FORMAT TARGETNAME)
 			COMMAND ${CMAKE_COMMAND}
 				"-DINPUT_FILE=${inpath}"
 				"-DOUTPUT_FILE=${outpath}"
+				"-DFILE_FORMAT=${FORMAT}"
 				"-DVARIABLE_NAME=${filename_symbol}"
 				-P "${CMAKE_CURRENT_SOURCE_DIR}/cmake/EmbedText.cmake"
 			MAIN_DEPENDENCY ${inpath}

cmake/EmbedText.cmake

@@ -1,8 +1,18 @@
 # Converts a text file into a C-language char array definition.
 # For use in CMake script mode (cmake -P).
-# Required definitions on command line: INPUT_FILE, OUTPUT_FILE, VARIABLE_NAME
+# Required definitions on command line:
+# INPUT_FILE, OUTPUT_FILE, FILE_FORMAT, VARIABLE_NAME
+
+# Inspired by:
+# https://stackoverflow.com/questions/11813271/embed-resources-eg-shader-code-images-into-executable-library-with-cmake/27206982#27206982
 
-# Inspired by https://stackoverflow.com/questions/11813271/embed-resources-eg-shader-code-images-into-executable-library-with-cmake/27206982#27206982
 file(READ ${INPUT_FILE} contents HEX)
-string(REGEX REPLACE "(0d)?(..)" "0x\\2," contents ${contents}) # Strip \r for consistency
+
+if ("${FILE_FORMAT}" STREQUAL "TEXT")
+	# Strip \r for consistency
+	string(REGEX REPLACE "(0d)?(..)" "0x\\2," contents ${contents})
+else()
+	string(REGEX REPLACE "(..)" "0x\\1," contents ${contents})
+endif()
+
 file(WRITE ${OUTPUT_FILE} "const unsigned char ${VARIABLE_NAME}[] = {${contents}};\n")