Fix compile errors, embed Nabla builtin resources into static library with correct MSVC runtime and make sure it compiles itself. Correct python scripts and have proper dependency chain. Move get_resource template declaration to nbl/string/StringLiteral.h header. NOTE: I have many nbl::system::DynamicLibraryFunctionPointer errors while compiling Nabla, it seems like they used to be there recently, maybe I need to pull master or something

Author: AnastaZIuk

include/nbl/builtin/common.h

@@ -14,10 +14,6 @@
 namespace nbl::builtin
 {
 
-// if you attempt to use this without `NBL_EMBED_BUILTIN_RESOURCES_` CMake option, you will get loads of undefined references
-template<nbl::core::StringLiteral Path>
-const std::pair<const uint8_t*,size_t> get_resource();
-
 // if you attempt to use this without `NBL_EMBED_BUILTIN_RESOURCES_` CMake option, this will always return `{nullptr,0ull}`
 std::pair<const uint8_t*,size_t> get_resource_runtime(const std::string&);
 

include/nbl/core/declarations.h

@@ -60,7 +60,7 @@
 #include "nbl/core/parallel/unlock_guard.h"
 // string
 #include "nbl/core/string/stringutil.h"
-#include "nbl/core/string/UniqueStringLiteralType.h"
+#include "nbl/core/string/StringLiteral.h"
 // other useful things
 #include "nbl/core/SingleEventHandler.h"
 #include "nbl/core/EventDeferredHandler.h"

include/nbl/core/string/StringLiteral.h

@@ -22,3 +22,12 @@ struct StringLiteral
 
 // for compatibility's sake
 #define NBL_CORE_UNIQUE_STRING_LITERAL_TYPE(STRING_LITERAL) nbl::core::StringLiteral(STRING_LITERAL)
+
+namespace nbl::builtin
+{
+    // if you attempt to use this without `NBL_EMBED_BUILTIN_RESOURCES_` CMake option, you will get loads of undefined references
+    template<nbl::core::StringLiteral Path>
+    const std::pair<const uint8_t*, size_t> get_resource();
+}
+
+#endif // _NBL_CORE_STRING_LITERAL_H_INCLUDED_

include/nbl/system/ISystem.h

@@ -11,7 +11,7 @@
 
 #include "nbl/system/ICancellableAsyncQueueDispatcher.h"
 #include "nbl/system/IFileArchive.h"
-
+#include "nbl/core/string/StringLiteral.h"
 
 namespace nbl::system
 {
@@ -112,14 +112,14 @@ class NBL_API2 ISystem : public core::IReferenceCounted
         };
 
         //! Compile time resource ID
-        template<nbl::core::StringLiteral Path>
+        template<typename StringLiteralPath>
         inline core::smart_refctd_ptr<const IFile> loadBuiltinData() const
         {
         #ifdef _NBL_EMBED_BUILTIN_RESOURCES_
-            return impl_loadEmbeddedBuiltinData(Path::value,nbl::builtin::get_resource<Path>());
+            return impl_loadEmbeddedBuiltinData(StringLiteralPath::value,nbl::builtin::get_resource<StringLiteralPath>());
         #else
             future_t<core::smart_refctd_ptr<IFile>> future;
-            createFile(future,Path::value,core::bitflag(IFileBase::ECF_READ)|IFileBase::ECF_MAPPABLE);
+            createFile(future, StringLiteralPath::value,core::bitflag(IFileBase::ECF_READ)|IFileBase::ECF_MAPPABLE);
             return future.get();
         #endif
         }

src/nbl/CMakeLists.txt

@@ -385,10 +385,6 @@ if(MSVC)
 	list(APPEND NABLA_SRCS_COMMON "${PROJECT_SOURCE_DIR}/tools/debug/VisualStudio/DynamicArrayVisualizer.natvis")
 endif()
 
-if (NBL_EMBED_BUILTIN_RESOURCES)
-	list(APPEND NABLA_SRCS_COMMON "${NBL_BUILTIN_RESOURCES_SOURCE}")
-endif()
-
 set(COMMON_INCLUDE_DIRS
 	${THIRD_PARTY_SOURCE_DIR}/glm
         ${THIRD_PARTY_SOURCE_DIR}/renderdoc # for renderdoc api header
@@ -639,7 +635,9 @@ if(NBL_PCH)
 endif()
 
 if(NBL_EMBED_BUILTIN_RESOURCES)
-	add_dependencies(Nabla generateBuiltinResources)
+	add_dependencies(Nabla nblBuiltinResourceData)
+	target_link_libraries(Nabla PUBLIC nblBuiltinResourceData)
+	target_include_directories(Nabla PUBLIC "${NBL_BUILTIN_RESOURCES_HEADER}")
 endif()
 
 # extensions

src/nbl/builtin/CMakeLists.txt

@@ -255,18 +255,33 @@ function(NBL_ADD_BUILTIN_RESOURCES)
 	file(MAKE_DIRECTORY "${NBL_ROOT_PATH_BINARY}/include/nbl/builtin")
 	file(WRITE "${NBL_RESOURCES_LIST_FILE}" "${RESOURCES_ARGS}")
 
-	set(NBL_BUILTIN_RESOURCES_HEADER "${NBL_ROOT_PATH_BINARY}/include/nbl/builtin/builtinResources.h" PARENT_SCOPE)
-	set(NBL_BUILTIN_RESOURCES_SOURCE "${NBL_ROOT_PATH_BINARY}/include/nbl/builtin/builtinResourceData.cpp" PARENT_SCOPE)
+	set(NBL_BUILTIN_RESOURCES_HEADER "${NBL_ROOT_PATH_BINARY}/include/nbl/builtin/builtinResources.h")
+	set(NBL_BUILTIN_RESOURCE_DATA_SOURCE "${NBL_ROOT_PATH_BINARY}/include/nbl/builtin/builtinResourceData.cpp")
+	
+	set(_NBL_SOURCES_
+		"${NBL_BUILTIN_RESOURCES_HEADER}"
+		"${NBL_BUILTIN_RESOURCE_DATA_SOURCE}"
+	)
 
 	add_custom_command(
-		OUTPUT "${NBL_BUILTIN_RESOURCES_HEADER}" "${NBL_BUILTIN_RESOURCES_SOURCE}"
+		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}"
-		COMMAND "${PYTHON_EXECUTABLE}" "${NBL_BUILTIN_DATA_GEN_PY}" "${NBL_BUILTIN_RESOURCES_SOURCE}" "${NBL_ROOT_PATH}/include" "${NBL_RESOURCES_LIST_FILE}"
+		COMMAND "${PYTHON_EXECUTABLE}" "${NBL_BUILTIN_DATA_GEN_PY}" "${NBL_BUILTIN_RESOURCE_DATA_SOURCE}" "${NBL_ROOT_PATH}/include" "${NBL_RESOURCES_LIST_FILE}"
 		COMMENT "Generating built-in resources"
 		DEPENDS ${NBL_DEPENDENCY_FILES}
 		VERBATIM  
 	)
 
-	add_custom_target(generateBuiltinResources DEPENDS "${NBL_BUILTIN_RESOURCES_HEADER}" "${NBL_BUILTIN_RESOURCES_SOURCE}")
+	add_library(nblBuiltinResourceData STATIC
+		${_NBL_SOURCES_}
+	)
+	
+	target_include_directories(nblBuiltinResourceData PUBLIC "${NBL_ROOT_PATH}/include")
+	
+	if(NBL_DYNAMIC_MSVC_RUNTIME)
+		set_property(TARGET nblBuiltinResourceData PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
+	else()
+		set_property(TARGET nblBuiltinResourceData PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+	endif()
 endfunction()
 

src/nbl/builtin/builtinDataGen.py

@@ -29,16 +29,15 @@
     outp.write("#include <string>\n")
     outp.write("#include <unordered_map>\n")
     outp.write("#include <utility>\n")
-    outp.write("#include <nbl/core/string/UniqueStringLiteralType.h>\n")
-    outp.write("#include <nbl/builtin/common.h>\n")
+    outp.write("#include <nbl/core/string/StringLiteral.h>\n")
     outp.write("using namespace nbl;\n")
     outp.write("using namespace nbl::builtin;\n\n")
     outp.write("namespace nbl {\n")
     outp.write("\tnamespace builtin {\n\n")
 
     # writing binary  data of all files in a loop
     for x in resourcePaths:
-        outp.write('\n\t\ttemplate<> const std::pair<const uint8_t*, size_t> get_resource<NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("%s")>()' % x)
+        outp.write('\n\t\ttemplate<> const std::pair<const uint8_t*, size_t> get_resource<typename NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("%s")>()' % x)
         outp.write('\n\t\t{')
         outp.write('\n\t\t\tstatic const uint8_t data[] = {\n\t\t\t')
         try:
@@ -61,7 +60,7 @@
         outp.write('\n\t\t\t};')
         outp.write('\n\t\t\treturn { data, sizeof(data) };')
         outp.write('\n\t\t}')
-        outp.write('\n\t\ttemplate const std::pair<const uint8_t*, size_t> get_resource<NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("%s")>();\n\n\n'%x)
+        outp.write('\n\t\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("\t\tstd::pair<const uint8_t*, size_t> get_resource_runtime(const std::string& filename) {\n")
@@ -76,7 +75,7 @@
     outp.write("\t\t\tswitch (resource->second) \n\t\t\t{\n")
     counter = 1
     for x in resourcePaths:
-        outp.write("\t\t\t\tcase %d:\n\t\t\t\t\treturn get_resource<NBL_CORE_UNIQUE_STRING_LITERAL_TYPE(\"%s\")>();\n" % (counter,x))
+        outp.write("\t\t\t\tcase %d:\n\t\t\t\t\treturn get_resource<typename NBL_CORE_UNIQUE_STRING_LITERAL_TYPE(\"%s\")>();\n" % (counter,x))
         counter+= 1
 
     outp.write("\t\t\t\tdefault:\n")

src/nbl/builtin/builtinHeaderGen.py

@@ -29,12 +29,12 @@
     outp.write("#include <cstdint>\n")
     outp.write("#include <string>\n")
     outp.write("#include <unordered_map>\n")
-    outp.write("#include <utility>\n#include <nbl/core/string/UniqueStringLiteralType.h>\n#include <nbl/builtin/common.h>\n")
+    outp.write("#include <utility>\n#include <nbl/core/string/StringLiteral.h>\n")
     outp.write("namespace nbl { \n\tnamespace builtin { \n")
 
     #Iterating through input list
     for x in resourcePaths:
-        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\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}\n}")
     outp.write("\n#endif")

src/nbl/video/IOpenGL_FunctionTable.h

@@ -1,7 +1,7 @@
 #ifndef __NBL_I_OPEN_GL_FUNCTION_TABLE_H_INCLUDED__
 #define __NBL_I_OPEN_GL_FUNCTION_TABLE_H_INCLUDED__
 
-#include "nbl/core/string/UniqueStringLiteralType.h"
+#include "nbl/core/string/StringLiteral.h"
 
 #include <atomic>