From 4492ca3079aaf725e181d2655c2d5015ff49055c Mon Sep 17 00:00:00 2001
From: Ed_ <edwardgz@gmail.com>
Date: Sat, 4 May 2024 08:26:52 -0400
Subject: [PATCH] Corrections to ols config, moved ols out of repo

ols is now assumed to exist installed by the user
---
 code/grime_pool_allocator.odin | 4 ++--
 ols.json                       | 8 ++++----
 scripts/update_deps.ps1        | 6 ------
 toolchain/Odin                 | 2 +-
 toolchain/ols                  | 1 -
 5 files changed, 7 insertions(+), 14 deletions(-)
 delete mode 160000 toolchain/ols

diff --git a/code/grime_pool_allocator.odin b/code/grime_pool_allocator.odin
index e12cb58..157f727 100644
--- a/code/grime_pool_allocator.odin
+++ b/code/grime_pool_allocator.odin
@@ -1,9 +1,9 @@
 /*
 This is a pool allocator setup to grow incrementally via buckets.
-Buckets are stored in singly-linked lists so that allocations aren't necessrily contigous.
+Buckets are stored in singly-linked lists so that allocations aren't necessrily contiguous.
 
 The pool is setup with the intention to only grab single entires from the bucket,
-not for a contigous array of them.
+not for a contiguous array of them.
 Thus the free-list only tracks the last free entries thrown out by the user,
 irrespective of the bucket the originated from.
 This means if there is a heavy recyling of entires in a pool
diff --git a/ols.json b/ols.json
index 42ffa58..dfb0f32 100644
--- a/ols.json
+++ b/ols.json
@@ -3,11 +3,11 @@
     "collections": [
         {
             "name": "core",
-            "path": "C:/projects/SectrPrototype/thirdparty/Odin/core"
+            "path": "C:/projects/SectrPrototype/toolchain/Odin/core"
         },
         {
             "name": "vendor",
-            "path": "C:/projects/SectrPrototype/thirdparty/Odin/vendor"
+            "path": "C:/projects/SectrPrototype/toolchain/Odin/vendor"
         },
         {
             "name": "code",
@@ -15,11 +15,11 @@
         },
         {
             "name": "ini",
-            "path": "C:/projects/SectrPrototype/thirdparty/packages/ini"
+            "path": "C:/projects/SectrPrototype/thirdparty/ini"
         },
         {
             "name": "backtrace",
-            "path": "C:/projects/SectrPrototype/thirdparty/packages/backtrace"
+            "path": "C:/projects/SectrPrototype/thirdparty/backtrace"
         }
     ],
     "odin_command": "C:/projects/SectrPrototype/toolchain/Odin/odin.exe",
diff --git a/scripts/update_deps.ps1 b/scripts/update_deps.ps1
index fe45e86..31e01b2 100644
--- a/scripts/update_deps.ps1
+++ b/scripts/update_deps.ps1
@@ -9,11 +9,9 @@ $path_toolchain  = join-path $path_root 'toolchain'
 $url_backtrace_repo = 'https://github.com/Ed94/back.git'
 $url_ini_parser     = 'https://github.com/laytan/odin-ini-parser.git'
 $url_odin_repo      = 'https://github.com/Ed94/Odin.git'
-$url_ols_repo       = 'https://github.com/Ed94/ols'
 $path_backtrace     = join-path $path_thirdparty 'backtrace'
 $path_ini_parser    = join-path $path_thirdparty 'ini'
 $path_odin          = join-path $path_toolchain  'Odin'
-$path_ols           = join-path $path_toolchain  'ols'
 
 $incremental_checks = Join-Path $PSScriptRoot 'helpers/incremental_checks.ps1'
 . $incremental_checks
@@ -83,10 +81,6 @@ push-location $path_thirdparty
 
 Update-GitRepo -path $path_odin -url $url_odin_repo -build_command '.\build.bat'
 
-$env:odin = join-path $path_odin 'odin.exe'
-Update-GitRepo -path $path_ols -url $url_ols_repo -build_command '.\build.bat'
-remove-item env:odin
-
 if (Test-Path -Path $path_ini_parser)
 {
 	# Write-Host "Checking for updates on the ini-parser"
diff --git a/toolchain/Odin b/toolchain/Odin
index a1f241e..fa82547 160000
--- a/toolchain/Odin
+++ b/toolchain/Odin
@@ -1 +1 @@
-Subproject commit a1f241e925283d8870cb1ec3d6c32d26119047b4
+Subproject commit fa825477057fc060debd44027181e2c31c1976a1
diff --git a/toolchain/ols b/toolchain/ols
deleted file mode 160000
index 7449c96..0000000
--- a/toolchain/ols
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7449c96e6c20d693a7ada04df743cbb6d468ade5