From e49258c8c2973ea0e0bcfb95c05fb30479b66733 Mon Sep 17 00:00:00 2001 From: Ed_ Date: Sun, 15 Jun 2025 16:51:54 -0400 Subject: [PATCH] some setup --- code/asm.odin | 3 +++ code/{yasm.odin => host.odin} | 6 +++--- code/pkg_mappings.odin | 3 +++ scripts/build.odin | 11 +++++------ scripts/build.ps1 | 2 +- 5 files changed, 15 insertions(+), 10 deletions(-) create mode 100644 code/asm.odin rename code/{yasm.odin => host.odin} (52%) create mode 100644 code/pkg_mappings.odin diff --git a/code/asm.odin b/code/asm.odin new file mode 100644 index 0000000..aaebf28 --- /dev/null +++ b/code/asm.odin @@ -0,0 +1,3 @@ +package asmd // ASM Duffle + + diff --git a/code/yasm.odin b/code/host.odin similarity index 52% rename from code/yasm.odin rename to code/host.odin index d9c04bb..d55441d 100644 --- a/code/yasm.odin +++ b/code/host.odin @@ -1,6 +1,6 @@ -package yasm - +package asmd main :: proc() { -} + +} \ No newline at end of file diff --git a/code/pkg_mappings.odin b/code/pkg_mappings.odin new file mode 100644 index 0000000..cf6aa15 --- /dev/null +++ b/code/pkg_mappings.odin @@ -0,0 +1,3 @@ +package asmd + + diff --git a/scripts/build.odin b/scripts/build.odin index 247ae99..357f543 100644 --- a/scripts/build.odin +++ b/scripts/build.odin @@ -64,7 +64,8 @@ flag_show_more_timings :: "-show-more-timings" flag_show_system_calls :: "-show-system-calls" flag_target :: "-target:" flag_thread_count :: "-thread-count:" -flag_use_lld :: "-lld" +flag_use_lld :: "-linker:lld" +flag_use_rad_link :: "-linker:radlink" flag_use_separate_modules :: "-use-separate-modules" flag_vet_all :: "-vet" flag_vet_unused_entities :: "-vet-unused" @@ -74,8 +75,6 @@ flag_vet_using_stmt :: "-vet-using-stmt" flag_microarch_zen5 :: "--microarch:znver5" -flag_rad_linker :: "-radlink" - flag_msvc_link_disable_dynamic_base :: "/DYNAMICBASE:NO" flag_msvc_link_base_address :: "/BASE:" flag_msvc_link_fixed_base_address :: "/FIXED" @@ -98,8 +97,8 @@ main :: proc() { path_root := get_working_dir() path_build := join_path(path_root, "build") path_code := join_path(path_root, "code") - file_source := join_path(path_code, "yasm.odin") - file_exe := join_path(path_build, "yasm.exe") + file_source := join_path(path_code, "host.odin") + file_exe := join_path(path_build, "host.exe") res, errs := build(path_build, { exe_odin, @@ -111,9 +110,9 @@ main :: proc() { flag_default_allocator_nil, flag_debug, flag_microarch_zen5, - flag_rad_linker, flag_no_thread_checker, flag_show_timings, + flag_use_rad_link, join_str(flag_subsystem, "console"), }) fmt.println(res) diff --git a/scripts/build.ps1 b/scripts/build.ps1 index b76ade2..6c842db 100644 --- a/scripts/build.ps1 +++ b/scripts/build.ps1 @@ -36,6 +36,6 @@ $build_args += $flag_no_type_assert $build_args += $flag_dyn_map_calls $build_args += $flag_default_allocator_nil $build_args += $flag_output_path + $exe -& $odin $build_args +# & $odin $build_args & $exe pop-location