corregit make resources.pack

This commit is contained in:
2025-11-12 10:21:40 +01:00
parent cf40865d37
commit e626ec9763
3 changed files with 7 additions and 6 deletions

View File

@@ -3,7 +3,8 @@
"allow": [ "allow": [
"Bash(cmake --build:*)", "Bash(cmake --build:*)",
"Bash(test:*)", "Bash(test:*)",
"Bash(tools/linter/run_clang-tidy.sh:*)" "Bash(tools/linter/run_clang-tidy.sh:*)",
"Bash(make resources.pack:*)"
], ],
"deny": [], "deny": [],
"ask": [] "ask": []

View File

@@ -76,8 +76,8 @@ APP_SOURCES := \
source/core/rendering/texture.cpp \ source/core/rendering/texture.cpp \
source/core/rendering/gif.cpp \ source/core/rendering/gif.cpp \
source/core/rendering/opengl/opengl_shader.cpp \ source/core/rendering/opengl/opengl_shader.cpp \
source/core/resources/asset.cpp \ source/core/resources/resource_list.cpp \
source/core/resources/resource.cpp \ source/core/resources/resource_cache.cpp \
source/core/resources/resource_helper.cpp \ source/core/resources/resource_helper.cpp \
source/core/resources/resource_loader.cpp \ source/core/resources/resource_loader.cpp \
source/core/resources/resource_pack.cpp \ source/core/resources/resource_pack.cpp \

View File

@@ -29,7 +29,7 @@ auto handleDefaultPack() -> int {
std::cout << " Input: " << input_dir << "/\n"; std::cout << " Input: " << input_dir << "/\n";
std::cout << " Output: " << output_file << "\n\n"; std::cout << " Output: " << output_file << "\n\n";
Jdd::ResourcePack pack; Resource::Pack pack;
if (!pack.addDirectory(input_dir)) { if (!pack.addDirectory(input_dir)) {
std::cerr << "Error: Failed to add directory: " << input_dir << '\n'; std::cerr << "Error: Failed to add directory: " << input_dir << '\n';
return 1; return 1;
@@ -53,7 +53,7 @@ auto handleDefaultPack() -> int {
auto handleListContents(const std::string& pack_file) -> int { auto handleListContents(const std::string& pack_file) -> int {
std::cout << "Loading pack: " << pack_file << "\n\n"; std::cout << "Loading pack: " << pack_file << "\n\n";
Jdd::ResourcePack pack; Resource::Pack pack;
if (!pack.loadPack(pack_file)) { if (!pack.loadPack(pack_file)) {
std::cerr << "Error: Failed to load pack file: " << pack_file << '\n'; std::cerr << "Error: Failed to load pack file: " << pack_file << '\n';
return 1; return 1;
@@ -80,7 +80,7 @@ auto handlePackDirectory(const std::string& input_dir, const std::string& output
std::cout << "Input: " << input_dir << "/\n"; std::cout << "Input: " << input_dir << "/\n";
std::cout << "Output: " << output_file << "\n\n"; std::cout << "Output: " << output_file << "\n\n";
Jdd::ResourcePack pack; Resource::Pack pack;
if (!pack.addDirectory(input_dir)) { if (!pack.addDirectory(input_dir)) {
std::cerr << "Error: Failed to add directory: " << input_dir << '\n'; std::cerr << "Error: Failed to add directory: " << input_dir << '\n';
return 1; return 1;