tweak header generation for clang and gcc

Signed-off-by: Michael Pollind <mpollind@gmail.com>

Author: pollend

include/nbl/system/ISystem.h

@@ -9,7 +9,7 @@
 
 #include "nbl/system/ICancellableAsyncQueueDispatcher.h"
 #include "nbl/system/IFileArchive.h"
-//#include "nbl/builtin/builtinResources.h"
+#include "nbl/builtin/builtinResources.h"
 
 #include <variant>
 

src/nbl/builtin/CMakeLists.txt

@@ -268,7 +268,7 @@ function(ADD_CUSTOM_BUILTIN_RESOURCES _TARGET_NAME_ _NAMESPACE_ _CUSTOM_RESOURCE
 	add_custom_command(
 		OUTPUT "${NBL_BUILTIN_RESOURCES_HEADER}" "${NBL_BUILTIN_RESOURCE_DATA_SOURCE}"
 		COMMAND "${PYTHON_EXECUTABLE}" "${NBL_BUILTIN_HEADER_GEN_PY}" "${NBL_BUILTIN_RESOURCES_HEADER}" "${NBL_ROOT_PATH}/include" "${NBL_RESOURCES_LIST_FILE}" "${_NAMESPACE_}"
-		COMMAND "${PYTHON_EXECUTABLE}" "${NBL_BUILTIN_DATA_GEN_PY}" "${NBL_BUILTIN_RESOURCE_DATA_SOURCE}" "${NBL_ROOT_PATH}/include" "${NBL_RESOURCES_LIST_FILE}" "${_NAMESPACE_}" "${NBL_BS_HEADER_FILENAME}"
+		COMMAND "${PYTHON_EXECUTABLE}" "${NBL_BUILTIN_DATA_GEN_PY}" "${NBL_BUILTIN_RESOURCE_DATA_SOURCE}" "${NBL_ROOT_PATH}/include" "${NBL_RESOURCES_LIST_FILE}" "${_NAMESPACE_}"
 		COMMENT "Generating built-in resources"
 		DEPENDS ${NBL_DEPENDENCY_FILES}
 		VERBATIM  

src/nbl/builtin/builtinDataGen.py

@@ -17,20 +17,26 @@
     cmakeSourceDir = sys.argv[2]
     resourcesFile  = sys.argv[3]
     resourcesNamespace = sys.argv[4]
-    correspondingHeaderFile = sys.argv[5]
 
     with open(resourcesFile, "r") as f:
         resourcePaths = f.read().rstrip().split(',')
 
     #opening a file
     outp = open(outputFilename,"w+")
 
-    outp.write("#include \"" + correspondingHeaderFile + "\"\n")
+
+    outp.write("#include \"nbl/core/string/StringLiteral.h\"\n")
+    outp.write("#include <cstdint>\n")
+    outp.write("#include <unordered_map>\n");
+    outp.write("#include <string>\n");
     outp.write("\tnamespace " + resourcesNamespace + " {\n")
+
+    outp.write("template<nbl::core::StringLiteral Path>")
+    outp.write("const std::pair<const uint8_t*, size_t> get_resource();")
 
     # writing binary  data of all files in a loop
     for x in resourcePaths:
-        outp.write('\n\ttemplate<> const std::pair<const uint8_t*, size_t> get_resource<typename NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("%s")>()' % x)
+        outp.write('\n\ttemplate<> const std::pair<const uint8_t*, size_t> get_resource<NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("%s")>()' % x)
         outp.write('\n\t{')
         outp.write('\n\t\tstatic const uint8_t data[] = {\n\t\t\t')
         try:
@@ -53,7 +59,6 @@
         outp.write('\n\t\t};')
         outp.write('\n\t\treturn { data, sizeof(data) };')
         outp.write('\n\t}')
-        outp.write('\n\ttemplate const std::pair<const uint8_t*, size_t> get_resource<typename NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("%s")>();\n\n\n'%x)
 
 
     outp.write("\tstd::pair<const uint8_t*, size_t> get_resource_runtime(const std::string& filename) {\n")
@@ -68,7 +73,7 @@
     outp.write("\t\tswitch (resource->second) \n\t\t\t{\n")
     counter = 1
     for x in resourcePaths:
-        outp.write("\t\t\tcase %d:\n\t\t\t\t\treturn get_resource<typename NBL_CORE_UNIQUE_STRING_LITERAL_TYPE(\"%s\")>();\n" % (counter,x))
+        outp.write("\t\t\tcase %d:\n\t\t\t\t\treturn get_resource<NBL_CORE_UNIQUE_STRING_LITERAL_TYPE(\"%s\")>();\n" % (counter,x))
         counter+= 1
 
     outp.write("\t\t\tdefault:\n")

src/nbl/builtin/builtinHeaderGen.py

@@ -37,7 +37,7 @@
 
     #Iterating through input list
     for x in resourcePaths:
-        outp.write('\n\t\textern template const std::pair<const uint8_t*, size_t> get_resource<typename NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("%s")>();' % x)
+        outp.write('\n\t\textern template const std::pair<const uint8_t*, size_t> get_resource<NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("%s")>();' % x)
 
     outp.write("\n\t}")
     outp.write("\n#endif")