Mirrors/N64Recomp
1
0
Fork 0
mirror of https://github.com/N64Recomp/N64Recomp.git synced 2025-05-22 03:14:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

implement nrm filename toml input

Browse source
This commit is contained in:
LittleCube 2024-12-19 13:47:53 -05:00
parent d33d381617
commit ef0e7a575a
1 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
RecompModTool/main.cpp
View file

@ -35,6 +35,7 @@ struct ModManifest {
struct ModInputs { struct ModInputs {
std::filesystem::path elf_path; std::filesystem::path elf_path;
std::string nrm_name;
std::filesystem::path func_reference_syms_file_path; std::filesystem::path func_reference_syms_file_path;
std::vector<std::filesystem::path> data_reference_syms_file_paths; std::vector<std::filesystem::path> data_reference_syms_file_paths;
std::vector<std::filesystem::path> additional_files; std::vector<std::filesystem::path> additional_files;
@ -316,6 +317,15 @@ ModInputs parse_mod_config_inputs(const std::filesystem::path& basedir, const to
throw toml::parse_error("Mod toml input section is missing elf file", inputs_table.source()); throw toml::parse_error("Mod toml input section is missing elf file", inputs_table.source());
} }
// 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());
}
else {
throw toml::parse_error("Mod toml input section is missing the output NRM filename", inputs_table.source());
}
// Function reference symbols file // Function reference symbols file
std::optional<std::string> func_reference_syms_file_opt = inputs_table["func_reference_syms_file"].value<std::string>(); std::optional<std::string> func_reference_syms_file_opt = inputs_table["func_reference_syms_file"].value<std::string>();
if (func_reference_syms_file_opt.has_value()) { if (func_reference_syms_file_opt.has_value()) {
@ -879,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) { bool create_mod_zip(const std::filesystem::path& output_dir, const ModConfig& config) {
std::filesystem::path output_path = output_dir / (config.manifest.mod_id + "-" + config.manifest.version_string + ".nrm"); std::filesystem::path output_path = output_dir / (config.inputs.nrm_name + ".nrm");
#ifdef _WIN32 #ifdef _WIN32
std::filesystem::path temp_zip_path = output_path; std::filesystem::path temp_zip_path = output_path;