diff options
| author | Tetralux <1348560+Tetralux@users.noreply.github.com> | 2019-01-21 12:29:32 +0000 |
|---|---|---|
| committer | Tetralux <1348560+Tetralux@users.noreply.github.com> | 2019-01-28 17:58:48 +0000 |
| commit | 1e180d611dd6bed9cccb42c4bf68c6f7df5b420e (patch) | |
| tree | 514797844d54aaaec463653e9f663eb09e3e7e07 /src/main.cpp | |
| parent | e452765d286c83be5c443950132d045a2d311b7d (diff) | |
Allow 'odin run program.odin -- <args-for-program.exe>
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/src/main.cpp b/src/main.cpp index a6838dd1c..03368c709 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -738,14 +738,32 @@ int main(int arg_count, char **arg_ptr) { Array<String> args = setup_args(arg_count, arg_ptr); String command = args[1]; - String init_filename = {}; + String run_args_string = {}; + bool run_output = false; if (command == "run") { if (args.count < 3) { usage(args[0]); return 1; } + + Array<String> run_args = array_make<String>(heap_allocator(), 0, arg_count); + defer (array_free(&run_args)); + + isize last_non_run_arg = args.count; + for_array(i, args) { + if (args[i] == "--") { + last_non_run_arg = i; + } + if (i <= last_non_run_arg) { + continue; + } + array_add(&run_args, args[i]); + } + + args = array_slice(args, 0, last_non_run_arg); + run_args_string = string_join_and_quote(heap_allocator(), run_args); init_filename = args[2]; run_output = true; } else if (command == "build") { @@ -974,7 +992,7 @@ int main(int arg_count, char **arg_ptr) { remove_temp_files(output_base); if (run_output) { - system_exec_command_line_app("odin run", false, "%.*s.exe", LIT(output_base)); + system_exec_command_line_app("odin run", false, "%.*s.exe %.*s", LIT(output_base), LIT(run_args_string)); } #else timings_start_section(&timings, str_lit("ld-link")); @@ -1111,7 +1129,7 @@ int main(int arg_count, char **arg_ptr) { if (run_output) { output_base = path_to_full_path(heap_allocator(), output_base); - system_exec_command_line_app("odin run", false, "\"%.*s\"", LIT(output_base)); + system_exec_command_line_app("odin run", false, "\"%.*s\" %.*s", LIT(output_base), LIT(run_args_string)); } #endif #endif |