Merge branch 'newBuiltinResources' into bugfix/address-build-problems-builtin-linux-window

Author: AnastaZIuk

CMakeLists.txt

@@ -55,6 +55,7 @@ endif()
 
 get_filename_component(NBL_ROOT_PATH "${CMAKE_CURRENT_SOURCE_DIR}" ABSOLUTE)
 get_filename_component(NBL_ROOT_PATH_BINARY "${CMAKE_CURRENT_BINARY_DIR}" ABSOLUTE)
+set(NBL_BUILTIN_RESOURCES_DIRECTORY_PATH "${NBL_ROOT_PATH}/include")
 
 # Configure CCache if available
 find_program(CCACHE_FOUND ccache)

cmake/common.cmake

@@ -84,6 +84,7 @@ macro(nbl_create_executable_project _EXTRA_SOURCES _EXTRA_OPTIONS _EXTRA_INCLUDE
 
 	target_include_directories(${EXECUTABLE_NAME}
 		PUBLIC "${NBL_ROOT_PATH}/examples_tests/common"
+		PUBLIC "${NBL_ROOT_PATH_BINARY}/include"
 		PUBLIC ../../include
 		PRIVATE ${_EXTRA_INCLUDES}
 	)

examples_tests

@@ -11,27 +11,14 @@
 
 #include <string>
 #include <string_view>
-
-#include "nbl/core/string/StringLiteral.h"
+//#include "nbl/builtin/"
+#include "nbl/builtin/builtinResources.h"
 
 namespace nbl::builtin
 {
-	
-constexpr std::string_view PathPrefix = "nbl/builtin/";
-constexpr bool hasPathPrefix(std::string_view str) { return str.find(PathPrefix) == 0ull; }
 
 // 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&);
 
-#ifndef _NBL_EMBED_BUILTIN_RESOURCES_
-#define _NBL_BUILTIN_PATH_AVAILABLE
-constexpr std::string_view getBuiltinResourcesDirectoryPath()
-{
-    std::string_view retval = __FILE__;
-    retval.remove_suffix(PathPrefix.size()+std::string_view("common.h").size());
-    return retval;
-}
-#endif
-
 }
 #endif

include/nbl/builtin/common.h

@@ -77,6 +77,8 @@
 #endif
 #endif
 
+#define NBL_BUILTIN_RESOURCES_DIRECTORY_PATH "@NBL_BUILTIN_RESOURCES_DIRECTORY_PATH@"
+
 // DDL exports
 #cmakedefine _NBL_SHARED_BUILD_
 #ifdef _NBL_SHARED_BUILD_

include/nbl/config/BuildConfigOptions.h.in

@@ -9,7 +9,6 @@
 
 #include "nbl/system/ICancellableAsyncQueueDispatcher.h"
 #include "nbl/system/IFileArchive.h"
-#include "nbl/builtin/builtinResources.h"
 
 #include <variant>
 
@@ -84,6 +83,15 @@ class NBL_API2 ISystem : public core::IReferenceCounted
                 void handle_request(SRequestType& req, SRequestParams_WRITE& param);
                 core::smart_refctd_ptr<ICaller> m_caller;
         };
+
+#ifndef _NBL_EMBED_BUILTIN_RESOURCES_
+        constexpr std::string_view getBuiltinResourcesDirectoryPath()
+        {
+            std::string_view retval = NBL_BUILTIN_RESOURCES_DIRECTORY_PATH;
+            return retval;
+        }
+#endif
+
         friend class ISystemFile;
         CAsyncQueue m_dispatcher;
 

include/nbl/system/ISystem.h

@@ -364,6 +364,7 @@ set(NABLA_HEADERS "${NBL_ROOT_PATH}/include/nabla.h" ${NABLA_HEADERS_PUBLIC} ${N
 set(NBL_LIBRARY_CREATION_SOURCES 
 	${NABLA_SRCS_COMMON}
 	${NABLA_HEADERS}
+	${_NBL_BUILTIN_RESOURCES_ARCHIVE_APK_SOURCES_}
 	$<TARGET_OBJECTS:aesGladman>
 	$<TARGET_OBJECTS:bzip2>
 	$<TARGET_OBJECTS:lz4>
@@ -411,6 +412,20 @@ if(NOT NBL_STATIC_BUILD)
 	set_target_properties(Nabla PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${NBL_ASSEMBLY_DIRECTORY})
 endif()
 
+if(NBL_EMBED_BUILTIN_RESOURCES)
+	add_dependencies(Nabla ${_NBL_BUILTIN_RESOURCES_LIBRARIES_})
+	
+	if(NBL_STATIC_BUILD)
+		target_link_libraries(Nabla INTERFACE
+			${_NBL_BUILTIN_RESOURCES_LIBRARIES_}
+		)
+	else()
+		target_link_libraries(Nabla PRIVATE 
+			${_NBL_BUILTIN_RESOURCES_LIBRARIES_}
+		)
+	endif()
+endif()
+
 ## Set up 3rdparty deps
 # Parallel Hashmap
 target_include_directories(Nabla PUBLIC ${THIRD_PARTY_SOURCE_DIR}/parallel-hashmap/parallel_hashmap)
@@ -611,12 +626,6 @@ if(NBL_PCH)
 	target_precompile_headers(Nabla PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/pch.h")
 endif()
 
-if(NBL_EMBED_BUILTIN_RESOURCES)
-	add_dependencies(Nabla nblBuiltinResourceData)
-	target_link_libraries(Nabla PUBLIC nblBuiltinResourceData)
-	target_include_directories(Nabla PUBLIC "${NBL_BUILTIN_RESOURCES_HEADER}")
-endif()
-
 # extensions
 start_tracking_variables_for_propagation_to_parent()
 add_subdirectory(ext)
@@ -628,13 +637,13 @@ if(NOT NBL_STATIC_BUILD)
 		COMMENT "Launching defines.h generation script!"
 		VERBATIM
 	)
-	
-	add_custom_target(generate_define_header ALL DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/generated/define.h")
-	add_dependencies(Nabla generate_define_header)
 endif()
 
 nbl_install_headers("${NABLA_HEADERS_PUBLIC}" "${NBL_ROOT_PATH}/include")
-nbl_install_file("${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/generated/define.h" "")
+if(NOT NBL_STATIC_BUILD)
+	nbl_install_file("${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/generated/define.h" "")
+endif()
+nbl_install_file("${NBL_ROOT_PATH_BINARY}/include/nbl/builtin/builtinResources.h" "nbl/builtin")
 nbl_install_config_header(BuildConfigOptions.h)
 
 # TODO: @AnastazIuk change macros to functions! https://github.com/buildaworldnet/IrrlichtBAW/issues/311

src/nbl/CMakeLists.txt

@@ -3,12 +3,12 @@
 // For conditions of distribution and use, see copyright notice in nabla.h
 #include "nbl/asset/utils/CGLSLCompiler.h"
 #include "nbl/asset/utils/shadercUtils.h"
+#include "nbl/builtin/CArchive.h"
 
 #include <sstream>
 #include <regex>
 #include <iterator>
 
-
 using namespace nbl;
 using namespace nbl::asset;
 

src/nbl/asset/utils/CGLSLCompiler.cpp

@@ -3,6 +3,7 @@
 // For conditions of distribution and use, see copyright notice in nabla.h
 #include "nbl/asset/utils/CHLSLCompiler.h"
 #include "nbl/asset/utils/shadercUtils.h"
+#include "nbl/builtin/CArchive.h"
 
 #include <wrl.h>
 #include <combaseapi.h>