ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-05 07:08:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow for multiple .asm files

Browse Source
This commit is contained in:
gingerBill
2021-11-24 17:57:31 +00:00
parent 50057b0696
commit 994ee5a559
1 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.cpp
+6 -14
View File
@@ -175,9 +175,6 @@ i32 linker_stage(lbGenerator *gen) {
} }
timings_start_section(timings, section_name); timings_start_section(timings, section_name);
gbString nasm_str = gb_string_make(heap_allocator(), "");
defer (gb_string_free(nasm_str));
gbString lib_str = gb_string_make(heap_allocator(), ""); gbString lib_str = gb_string_make(heap_allocator(), "");
defer (gb_string_free(lib_str)); defer (gb_string_free(lib_str));
char lib_str_buf[1024] = {0}; char lib_str_buf[1024] = {0};
@@ -252,12 +249,6 @@ i32 linker_stage(lbGenerator *gen) {
} }
for_array(i, asm_files.entries) {
String lib = asm_files.entries[i].value;
nasm_str = gb_string_append_fmt(nasm_str, " \"%.*s\"", LIT(lib));
}
if (build_context.build_mode == BuildMode_DynamicLibrary) { if (build_context.build_mode == BuildMode_DynamicLibrary) {
output_ext = "dll"; output_ext = "dll";
link_settings = gb_string_append_fmt(link_settings, " /DLL"); link_settings = gb_string_append_fmt(link_settings, " /DLL");
@@ -279,15 +270,16 @@ i32 linker_stage(lbGenerator *gen) {
link_settings = gb_string_append_fmt(link_settings, " /DEBUG"); link_settings = gb_string_append_fmt(link_settings, " /DEBUG");
} }
if (asm_files.entries.count > 0) { for_array(i, asm_files.entries) {
String obj_file = str_lit("__odin__nasm.obj"); String asm_file = asm_files.entries[i].value;
String obj_file = concatenate_strings(permanent_allocator(), asm_file, str_lit(".obj"));
result = system_exec_command_line_app("nasm", result = system_exec_command_line_app("nasm",
"\"%.*s\\bin\\nasm\\nasm.exe\" %s " "\"%.*s\\bin\\nasm\\nasm.exe\" \"%.*s\" "
"-f win64 " "-f win64 "
"-o %.*s " "-o \"%.*s\" "
"", "",
LIT(build_context.ODIN_ROOT), nasm_str, LIT(build_context.ODIN_ROOT), LIT(asm_file),
LIT(obj_file) LIT(obj_file)
); );