change name of mod toml setting to 'mod_filename'

This commit is contained in:
LittleCube 2024-12-19 14:07:54 -05:00
parent ef0e7a575a
commit 2632d435b0

View file

@ -35,7 +35,7 @@ struct ModManifest {
struct ModInputs {
std::filesystem::path elf_path;
std::string nrm_name;
std::string mod_filename;
std::filesystem::path func_reference_syms_file_path;
std::vector<std::filesystem::path> data_reference_syms_file_paths;
std::vector<std::filesystem::path> additional_files;
@ -318,12 +318,12 @@ ModInputs parse_mod_config_inputs(const std::filesystem::path& basedir, const to
}
// Output NRM file
std::optional<std::string> nrm_name_opt = inputs_table["nrm_name"].value<std::string>();
if (nrm_name_opt.has_value()) {
ret.nrm_name = std::move(nrm_name_opt.value());
std::optional<std::string> mod_filename_opt = inputs_table["mod_filename"].value<std::string>();
if (mod_filename_opt.has_value()) {
ret.mod_filename = std::move(mod_filename_opt.value());
}
else {
throw toml::parse_error("Mod toml input section is missing the output NRM filename", inputs_table.source());
throw toml::parse_error("Mod toml input section is missing the output mod filename", inputs_table.source());
}
// Function reference symbols file
@ -889,7 +889,7 @@ N64Recomp::Context build_mod_context(const N64Recomp::Context& input_context, bo
}
bool create_mod_zip(const std::filesystem::path& output_dir, const ModConfig& config) {
std::filesystem::path output_path = output_dir / (config.inputs.nrm_name + ".nrm");
std::filesystem::path output_path = output_dir / (config.inputs.mod_filename + ".nrm");
#ifdef _WIN32
std::filesystem::path temp_zip_path = output_path;