mirror of
https://github.com/open-goal/jak-project
synced 2026-08-21 14:54:53 -04:00
decomp: fix calls to read_config_file (#1717)
This commit is contained in:
+2
-1
@@ -166,6 +166,7 @@ struct Config {
|
||||
std::unordered_map<std::string, std::vector<std::string>> import_deps_by_file;
|
||||
};
|
||||
|
||||
Config read_config_file(const fs::path& path_to_config_file, const std::string& override_json);
|
||||
Config read_config_file(const fs::path& path_to_config_file,
|
||||
const std::string& override_json = "{}");
|
||||
|
||||
} // namespace decompiler
|
||||
|
||||
@@ -106,8 +106,7 @@ void decompile(const fs::path& iso_data_path, const std::string& data_subfolder)
|
||||
|
||||
Config config = read_config_file((file_util::get_jak_project_dir() / "decompiler" / "config" /
|
||||
fmt::format("{}.jsonc", version_info.decomp_config))
|
||||
.string(),
|
||||
{});
|
||||
.string());
|
||||
|
||||
std::vector<fs::path> dgos, objs;
|
||||
|
||||
|
||||
@@ -63,8 +63,7 @@ Decompiler setup_decompiler(const std::vector<DecompilerFile>& files,
|
||||
decompiler::init_opcode_info();
|
||||
dc.config = std::make_unique<decompiler::Config>(decompiler::read_config_file(
|
||||
(file_util::get_jak_project_dir() / "decompiler" / "config" / game_name_to_config[game_name])
|
||||
.string(),
|
||||
{}));
|
||||
.string()));
|
||||
|
||||
// modify the config
|
||||
std::unordered_set<std::string> object_files;
|
||||
|
||||
Reference in New Issue
Block a user