Mercury/N64Recomp
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fixed relocatable section file path error using the wrong value, added an include for funcs.h to single-file output mode

Browse source
This commit is contained in:
Mr-Wiseguy 2023-11-24 15:11:36 -05:00
parent be275c198a
commit 9a4f650c9b
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main.cpp
View file

@ -1093,7 +1093,7 @@ int main(int argc, char** argv) {
if (!config.relocatable_sections_path.empty()) { if (!config.relocatable_sections_path.empty()) {
if (!read_list_file(config.relocatable_sections_path, relocatable_sections_ordered)) { if (!read_list_file(config.relocatable_sections_path, relocatable_sections_ordered)) {
exit_failure("Failed to load the relocatable section list file: " + std::string(argv[4]) + "\n"); exit_failure(fmt::format("Failed to load the relocatable section list file: {}\n", (const char*)config.relocatable_sections_path.u8string().c_str()));
} }
} }
@ -1213,10 +1213,15 @@ int main(int argc, char** argv) {
} }
std::ofstream single_output_file; std::ofstream single_output_file;
bool header_written = false;
if (config.single_file_output) { if (config.single_file_output) {
single_output_file.open(config.output_func_path / config.elf_path.stem().replace_extension(".c")); single_output_file.open(config.output_func_path / config.elf_path.stem().replace_extension(".c"));
// Write the file header
fmt::print(single_output_file,
"#include \"recomp.h\"\n"
"#include \"disable_warnings.h\"\n"
"#include \"funcs.h\"\n"
"\n");
} }
//#pragma omp parallel for //#pragma omp parallel for
@ -1228,8 +1233,7 @@ int main(int argc, char** argv) {
"void {}(uint8_t* rdram, recomp_context* ctx);\n", func.name); "void {}(uint8_t* rdram, recomp_context* ctx);\n", func.name);
bool result; bool result;
if (config.single_file_output) { if (config.single_file_output) {
result = RecompPort::recompile_function(context, config, func, single_output_file, static_funcs_by_section, !header_written); result = RecompPort::recompile_function(context, config, func, single_output_file, static_funcs_by_section, false);
header_written = true;
} }
else { else {
result = recompile_single_function(context, config, func, config.output_func_path / (func.name + ".c"), static_funcs_by_section); result = recompile_single_function(context, config, func, config.output_func_path / (func.name + ".c"), static_funcs_by_section);
@ -1301,8 +1305,7 @@ int main(int argc, char** argv) {
bool result; bool result;
if (config.single_file_output) { if (config.single_file_output) {
result = RecompPort::recompile_function(context, config, func, single_output_file, static_funcs_by_section, !header_written); result = RecompPort::recompile_function(context, config, func, single_output_file, static_funcs_by_section, false);
header_written = true;
} }
else { else {
result = recompile_single_function(context, config, func, config.output_func_path / (func.name + ".c"), static_funcs_by_section); result = recompile_single_function(context, config, func, config.output_func_path / (func.name + ".c"), static_funcs_by_section);