Skip to content

Commit 9cb464f

Browse files
committed
update a few lines regarding path prefix, use pathPrefix created given
1 parent e8e5a4b commit 9cb464f

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
namespace @_NAMESPACE_@
88
{
9-
constexpr std::string_view pathPrefix = "@_PATH_PREFIX_@";
9+
constexpr std::string_view pathPrefix = "@_BUNDLE_ARCHIVE_ABSOLUTE_PATH_@";
1010
constexpr bool hasPathPrefix(std::string_view str) { return str.find(pathPrefix) == 0ull; }
1111

1212
std::pair<const uint8_t*, size_t> get_resource_runtime(const std::string& filename);
@@ -15,7 +15,7 @@ namespace @_NAMESPACE_@
1515
{
1616
public:
1717
inline CArchive(nbl::system::logger_opt_smart_ptr&& logger)
18-
: nbl::system::CFileArchive(nbl::system::path("@_BUNDLE_ARCHIVE_ABSOLUTE_PATH_@"),std::move(logger), getItemList()) {}
18+
: nbl::system::CFileArchive(nbl::system::path(pathPrefix.data()),std::move(logger), getItemList()) {}
1919

2020
protected:
2121
file_buffer_t getFileBuffer(const nbl::system::IFileArchive::SListEntry* item) override

src/nbl/builtin/utils.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ endmacro()
3030
# _BUNDLE_SEARCH_DIRECTORY_ is an absolute search directory path for builtin resorces for given bundle
3131
# _BUNDLE_ARCHIVE_ABSOLUTE_PATH_ is a "absolute path" for an archive which will store a given bundle of builtin resources, must be relative _BUNDLE_SEARCH_DIRECTORY_
3232
# _NAMESPACE_ is a C++ namespace builtin resources will be wrapped into
33-
# _OUTPUT_INCLUDE_SEARCH_DIRECTORY_ is an absolute path to output directory for builtin resources header files which will be a search directory for generated headers outputed to ${_OUTPUT_HEADER_DIRECTORY_}/${_PATH_PREFIX_} where path prefix is the namespace turned into a path
33+
# _OUTPUT_INCLUDE_SEARCH_DIRECTORY_ is an absolute path to output directory for builtin resources header files which will be a search directory for generated headers outputed to ${_OUTPUT_HEADER_DIRECTORY_}/${_NAMESPACE_PREFIX_} where namespace prefix is the namespace turned into a path
3434
# _OUTPUT_SOURCE_DIRECTORY_ is an absolute path to output directory for builtin resources source files
3535
#
3636
# As an example one could list a resource as following
@@ -51,14 +51,14 @@ function(ADD_CUSTOM_BUILTIN_RESOURCES _TARGET_NAME_ _BUNDLE_NAME_ _BUNDLE_SEARCH
5151
set(NBL_BS_HEADER_FILENAME "builtinResources.h")
5252
set(NBL_BS_DATA_SOURCE_FILENAME "builtinResourceData.cpp")
5353

54-
string(REPLACE "::" "/" _PATH_PREFIX_ "${_NAMESPACE_}")
54+
string(REPLACE "::" "/" _NAMESPACE_PREFIX_ "${_NAMESPACE_}")
5555
string(REPLACE "::" "_" _GUARD_SUFFIX_ "${_NAMESPACE_}")
5656
string(REGEX REPLACE "^[0-9]+\." "" _GUARD_SUFFIX_ ${_GUARD_SUFFIX_})
5757
string(TOUPPER ${_GUARD_SUFFIX_} _GUARD_SUFFIX_)
5858
string(MAKE_C_IDENTIFIER ${_GUARD_SUFFIX_} _GUARD_SUFFIX_)
5959

6060
set(_OUTPUT_INCLUDE_SEARCH_DIRECTORY_ "${_OUTPUT_INCLUDE_SEARCH_DIRECTORY_}")
61-
set(_OUTPUT_HEADER_DIRECTORY_ "${_OUTPUT_INCLUDE_SEARCH_DIRECTORY_}/${_PATH_PREFIX_}")
61+
set(_OUTPUT_HEADER_DIRECTORY_ "${_OUTPUT_INCLUDE_SEARCH_DIRECTORY_}/${_NAMESPACE_PREFIX_}")
6262

6363
file(MAKE_DIRECTORY "${_OUTPUT_HEADER_DIRECTORY_}")
6464
file(MAKE_DIRECTORY "${_OUTPUT_SOURCE_DIRECTORY_}")

0 commit comments

Comments
 (0)