add more NBL_API2 for some classes and update builtin resource generation python scripts - make their sources be independent of Nabla's NBL_API2. Update builtin CMake utils

Author: AnastaZIuk

include/nbl/system/CFileViewVirtualAllocatorWin32.h

@@ -4,7 +4,7 @@
 namespace nbl::system 
 {
 #ifdef _NBL_PLATFORM_WINDOWS_
-class CFileViewVirtualAllocatorWin32 : public IFileViewAllocator
+class NBL_API2 CFileViewVirtualAllocatorWin32 : public IFileViewAllocator
 {
 	public:
 		using IFileViewAllocator::IFileViewAllocator;

include/nbl/system/IFileArchive.h

@@ -21,7 +21,7 @@ namespace nbl::system
 class IFile;
 
 //! The FileArchive manages archives and provides access to files inside them.
-class IFileArchive : public core::IReferenceCounted
+class NBL_API2 IFileArchive : public core::IReferenceCounted
 {
 	public:
 		enum E_ALLOCATOR_TYPE

src/nbl/builtin/builtinHeaderGen.py

@@ -18,7 +18,7 @@
     resourcesFile  = sys.argv[3]
     resourcesNamespace = sys.argv[4]
     guardSuffix = sys.argv[5]
-    isSharedLibrary = sys.argv[6]
+    isSharedLibrary = True if sys.argv[6] == "True" else False
 
     file = open(resourcesFile, 'r')
     resourcePaths = file.readlines()
@@ -37,19 +37,25 @@
     if isSharedLibrary:   
         outp.write("#if defined(__NBL_BUILDING_TARGET__) // currently compiling the target, this define is passed through the commandline\n")
         outp.write("#if defined(_MSC_VER)\n")
-        outp.write("#define NBL_API2 __declspec(dllexport)\n")
+        outp.write("#define BR_API __declspec(dllexport)\n")
         outp.write("#elif defined(__GNUC__)\n")
-        outp.write('#define NBL_API2 __attribute__ ((visibility ("default")))' + "\n")
+        outp.write('#define BR_API __attribute__ ((visibility ("default")))' + "\n")
         outp.write("#endif\n")
         outp.write("#else\n")
         outp.write("#if defined(_MSC_VER)\n")
-        outp.write("#define NBL_API2 __declspec(dllimport)\n")
+        outp.write("#define BR_API __declspec(dllimport)\n")
         outp.write("#else\n")
-        outp.write("#define NBL_API2\n")
+        outp.write("#define BR_API\n")
         outp.write("#endif\n")
         outp.write("#endif\n\n")
 
     outp.write("namespace " + resourcesNamespace + " { \n")
+    
+    if isSharedLibrary:
+        outp.write("\t\tBR_API std::pair<const uint8_t*, size_t> get_resource_runtime(const std::string& filename);\n\n")
+    else:
+        outp.write("\t\tstd::pair<const uint8_t*, size_t> get_resource_runtime(const std::string& filename);\n\n")
+    
     outp.write("\t\ttemplate<nbl::core::StringLiteral Path>\n")
     outp.write("\t\tconst std::pair<const uint8_t*, size_t> get_resource();\n")
 
@@ -59,14 +65,14 @@
         x = itemData[0].rstrip()
 
         if isSharedLibrary:
-            outp.write('\n\t\ttemplate<> NBL_API2 const std::pair<const uint8_t*, size_t> get_resource<NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("%s")>();' % x)
+            outp.write('\n\t\ttemplate<> BR_API const std::pair<const uint8_t*, size_t> get_resource<NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("%s")>();' % x)
         else:
             outp.write('\n\t\ttemplate<> const std::pair<const uint8_t*, size_t> get_resource<NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("%s")>();' % x)
 
         if len(itemData) > 1:
             for i in range(1, len(itemData)):
                 if isSharedLibrary:
-                    outp.write('\n\t\ttemplate<> NBL_API2 const std::pair<const uint8_t*, size_t> get_resource<NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("%s")>();' % itemData[i].rstrip())
+                    outp.write('\n\t\ttemplate<> BR_API const std::pair<const uint8_t*, size_t> get_resource<NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("%s")>();' % itemData[i].rstrip())
                 else:
                     outp.write('\n\t\ttemplate<> const std::pair<const uint8_t*, size_t> get_resource<NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("%s")>();' % itemData[i].rstrip())
 

src/nbl/builtin/template/CArchive.h.in

@@ -8,8 +8,6 @@ namespace @_NAMESPACE_@
 {
 	constexpr std::string_view pathPrefix = "@_BUNDLE_ARCHIVE_ABSOLUTE_PATH_@";
 	constexpr bool hasPathPrefix(std::string_view str) { return str.find(pathPrefix) == 0ull; }
-	
-	std::pair<const uint8_t*, size_t> get_resource_runtime(const std::string& filename);
 
 	class CArchive final : public nbl::system::CFileArchive
 	{

src/nbl/builtin/utils.cmake

@@ -45,6 +45,14 @@ function(ADD_CUSTOM_BUILTIN_RESOURCES _TARGET_NAME_ _BUNDLE_NAME_ _BUNDLE_SEARCH
 	if(NOT DEFINED _Python3_EXECUTABLE)
 		message(FATAL_ERROR "_Python3_EXECUTABLE must be defined - call find_package(Python3 COMPONENTS Interpreter REQUIRED)")
 	endif()
+	
+	if("${ARGV7}" STREQUAL "SHARED")
+		set(_LIB_TYPE_ SHARED)
+		set(_SHARED_ True)
+	else()
+		set(_LIB_TYPE_ STATIC)
+		set(_SHARED_ False)
+	endif()
 
 	set(NBL_TEMPLATE_RESOURCES_ARCHIVE_HEADER "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/template/CArchive.h.in")
 	set(NBL_BUILTIN_HEADER_GEN_PY "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/builtinHeaderGen.py")
@@ -115,14 +123,6 @@ function(ADD_CUSTOM_BUILTIN_RESOURCES _TARGET_NAME_ _BUNDLE_NAME_ _BUNDLE_SEARCH
 
 	set(NBL_BUILTIN_RESOURCES_HEADER "${_OUTPUT_HEADER_DIRECTORY_}/${NBL_BS_HEADER_FILENAME}")
 	set(NBL_BUILTIN_RESOURCE_DATA_SOURCE "${_OUTPUT_SOURCE_DIRECTORY_}/${NBL_BS_DATA_SOURCE_FILENAME}")
-	
-	if("${ARGV7}" STREQUAL "SHARED")
-		set(_LIB_TYPE_ SHARED)
-		set(_SHARED_ True)
-	else()
-		set(_LIB_TYPE_ STATIC)
-		set(_SHARED_ False)
-	endif()
 
 	add_custom_command(
 		OUTPUT "${NBL_BUILTIN_RESOURCES_HEADER}" "${NBL_BUILTIN_RESOURCE_DATA_SOURCE}"