From 2f574ef76044dadbd2e61dfe1394a513514366e1 Mon Sep 17 00:00:00 2001 From: Ed_ Date: Thu, 14 Mar 2024 00:00:29 -0400 Subject: [PATCH] Updates to scripts --- scripts/build.ps1 | 6 ++++-- scripts/update_deps.ps1 | 3 +-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/build.ps1 b/scripts/build.ps1 index 546dc30..26afe7d 100644 --- a/scripts/build.ps1 +++ b/scripts/build.ps1 @@ -93,6 +93,7 @@ $flag_vet_using_stmt = '-vet-using-stmt' $flag_msvc_link_disable_dynamic_base = '/DYNAMICBASE:NO' $flag_msvc_link_base_address = '/BASE:' $flag_msvc_link_fixed_base_address = '/FIXED' +$flag_msvc_link_stack_size = '/STACK' $msvc_link_default_base_address = 0x180000000 @@ -172,7 +173,7 @@ push-location $path_root $build_args += $flag_subsystem + 'windows' # $build_args += $flag_show_system_calls $build_args += $flag_show_timings - # $build_args += ($flag_extra_linker_flags + $linker_args ) + $build_args += ($flag_extra_linker_flags + $linker_args ) # $build_args += $flag_no_thread_checker # $build_args += $flag_dynamic_map_calls $build_args += $flag_default_allocator_nil @@ -232,6 +233,7 @@ push-location $path_root write-host 'Building Host Module' $linker_args = "" $linker_args += ( $flag_msvc_link_disable_dynamic_base + ' ' ) + $linker_args += ( $flag_msvc_link_stack_size + ' ') $build_args = @() $build_args += $command_build @@ -239,7 +241,7 @@ push-location $path_root $build_args += $flag_output_path + $executable # $build_args += ($flag_collection + $pkg_collection_thirdparty) # $build_args += $flag_micro_architecture_native - $build_args += $flag_use_separate_modules + # $build_args += $flag_use_separate_modules $build_args += $flag_thread_count + $CoreCount_Physical $build_args += $flag_optimize_none # $build_args += $flag_optimize_minimal diff --git a/scripts/update_deps.ps1 b/scripts/update_deps.ps1 index ac28dd1..0a0fc62 100644 --- a/scripts/update_deps.ps1 +++ b/scripts/update_deps.ps1 @@ -42,8 +42,7 @@ if (Test-Path -Path $path_odin) # Get the latest local and remote commit hashes for the current branch $localCommit = git -C $path_odin rev-parse HEAD $remoteCommit = git -C $path_odin rev-parse '@{u}' - # if ( $true -or $localCommit -ne $remoteCommit) - if ( $localCommit -ne $remoteCommit) + if ( $false -or $localCommit -ne $remoteCommit) { Write-Host "Odin repository is out-of-date. Pulling changes and rebuilding..." git -C $path_odin pull